From 9aea6d811be689f9495fa3a89e0cf42972a241c1 Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@ciffer.net>
Date: Mon, 16 Nov 2015 13:29:13 -0800
Subject: [PATCH 001/249] terminal-notifier: Pass arguments in wrapper script

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

diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index 2afebec9ee3..7d13f0112bc 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp -r terminal-notifier.app $out/Applications
     cat >$out/bin/terminal-notifier <<EOF
     cd $out/Applications/terminal-notifier.app
-    exec ./Contents/MacOS/terminal-notifier
+    exec ./Contents/MacOS/terminal-notifier "\$@"
     EOF
     chmod +x $out/bin/terminal-notifier
   '';

From c515be46510b02d541ef8b1e978227fcf0367deb Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 8 Dec 2015 16:46:57 +0000
Subject: [PATCH 002/249] networkmanager: set uid/gid for the networkmanager
 openvpn agent

Fixes #11317
---
 nixos/modules/misc/ids.nix                           | 2 ++
 nixos/modules/services/networking/networkmanager.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 6ff95605d4b..7a7ed2f4408 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -238,6 +238,7 @@
       heapster = 214;
       bepasty = 215;
       pumpio = 216;
+      nm-openvpn = 217;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -453,6 +454,7 @@
       calibre-server = 213;
       bepasty = 215;
       pumpio = 216;
+      nm-openvpn = 217;
 
       # 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/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 7df194fa419..8ab4cfcc114 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -223,9 +223,11 @@ in {
     }
     {
       name = "nm-openvpn";
+      gid = config.ids.gids.nm-openvpn;
     }];
     users.extraUsers = [{
       name = "nm-openvpn";
+      uid = config.ids.uids.nm-openvpn;
     }];
 
     systemd.packages = cfg.packages;

From cbe786a53062cd6f0f9f5ebe4cc607d7a44fe3ca Mon Sep 17 00:00:00 2001
From: Anton Fedotov <fedotovad@ecotelecom.ru>
Date: Wed, 9 Dec 2015 08:43:38 +0300
Subject: [PATCH 003/249] ccache: create symlinks to gcc lib & include in
 ccache-links directory

This patch fixes compilation errors when using ccache wrapper:
```
cc1: error: /nix/store/19vvbsjs6l6j0r22albzhysxfvr94imf-ccache-links/lib/gcc/*/*/include-fixed: No such file or directory
```
---
 pkgs/development/tools/misc/ccache/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index fb6d03c6e85..ed87428f98d 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -49,6 +49,9 @@ stdenv.mkDerivation {
             ln -s ${gcc.cc}/bin/$executable $out/bin/$executable
           fi
         done
+        for file in $(ls ${gcc.cc} | grep -vw bin); do
+          ln -s ${gcc.cc}/$file $out/$file
+        done
       '');
   };
 

From 6ddca8f9b0da888afeb95aeac333f3310581cfdd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 23 Dec 2015 23:07:16 +0100
Subject: [PATCH 004/249] darktable: 1.6.8 -> 1.6.9

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

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 1cf24e109dd..77bddc89e2f 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -9,12 +9,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.6.8";
+  version = "1.6.9";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "0189d5pn6g01rynfkhxynrqgfi24v94x8fp0fs7ilrncv0dzhxmn";
+    sha256 = "0wri89ygjpv7npiz58mnydhgldywp6arqp9jq3v0g54a56fiwwhg";
   };
 
   buildInputs =

From 77affc495f514ac81343c10c92340c64ba6a3437 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Wed, 23 Dec 2015 22:41:05 +0100
Subject: [PATCH 005/249] despotify: fix missing hash (close #11913)

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

diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix
index 2cb241b0427..e774a9e923b 100644
--- a/pkgs/development/libraries/despotify/default.nix
+++ b/pkgs/development/libraries/despotify/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchsvn {
     url = "http://svn.code.sf.net/p/despotify/code";
     rev = "521";
+    sha256 = "1vc453bv5ngkvaqkq7z5bj6x28m4kik59153jikcfah3k4qmxw21";
   };
 
   buildInputs = [

From c6b251f5d549f8d3dd877d0b086ae4f876bc5a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 23 Dec 2015 23:17:03 +0100
Subject: [PATCH 006/249] nixos/jenkins: rename option 'host' to
 'listenAddress'

I think the name 'listenAddress' is more descriptive. Other NixOS
modules that define 'host' either use it as listen address or as address
a client connects to. listenAddress is unambiguous.

The addition of 'host' was added earlier today[1], so not bothering with
./nixos/modules/rename.nix.

[1]: 44ea18499710049e ("jenkins ci enhancement: add port and prefix option")
---
 .../services/continuous-integration/jenkins/default.nix   | 8 ++++----
 .../continuous-integration/jenkins/job-builder.nix        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 3b76ada72bb..9bffd97628a 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -48,7 +48,7 @@ in {
         '';
       };
 
-      host = mkOption {
+      listenAddress = mkOption {
         default = "0.0.0.0";
         example = "localhost";
         type = types.str;
@@ -156,18 +156,18 @@ in {
       '';
 
       script = ''
-        ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins} --httpListenAddress=${cfg.host} \
+        ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins} --httpListenAddress=${cfg.listenAddress} \
                                                   --httpPort=${toString cfg.port} \
                                                   --prefix=${cfg.prefix} \
                                                   ${concatStringsSep " " cfg.extraOptions}
       '';
 
       postStart = ''
-        until ${pkgs.curl}/bin/curl -s -L ${cfg.host}:${toString cfg.port}${cfg.prefix} ; do
+        until ${pkgs.curl}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} ; do
           sleep 10
         done
         while true ; do
-          index=`${pkgs.curl}/bin/curl -s -L ${cfg.host}:${toString cfg.port}${cfg.prefix}`
+          index=`${pkgs.curl}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix}`
           if [[ !("$index" =~ 'Please wait while Jenkins is restarting' ||
                   "$index" =~ 'Please wait while Jenkins is getting ready to work') ]]; then
             exit 0
diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
index 1f65db4ce95..702d452279f 100644
--- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
@@ -144,7 +144,7 @@ in {
             done
 
             echo "Asking Jenkins to reload config"
-            curl --silent -X POST http://${jenkinsCfg.host}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/reload
+            curl --silent -X POST http://${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/reload
           '';
       serviceConfig = {
         User = jenkinsCfg.user;

From b2d0886b37bc7a927c98a15430b3be3cbc4f81f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 23 Dec 2015 23:23:07 +0100
Subject: [PATCH 007/249] nixos/jenkins: fix typo in docstring
 (s/adress/address/)

---
 .../services/continuous-integration/jenkins/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 9bffd97628a..d571aa3e199 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -53,8 +53,8 @@ in {
         example = "localhost";
         type = types.str;
         description = ''
-          Specifies the bind adress on which the jenkins HTTP interface listens.
-          The default is the wildcard adress.
+          Specifies the bind address on which the jenkins HTTP interface listens.
+          The default is the wildcard address.
         '';
       };
 

From 558f14a0943e076f1c05816e91d72e34de93951a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 23 Dec 2015 17:03:21 -0600
Subject: [PATCH 008/249] kde5: build with Qt 5.5

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2163fd81f78..e547fade718 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14778,7 +14778,7 @@ let
       apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
       merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self;
     in
-      recurseIntoAttrs (lib.makeScope qt5.newScope merged);
+      recurseIntoAttrs (lib.makeScope qt55.newScope merged);
 
   kde5_latest =
     let
@@ -14787,7 +14787,7 @@ let
       apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
       merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self;
     in
-      recurseIntoAttrs (lib.makeScope qt5.newScope merged);
+      recurseIntoAttrs (lib.makeScope qt55.newScope merged);
 
   theme-vertex = callPackage ../misc/themes/vertex { };
 

From a5ac3dfffc5628a513c2c1e4e8581bcbeb894736 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 23 Dec 2015 17:03:37 -0600
Subject: [PATCH 009/249] kde5.plasma: 5.5.1 -> 5.5.2

---
 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 2ea23dc5656..48ecc6ff469 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.1/"
+RELEASE_URL="http://download.kde.org/stable/plasma/5.5.2/"
 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 63b6a7bee92..107946da8a2 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.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/bluedevil-5.5.1.tar.xz";
-      sha256 = "09id2vyjdmwl20km0zfwhz2rsyrb2yrfygczh39v1s3nqz88mw97";
-      name = "bluedevil-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/bluedevil-5.5.2.tar.xz";
+      sha256 = "0z13vj9ybdilsixnn44wixr54f50lbbq52ryjfc4bxllycv9fzjf";
+      name = "bluedevil-5.5.2.tar.xz";
     };
   };
   breeze = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/breeze-5.5.1.tar.xz";
-      sha256 = "03chjfi878r9cz6vy7px0fma8lzrynpnnvbfqw2pbz00mny89hkw";
-      name = "breeze-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/breeze-5.5.2.tar.xz";
+      sha256 = "171n9i642i2p1a8sd5pjamm41phbih5f244f1f5f6h2r29bpccgr";
+      name = "breeze-5.5.2.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/breeze-gtk-5.5.1.tar.xz";
-      sha256 = "10nnahdsyl7rh6r4wzrxjhw6pl5j5b29wkv7a9kkyqjmhmfxsmpq";
-      name = "breeze-gtk-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/breeze-gtk-5.5.2.tar.xz";
+      sha256 = "1zlxdb6rlg7r4dfd87l9p0js52c9k190l8aj2zd9hhw2wyc388x0";
+      name = "breeze-gtk-5.5.2.tar.xz";
     };
   };
   discover = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/discover-5.5.1.tar.xz";
-      sha256 = "0nr48126xb48ra9gc40bhbsz74ssrf6dnx189n3sdvb00y7a26wf";
-      name = "discover-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/discover-5.5.2.tar.xz";
+      sha256 = "13wm838yqhl1xw4wp93b0avfacp2zgg9rvml1hm6ksfbbyh8xxj0";
+      name = "discover-5.5.2.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kde-cli-tools-5.5.1.tar.xz";
-      sha256 = "0izn9fqbrjxcpwwjfr4522jazz2aw8h0r5c4s99hmy5q6hyr59bj";
-      name = "kde-cli-tools-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kde-cli-tools-5.5.2.tar.xz";
+      sha256 = "0di7qxifrck1d1y24dypvgd3b60pkddlk2nnf6m230m0qacw6kk6";
+      name = "kde-cli-tools-5.5.2.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kdecoration-5.5.1.tar.xz";
-      sha256 = "1fdflipbfbivy3p90n30wc6flqck5hx5q4zli42v2a039bzj44jn";
-      name = "kdecoration-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kdecoration-5.5.2.tar.xz";
+      sha256 = "1g9bvkqvzy8h5l79qcm3zf4s146fld4la3ri83bbsfd9my6lrwph";
+      name = "kdecoration-5.5.2.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kde-gtk-config-5.5.1.tar.xz";
-      sha256 = "1pjs59i9xwz3csd86qmvb4c7n766q1dam8llvklkx17i8f9ddri0";
-      name = "kde-gtk-config-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kde-gtk-config-5.5.2.tar.xz";
+      sha256 = "0pd8a36ggdrp145mxk28n33r8fd436v74jq8xzvq0f2gfh4lcih8";
+      name = "kde-gtk-config-5.5.2.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kdeplasma-addons-5.5.1.tar.xz";
-      sha256 = "0i59p4dyaz7kz9rcx2hpwg3c7sbwsk4cab9ldcck6vb83szxi1il";
-      name = "kdeplasma-addons-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kdeplasma-addons-5.5.2.tar.xz";
+      sha256 = "0lqhgqy25bijpm62hlzn2ksia0dldvvdf4s9ax8b2g4jq114wrl4";
+      name = "kdeplasma-addons-5.5.2.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kgamma5-5.5.1.tar.xz";
-      sha256 = "0qwb2fl27pprr6m2vhr021whpashgan3lx2s91iyb09cxf56883y";
-      name = "kgamma5-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kgamma5-5.5.2.tar.xz";
+      sha256 = "0lcz7frb3134k7pvll7di1x08bs8q1cxr4hy0d1danns6jj19w6q";
+      name = "kgamma5-5.5.2.tar.xz";
     };
   };
   khelpcenter = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/khelpcenter-5.5.1.tar.xz";
-      sha256 = "0alsn8xsac0l2zdsk9fvawz3zvg431qgg443p05v6a2pfadb2b0s";
-      name = "khelpcenter-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/khelpcenter-5.5.2.tar.xz";
+      sha256 = "1ypy0p9ld9gy06z8r19lcysbzbg202m3ljdmzkzixvr8173lg01x";
+      name = "khelpcenter-5.5.2.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/khotkeys-5.5.1.tar.xz";
-      sha256 = "0rbmdh8yv8ms19kn3r0qcgy0wlrin5jhxic55pc4hdccxy0alchi";
-      name = "khotkeys-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/khotkeys-5.5.2.tar.xz";
+      sha256 = "0dcdh0hxhlqaip3vk02npw3bk2pgpsrfhjr80k8bmhiy9g95z7ab";
+      name = "khotkeys-5.5.2.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kinfocenter-5.5.1.tar.xz";
-      sha256 = "0b1z8qsa1qpl9w13ag8154biry44r19nrg1mb5r3wjy22s1nmf40";
-      name = "kinfocenter-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kinfocenter-5.5.2.tar.xz";
+      sha256 = "1wg8yv096glby3ds822b643x0lrhmf67karr1xcd98xr5l188ngw";
+      name = "kinfocenter-5.5.2.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kmenuedit-5.5.1.tar.xz";
-      sha256 = "0wk5lainva9pc8ccflpfgil9b9vi6wf1vfd5pkn11n9dqr1sbgcq";
-      name = "kmenuedit-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kmenuedit-5.5.2.tar.xz";
+      sha256 = "1gqb2wrb1ahdqljm451w9kbyl0mmqm7axrpnf4hblh4453ym19wr";
+      name = "kmenuedit-5.5.2.tar.xz";
     };
   };
   kscreen = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kscreen-5.5.1.tar.xz";
-      sha256 = "1zn31yfk2x9xpqvr0liyna98sk486qqbdgzisx8dl5jm8j7lxm5c";
-      name = "kscreen-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kscreen-5.5.2.tar.xz";
+      sha256 = "0kqf296r6gxfq0cz2s8yg05jazb3048fxbm2v0b9mv235c5j5xap";
+      name = "kscreen-5.5.2.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kscreenlocker-5.5.1.tar.xz";
-      sha256 = "0614w38isbqhvw425620mabvczjph52b6mpzzp0ac462ryl5061s";
-      name = "kscreenlocker-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kscreenlocker-5.5.2.tar.xz";
+      sha256 = "1yknbrxnk162jvi8da4m23qxcwxqm1jsa1l1yxw4nj6rdz3jl6dm";
+      name = "kscreenlocker-5.5.2.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/ksshaskpass-5.5.1.tar.xz";
-      sha256 = "0xafh56wpa7ypj2j4pbgp8p7gk95xa7q3wbab3qw8n7gwjwvgm8v";
-      name = "ksshaskpass-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/ksshaskpass-5.5.2.tar.xz";
+      sha256 = "0dq1qifmq3qdb6ia19n22wrxv5pndl77hlr2pyn2i67rz19zxywf";
+      name = "ksshaskpass-5.5.2.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/ksysguard-5.5.1.tar.xz";
-      sha256 = "0zp3hd22hljn1xqdbmayhrbm4niksp9s6p8fx0nv7pnnv8h02vw1";
-      name = "ksysguard-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/ksysguard-5.5.2.tar.xz";
+      sha256 = "0c1iaimpwnh6naryj7apqxkdcaj5wmyir1yvlpr5v9wp49gkn2nx";
+      name = "ksysguard-5.5.2.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kwallet-pam-5.5.1.tar.xz";
-      sha256 = "1hk8a82dmvf9h5bhykpfx02b65vx30ziak698sjs0zp0hxfilq56";
-      name = "kwallet-pam-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kwallet-pam-5.5.2.tar.xz";
+      sha256 = "0gmk2jm1svvy1jxr5nsq14gscalzknrmzyar858nijyc9k5wb1n0";
+      name = "kwallet-pam-5.5.2.tar.xz";
     };
   };
   kwayland = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kwayland-5.5.1.tar.xz";
-      sha256 = "18dxhyphd5chswa39isn47xjhp6v2di5jjs03g21wfc4q0avpd45";
-      name = "kwayland-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kwayland-5.5.2.tar.xz";
+      sha256 = "1i1gx3f1ygh9l1hwh4jcipjzl9b00issqk22i1li3054cb45g0mv";
+      name = "kwayland-5.5.2.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kwayland-integration-5.5.1.tar.xz";
-      sha256 = "1ss19cxisz9xj4nh6zjmndpcp6r4gvmpsbqa2wycrvsqq6wrsr5f";
-      name = "kwayland-integration-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kwayland-integration-5.5.2.tar.xz";
+      sha256 = "09czrmyz75mkpaq9ca8n4w2b9x15dhw1l4g2vyqzarc8y5id4bnv";
+      name = "kwayland-integration-5.5.2.tar.xz";
     };
   };
   kwin = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kwin-5.5.1.tar.xz";
-      sha256 = "0gqh98v4h6mc087xdqma5ab478f0zl2v1p6614q9w4si7770i8vl";
-      name = "kwin-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kwin-5.5.2.tar.xz";
+      sha256 = "0cly3mnb7d64h0pcfiqhcqs7p9plwsh0zb7kgz7ahcahqqgzbx4p";
+      name = "kwin-5.5.2.tar.xz";
     };
   };
   kwrited = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/kwrited-5.5.1.tar.xz";
-      sha256 = "0din1v4jls2bmxx50dx6hs4anfzrr50cb5m8qdq6n0j35p60xq30";
-      name = "kwrited-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/kwrited-5.5.2.tar.xz";
+      sha256 = "0fm6bvihyksiizxdp3alpal19c897pjmhqp2cyf7z9aahkyhpgh8";
+      name = "kwrited-5.5.2.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/libkscreen-5.5.1.tar.xz";
-      sha256 = "1v31hxdrwhrx0n582cp2is09k9slw8a7c8qr5yxc8gi96sj3hb2y";
-      name = "libkscreen-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/libkscreen-5.5.2.tar.xz";
+      sha256 = "02aaaqzblahn477m07xzrk4vc21gc9szhj9aj780qyvpng8jifn2";
+      name = "libkscreen-5.5.2.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/libksysguard-5.5.1.tar.xz";
-      sha256 = "1zgvxvrmi0amxmn4cmd0g4bdb7b97msdkycsckp7krv5mw5h55dx";
-      name = "libksysguard-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/libksysguard-5.5.2.tar.xz";
+      sha256 = "1z4riwjb3i9wv3zd34y5cv1s2pb3x1v6kayl5bq89v8pyqqkp5n5";
+      name = "libksysguard-5.5.2.tar.xz";
     };
   };
   milou = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/milou-5.5.1.tar.xz";
-      sha256 = "10qsfqx8rqzzy7yg1sikyxh9ycfplmvv30y8rgv4hihnh1yywhks";
-      name = "milou-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/milou-5.5.2.tar.xz";
+      sha256 = "180i93zlypqnsw5105xqgfjnvg024z7i7qxhv7snidzm9yrc3f0q";
+      name = "milou-5.5.2.tar.xz";
     };
   };
   oxygen = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/oxygen-5.5.1.tar.xz";
-      sha256 = "0fszhf3xavmygm82kb3i8pymvz9bc5av5mi35d0qj3fzwfgdkd6h";
-      name = "oxygen-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/oxygen-5.5.2.tar.xz";
+      sha256 = "0q9mbazync4skgkz595ccjznndkv6v3qwhhyx2ycs73s2v4380kp";
+      name = "oxygen-5.5.2.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/plasma-desktop-5.5.1.tar.xz";
-      sha256 = "1gazhr4501176z6r8psz8wjg3hcfigvpfm02q82aw9jpyy7sjini";
-      name = "plasma-desktop-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/plasma-desktop-5.5.2.tar.xz";
+      sha256 = "08c4hmnmwzy67cp01p001mil9cvf0gx37dxf0iwghxw7b7nzmxnf";
+      name = "plasma-desktop-5.5.2.tar.xz";
     };
   };
   plasma-mediacenter = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/plasma-mediacenter-5.5.1.tar.xz";
-      sha256 = "12xlixrjbs6lmdabp7f9mp6dhwai7qnj5n867q86qv6i836y10dy";
-      name = "plasma-mediacenter-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/plasma-mediacenter-5.5.2.tar.xz";
+      sha256 = "1019nbgb6f37bn9ncbjzmybrcfi187sf0rg0mxpvrhh1imdfxwsj";
+      name = "plasma-mediacenter-5.5.2.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/plasma-nm-5.5.1.tar.xz";
-      sha256 = "0q0189vz7770xv65skj7a47lbavfgz9a4x4csqv834k40pawkyhg";
-      name = "plasma-nm-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/plasma-nm-5.5.2.tar.xz";
+      sha256 = "00fx5m6avbq14wkmd6jjd1wda8rznav2hs5x70jx9dnkl1c6463x";
+      name = "plasma-nm-5.5.2.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/plasma-pa-5.5.1.tar.xz";
-      sha256 = "13falp4xq028jnkqf5nsv71vv9icclvyk701s5dbcff7v2k2zphk";
-      name = "plasma-pa-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/plasma-pa-5.5.2.tar.xz";
+      sha256 = "0nikv5ms1dnyf4w41c97gsx2wvy7da3qz7hddx3xnkzk3hh596fi";
+      name = "plasma-pa-5.5.2.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/plasma-sdk-5.5.1.tar.xz";
-      sha256 = "1s1k8zdkzpp51dn7w1ra4mswjnrr7nnf7nywdx8k10c0fyxny7hy";
-      name = "plasma-sdk-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/plasma-sdk-5.5.2.tar.xz";
+      sha256 = "0ain65582dz075xjfq8kh7rkcf8hzbr7fdw4hifmcjfp4lh0da4g";
+      name = "plasma-sdk-5.5.2.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.5.1.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/plasma-workspace-5.5.1.1.tar.xz";
-      sha256 = "019pmhlry3zyrq4mvs35k1lmz35cwk4xvpl8wy7awx8r631dm4by";
-      name = "plasma-workspace-5.5.1.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/plasma-workspace-5.5.2.tar.xz";
+      sha256 = "00nmfq864lkj03z82cgfczxhijafhd9nxiw0cprs6x9kvp1d3ylc";
+      name = "plasma-workspace-5.5.2.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/plasma-workspace-wallpapers-5.5.1.tar.xz";
-      sha256 = "1w2bbgcbjvdjxlgd4r3wva87i08y2ngqy85fngpl4387rq234zri";
-      name = "plasma-workspace-wallpapers-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/plasma-workspace-wallpapers-5.5.2.tar.xz";
+      sha256 = "11gymzyhszb9192z0q54z6dlgxqivixj2grhynj2096r4c8jb1rk";
+      name = "plasma-workspace-wallpapers-5.5.2.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.5.1";
+    version = "1-5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/polkit-kde-agent-1-5.5.1.tar.xz";
-      sha256 = "181d0l0dh7kxdz2ykl6g8mirxjcldm5p2737py3c7g617ysl97c1";
-      name = "polkit-kde-agent-1-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/polkit-kde-agent-1-5.5.2.tar.xz";
+      sha256 = "0jmsmx41ixksl1cja295c06agpcs4hn4c0jvhc30b5l9i7nf79j9";
+      name = "polkit-kde-agent-1-5.5.2.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/powerdevil-5.5.1.tar.xz";
-      sha256 = "1gjhclm58dxlmb6g8dm2alfqk7iw9fy5vyryn0z6i71j7760aqpp";
-      name = "powerdevil-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/powerdevil-5.5.2.tar.xz";
+      sha256 = "1l5765izd4p6i5q1f2r77ra0fip8fb0c1pl5bxg45sg3hnnaxk21";
+      name = "powerdevil-5.5.2.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/sddm-kcm-5.5.1.tar.xz";
-      sha256 = "0fbnyvyklr409n2qdbyvn1sqhkl7jdabldpv6brq010wd5f2rfrv";
-      name = "sddm-kcm-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/sddm-kcm-5.5.2.tar.xz";
+      sha256 = "0fcyhndi1hh17cpbadm8alfhrkal847h4a7rx2rs8rrgypxdzhf9";
+      name = "sddm-kcm-5.5.2.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/systemsettings-5.5.1.tar.xz";
-      sha256 = "19q9yvlvyq61m3xjnii6zfpf5kwnja906i3709ia29132ai4x3sn";
-      name = "systemsettings-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/systemsettings-5.5.2.tar.xz";
+      sha256 = "03y6mhfy3ax12g2s937w88hd88ln23asvcbsl52fy8h37b9vlnba";
+      name = "systemsettings-5.5.2.tar.xz";
     };
   };
   user-manager = {
-    version = "5.5.1";
+    version = "5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.1/user-manager-5.5.1.tar.xz";
-      sha256 = "12mrn2fila5m1nzrj196s6q15g91c52zqqbgzi9zqk22n2801l9f";
-      name = "user-manager-5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.2/user-manager-5.5.2.tar.xz";
+      sha256 = "0lvl8dhy8vymngb4p5x4y7miih8g004ii237lwrxv254ddv60azn";
+      name = "user-manager-5.5.2.tar.xz";
     };
   };
 }

From 965cfccfa509f3e513e0bceecfded742b3286c93 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 23 Dec 2015 18:03:55 -0600
Subject: [PATCH 010/249] kde5: add attributes for individual KDE collections

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e547fade718..8be89661b67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14776,7 +14776,9 @@ let
       frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
       plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
       apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
-      merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self;
+      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);
 
@@ -14785,7 +14787,9 @@ let
       frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
       plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
       apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
-      merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self;
+      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);
 

From 94dbaa7dbf49702a661129168e9093faf60e48f0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 14 Dec 2015 03:39:08 +0100
Subject: [PATCH 011/249] saneBackends{,Git}: add SNMP support

---
 pkgs/applications/graphics/sane/backends-git.nix | 6 ++++--
 pkgs/applications/graphics/sane/backends.nix     | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix
index 0c74a470c25..149d9a70610 100644
--- a/pkgs/applications/graphics/sane/backends-git.nix
+++ b/pkgs/applications/graphics/sane/backends-git.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null
+{ stdenv, fetchurl, fetchgit, libusb ? null, net_snmp ? null
 , gt68xxFirmware ? null, snapscanFirmware ? null
+, hotplugSupport ? true
 }:
 let
   firmware = gt68xxFirmware { inherit fetchurl; };
@@ -18,7 +19,8 @@ stdenv.mkDerivation {
 
   udevSupport = hotplugSupport;
 
-  buildInputs = if libusb != null then [libusb] else [];
+  buildInputs = [ net_snmp ]
+    ++ stdenv.lib.optional (libusb != null) libusb;
 
   postInstall = ''
     if test "$udevSupport" = "1"; then
diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix
index fb943ac23b5..b96f7a4dbc8 100644
--- a/pkgs/applications/graphics/sane/backends.nix
+++ b/pkgs/applications/graphics/sane/backends.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null
-, pkgconfig ? null, gt68xxFirmware ? null, snapscanFirmware ? null
+{ stdenv, fetchurl, libusb ? null, libv4l ? null, net_snmp ? null
+, pkgconfig ? null
+, gt68xxFirmware ? null, snapscanFirmware ? null
+, hotplugSupport ? true
 }:
 
 assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
@@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";
 
-  buildInputs = []
+  buildInputs = [ net_snmp ]
     ++ stdenv.lib.optional (libusb != null) libusb
     ++ stdenv.lib.optional (libv4l != null) libv4l
     ++ stdenv.lib.optional (pkgconfig != null) pkgconfig

From ffc04a67e3aa54fdcf162dfdec9fc85535b5e251 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 14 Dec 2015 18:23:29 +0100
Subject: [PATCH 012/249] sanebackends{,Git}: add avahi support

---
 pkgs/applications/graphics/sane/backends-git.nix | 8 ++++++--
 pkgs/applications/graphics/sane/backends.nix     | 9 ++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix
index 149d9a70610..bf9f4f5c01f 100644
--- a/pkgs/applications/graphics/sane/backends-git.nix
+++ b/pkgs/applications/graphics/sane/backends-git.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, fetchgit, libusb ? null, net_snmp ? null
+{ stdenv,  fetchurl, fetchgit
+, avahi ? null, libusb ? null, net_snmp ? null
 , gt68xxFirmware ? null, snapscanFirmware ? null
 , hotplugSupport ? true
 }:
@@ -19,9 +20,12 @@ stdenv.mkDerivation {
 
   udevSupport = hotplugSupport;
 
-  buildInputs = [ net_snmp ]
+  buildInputs = [ avahi net_snmp ]
     ++ stdenv.lib.optional (libusb != null) libusb;
 
+  configureFlags = []
+    ++ stdenv.lib.optional (avahi != null) "--enable-avahi";
+
   postInstall = ''
     if test "$udevSupport" = "1"; then
       mkdir -p $out/etc/udev/rules.d/
diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix
index b96f7a4dbc8..637ed7a2024 100644
--- a/pkgs/applications/graphics/sane/backends.nix
+++ b/pkgs/applications/graphics/sane/backends.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, libusb ? null, libv4l ? null, net_snmp ? null
+{ stdenv, fetchurl
+, avahi ? null, libusb ? null, libv4l ? null, net_snmp ? null
 , pkgconfig ? null
 , gt68xxFirmware ? null, snapscanFirmware ? null
 , hotplugSupport ? true
@@ -26,9 +27,11 @@ stdenv.mkDerivation rec {
 
   udevSupport = hotplugSupport;
 
-  configureFlags = stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";
+  configureFlags = []
+    ++ stdenv.lib.optional (avahi != null) "--enable-avahi"
+    ++ stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";
 
-  buildInputs = [ net_snmp ]
+  buildInputs = [ avahi net_snmp ]
     ++ stdenv.lib.optional (libusb != null) libusb
     ++ stdenv.lib.optional (libv4l != null) libv4l
     ++ stdenv.lib.optional (pkgconfig != null) pkgconfig

From 58bf69407125d47683e28502f01d0426660417a4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 20 Dec 2015 21:44:23 +0100
Subject: [PATCH 013/249] saneBackends: factor out common code into generic.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The git version was duplicated from the stable one and the two had
begun to diverge significantly. For example, commit
88d731925d62b162fc7b7b1bc8c75a519a9ac718 fixed a supposedly real
bug — but only in the stable package.

Factor out the shared code to avoid trouble — or worse, subtle
differences or bugs — in future.
---
 .../graphics/sane/backends-git.nix            | 64 -------------------
 .../graphics/sane/backends/default.nix        | 13 ++++
 .../{backends.nix => backends/generic.nix}    | 34 +++++-----
 .../graphics/sane/backends/git.nix            | 10 +++
 pkgs/top-level/all-packages.nix               |  4 +-
 5 files changed, 40 insertions(+), 85 deletions(-)
 delete mode 100644 pkgs/applications/graphics/sane/backends-git.nix
 create mode 100644 pkgs/applications/graphics/sane/backends/default.nix
 rename pkgs/applications/graphics/sane/{backends.nix => backends/generic.nix} (79%)
 create mode 100644 pkgs/applications/graphics/sane/backends/git.nix

diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix
deleted file mode 100644
index bf9f4f5c01f..00000000000
--- a/pkgs/applications/graphics/sane/backends-git.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv,  fetchurl, fetchgit
-, avahi ? null, libusb ? null, net_snmp ? null
-, gt68xxFirmware ? null, snapscanFirmware ? null
-, hotplugSupport ? true
-}:
-let
-  firmware = gt68xxFirmware { inherit fetchurl; };
-in
-assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
-
-let version = "2015-12-20"; in
-stdenv.mkDerivation {
-  name = "sane-backends-${version}";
-
-  src = fetchgit {
-    url = "git://alioth.debian.org/git/sane/sane-backends.git";
-    rev = "5136e664b8608604f54a2cc1d466019922b311e6";
-    sha256 = "998fdc9cdd3f9220c38244e0b87bba3ee623d7d20726479b04ed95b3836a37ed";
-  };
-
-  udevSupport = hotplugSupport;
-
-  buildInputs = [ avahi net_snmp ]
-    ++ stdenv.lib.optional (libusb != null) libusb;
-
-  configureFlags = []
-    ++ stdenv.lib.optional (avahi != null) "--enable-avahi";
-
-  postInstall = ''
-    if test "$udevSupport" = "1"; then
-      mkdir -p $out/etc/udev/rules.d/
-      ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
-      cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
-    fi
-  '';
-
-  preInstall =
-    if gt68xxFirmware != null then
-      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
-      " \${out}/share/sane/gt68xx/" + firmware.name
-    else if snapscanFirmware != null then
-      "mkdir -p \${out}/share/sane/snapscan ; ln -s " + snapscanFirmware +
-      " \${out}/share/sane/snapscan/your-firmwarefile.bin ;" +
-      "mkdir -p \${out}/etc/sane.d ; " +
-      "echo epson2 > \${out}/etc/sane.d/dll.conf"
-    else "";
-
-  meta = with stdenv.lib; {
-    inherit version;
-    homepage = "http://www.sane-project.org/";
-    description = "SANE (Scanner Access Now Easy) backends";
-    longDescription = ''
-      Collection of open-source SANE backends (device drivers).
-      SANE is a universal scanner interface providing standardized access to
-      any raster image scanner hardware: flatbed scanners, hand-held scanners,
-      video- and still-cameras, frame-grabbers, etc. For a list of supported
-      scanners, see http://www.sane-project.org/sane-backends.html.
-    '';
-    license = licenses.gpl2Plus;
-
-    maintainers = with maintainers; [ nckx simons ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
new file mode 100644
index 00000000000..a3ca7fdd55d
--- /dev/null
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -0,0 +1,13 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.0.25";
+  src = fetchurl {
+    sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4";
+    urls = [
+      "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-${version}.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/sane-backends-${version}.tar.gz"
+      "https://alioth.debian.org/frs/download.php/file/4146/sane-backends-${version}.tar.gz"
+    ];
+    curlOpts = "--insecure";
+  };
+})
diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends/generic.nix
similarity index 79%
rename from pkgs/applications/graphics/sane/backends.nix
rename to pkgs/applications/graphics/sane/backends/generic.nix
index 637ed7a2024..0324acec6c7 100644
--- a/pkgs/applications/graphics/sane/backends.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,40 +1,34 @@
 { stdenv, fetchurl
 , avahi ? null, libusb ? null, libv4l ? null, net_snmp ? null
-, pkgconfig ? null
+, pkgconfig
 , gt68xxFirmware ? null, snapscanFirmware ? null
 , hotplugSupport ? true
+, version, src, ...
 }:
 
 assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
 
 let
+
   firmware = gt68xxFirmware { inherit fetchurl; };
-in
-stdenv.mkDerivation rec {
-  version = "1.0.25";
-  name = "sane-backends-${version}";
-
-  src = fetchurl {
-    urls = [
-      "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.25.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/${name}.tar.gz"
-      "https://alioth.debian.org/frs/download.php/file/4146/${name}.tar.gz"
-    ];
-    curlOpts = "--insecure";
-    sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4";
-  };
-
-  outputs = [ "out" "doc" "man" ];
 
   udevSupport = hotplugSupport;
 
+in
+stdenv.mkDerivation {
+  inherit src;
+
+  name = "sane-backends-${version}";
+
+  outputs = [ "out" "doc" "man" ];
+
   configureFlags = []
     ++ stdenv.lib.optional (avahi != null) "--enable-avahi"
     ++ stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";
 
-  buildInputs = [ avahi net_snmp ]
+  buildInputs = [ avahi net_snmp pkgconfig ]
     ++ stdenv.lib.optional (libusb != null) libusb
     ++ stdenv.lib.optional (libv4l != null) libv4l
-    ++ stdenv.lib.optional (pkgconfig != null) pkgconfig
     ;
 
   postInstall = ''
@@ -55,7 +49,8 @@ stdenv.mkDerivation rec {
     else "";
 
   meta = with stdenv.lib; {
-    homepage = "http://www.sane-project.org/";
+    inherit version;
+
     description = "SANE (Scanner Access Now Easy) backends";
     longDescription = ''
       Collection of open-source SANE backends (device drivers).
@@ -64,6 +59,7 @@ stdenv.mkDerivation rec {
       video- and still-cameras, frame-grabbers, etc. For a list of supported
       scanners, see http://www.sane-project.org/sane-backends.html.
     '';
+    homepage = "http://www.sane-project.org/";
     license = licenses.gpl2Plus;
 
     maintainers = with maintainers; [ nckx simons ];
diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
new file mode 100644
index 00000000000..7a76d8804d6
--- /dev/null
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -0,0 +1,10 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  version = "2015-12-20";
+  src = fetchgit {
+    sha256 = "998fdc9cdd3f9220c38244e0b87bba3ee623d7d20726479b04ed95b3836a37ed";
+    rev = "5136e664b8608604f54a2cc1d466019922b311e6";
+    url = "git://alioth.debian.org/git/sane/sane-backends.git";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8be89661b67..38e095e8183 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15531,14 +15531,14 @@ let
     };
   };
 
-  saneBackends = callPackage ../applications/graphics/sane/backends.nix {
+  saneBackends = callPackage ../applications/graphics/sane/backends {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;
     snapscanFirmware = config.sane.snapscanFirmware or null;
     hotplugSupport = config.sane.hotplugSupport or true;
     libusb = libusb1;
   };
 
-  saneBackendsGit = callPackage ../applications/graphics/sane/backends-git.nix {
+  saneBackendsGit = callPackage ../applications/graphics/sane/backends/git.nix {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;
     snapscanFirmware = config.sane.snapscanFirmware or null;
     hotplugSupport = config.sane.hotplugSupport or true;

From 61106207cd3b53861a0ade8b2ff655045c7ee25c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 21 Dec 2015 00:01:37 +0100
Subject: [PATCH 014/249] saneBackends: remove some redundancies (no hash
 change)

---
 pkgs/applications/graphics/sane/backends/generic.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 0324acec6c7..c5c8d837a20 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -6,12 +6,11 @@
 , version, src, ...
 }:
 
-assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
+assert hotplugSupport ->
+  builtins.elem stdenv.system [ "i686-linux" "x86_64-linux" ];
 
 let
 
-  firmware = gt68xxFirmware { inherit fetchurl; };
-
   udevSupport = hotplugSupport;
 
 in
@@ -41,8 +40,8 @@ stdenv.mkDerivation {
 
   preInstall =
     if gt68xxFirmware != null then
-      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
-      " \${out}/share/sane/gt68xx/" + firmware.name
+      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + gt68xxFirmware.fw +
+      " \${out}/share/sane/gt68xx/" + gt68xxFirmware.name
     else if snapscanFirmware != null then
       "mkdir -p \${out}/share/sane/snapscan ; ln -s " + snapscanFirmware +
       " \${out}/share/sane/snapscan/your-firmwarefile.bin"

From d91765d2e08cc15bc996d56194341ecfc40aa3d1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 17 Dec 2015 04:18:31 +0100
Subject: [PATCH 015/249] saneBackends: append epson2 to dll.conf if installed

---
 pkgs/applications/graphics/sane/backends/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index c5c8d837a20..8709531f609 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -45,6 +45,8 @@ stdenv.mkDerivation {
     else if snapscanFirmware != null then
       "mkdir -p \${out}/share/sane/snapscan ; ln -s " + snapscanFirmware +
       " \${out}/share/sane/snapscan/your-firmwarefile.bin"
+      "mkdir -p \${out}/etc/sane.d ; " +
+      "echo epson2 >> \${out}/etc/sane.d/dll.conf"
     else "";
 
   meta = with stdenv.lib; {

From d39892699325b85a9a4a222088b8937512e737d9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 17 Dec 2015 05:03:12 +0100
Subject: [PATCH 016/249] saneBackends: simplify buildInputs

---
 pkgs/applications/graphics/sane/backends/generic.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 8709531f609..022cdd72f10 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, avahi ? null, libusb ? null, libv4l ? null, net_snmp ? null
+, avahi, libusb, libv4l, net_snmp
 , pkgconfig
 , gt68xxFirmware ? null, snapscanFirmware ? null
 , hotplugSupport ? true
@@ -25,10 +25,8 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional (avahi != null) "--enable-avahi"
     ++ stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";
 
-  buildInputs = [ avahi net_snmp pkgconfig ]
-    ++ stdenv.lib.optional (libusb != null) libusb
-    ++ stdenv.lib.optional (libv4l != null) libv4l
-    ;
+  buildInputs = [ avahi libusb libv4l net_snmp ];
+  nativeBuildInputs = [ pkgconfig ];
 
   postInstall = ''
     if test "$udevSupport" = "1"; then

From eeca8c0441d3065d0db3f83fba28cc3c541efb18 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 17 Dec 2015 05:04:22 +0100
Subject: [PATCH 017/249] saneBackends: add translations (gettext)

---
 pkgs/applications/graphics/sane/backends/generic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 022cdd72f10..707a0b09120 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , avahi, libusb, libv4l, net_snmp
-, pkgconfig
+, gettext, pkgconfig
 , gt68xxFirmware ? null, snapscanFirmware ? null
 , hotplugSupport ? true
 , version, src, ...
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";
 
   buildInputs = [ avahi libusb libv4l net_snmp ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ gettext pkgconfig ];
 
   postInstall = ''
     if test "$udevSupport" = "1"; then

From 6a76cd13362dab971bc2de54b63be96dcd55288a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 17 Dec 2015 16:39:08 +0100
Subject: [PATCH 018/249] saneBackends: drop libusb override; use libusb1
 directly

---
 pkgs/applications/graphics/sane/backends/generic.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                      | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 707a0b09120..e617bcc814d 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, avahi, libusb, libv4l, net_snmp
+, avahi, libusb1, libv4l, net_snmp
 , gettext, pkgconfig
 , gt68xxFirmware ? null, snapscanFirmware ? null
 , hotplugSupport ? true
@@ -23,9 +23,10 @@ stdenv.mkDerivation {
 
   configureFlags = []
     ++ stdenv.lib.optional (avahi != null) "--enable-avahi"
-    ++ stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";
+    ++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0"
+    ;
 
-  buildInputs = [ avahi libusb libv4l net_snmp ];
+  buildInputs = [ avahi libusb1 libv4l net_snmp ];
   nativeBuildInputs = [ gettext pkgconfig ];
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38e095e8183..92042392094 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15535,7 +15535,6 @@ let
     gt68xxFirmware = config.sane.gt68xxFirmware or null;
     snapscanFirmware = config.sane.snapscanFirmware or null;
     hotplugSupport = config.sane.hotplugSupport or true;
-    libusb = libusb1;
   };
 
   saneBackendsGit = callPackage ../applications/graphics/sane/backends/git.nix {

From fd9e991616b57473e059542ad7b70cf692323d43 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 23 Dec 2015 17:30:27 +0100
Subject: [PATCH 019/249] saneBackends: remove udevSupport == hotplugSupport

---
 pkgs/applications/graphics/sane/backends/generic.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index e617bcc814d..a8963b438b8 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -9,11 +9,6 @@
 assert hotplugSupport ->
   builtins.elem stdenv.system [ "i686-linux" "x86_64-linux" ];
 
-let
-
-  udevSupport = hotplugSupport;
-
-in
 stdenv.mkDerivation {
   inherit src;
 
@@ -30,7 +25,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ gettext pkgconfig ];
 
   postInstall = ''
-    if test "$udevSupport" = "1"; then
+    if test "$hotplugSupport" = "1"; then
       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

From 09c8911bd7ab8c6702652f36dfb12f176d723c14 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 21 Dec 2015 03:13:18 +0100
Subject: [PATCH 020/249] redshift: don't busy-loop like crazy on NixOS
 start-up

---
 nixos/modules/services/x11/redshift.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index d40373ec2e5..6614be261e5 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -98,13 +98,16 @@ in {
       requires = [ "display-manager.service" ];
       after = [ "display-manager.service" ];
       wantedBy = [ "graphical.target" ];
-      serviceConfig.ExecStart = ''
-        ${cfg.package}/bin/redshift \
-          -l ${cfg.latitude}:${cfg.longitude} \
-          -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
-          -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \
-          ${lib.strings.concatStringsSep " " cfg.extraOptions}
-      '';
+      serviceConfig = {
+        ExecStart = ''
+          ${cfg.package}/bin/redshift \
+            -l ${cfg.latitude}:${cfg.longitude} \
+            -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
+            -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \
+            ${lib.strings.concatStringsSep " " cfg.extraOptions}
+        '';
+	RestartSec = 3;
+      };
       environment = { DISPLAY = ":0"; };
       serviceConfig.Restart = "always";
     };

From b8a7875d6401f720e9b317af884c2eb196da127a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 23 Dec 2015 20:27:52 +0100
Subject: [PATCH 021/249] vnstat: 1.14 -> 1.15 & add longDescription

Changes:
- Fix: XML output had extra commas, broken since previous version
- Fix: unintended shared pointer modification in mosecs() sometimes resulted
  in wrong month name to be shown for the current month
- Fix: possible buffer overflow in /proc/net/dev parsing, requires corrupted
  content in /proc/net/dev or use of address sanitizer
- Use ANSI escape codes in -l and -tr modes for cursor location manipulation
  instead of printing backspaces, hide cursor while output is active
- Improve database import robustness
- Improve support for Asian UTF-8 date strings
- Replace hand written Makefiles with Autotools
- Add --alwaysadd parameter to daemon for allowing automatic addition of
  interfaces even if the database directory was populated during startup
---
 .../networking/vnstat/default.nix             | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index b2cba633db8..96de04b2733 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -1,29 +1,32 @@
-{stdenv, fetchurl, ncurses}:
+{ stdenv, fetchurl, ncurses }:
 
-let version = "1.14"; in
+let version = "1.15"; in
 stdenv.mkDerivation rec {
   name = "vnstat-${version}";
 
   src = fetchurl {
-    sha256 = "11l39qqv5pgli9zzn0xilld67bi5qzxymsn97m4r022xv13jlipq";
+    sha256 = "0fdw3nbrfm4acv48r0934ls6ld5lwkff3gyym2c72qlbm9dlp0f3";
     url = "http://humdi.net/vnstat/${name}.tar.gz";
   };
 
-  installPhase = ''
-    mkdir -p $out/{bin,sbin} $out/share/man/{man1,man5}
-    cp src/vnstat $out/bin
-    cp src/vnstatd $out/sbin
-    cp man/vnstat.1 man/vnstatd.1 $out/share/man/man1
-    cp man/vnstat.conf.5 $out/share/man/man5
-  '';
+  buildInputs = [ ncurses ];
 
-  buildInputs = [ncurses];
+  postPatch = ''
+    substituteInPlace src/cfg.c --replace /usr/local $out
+  '';
 
   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
+      keeps a log of network traffic for the selected interface(s). It uses the
+      network interface statistics provided by the kernel as information source.
+      This means that vnStat won't actually be sniffing any traffic and also
+      ensures light use of system resources.
+    '';
     homepage = http://humdi.net/vnstat/;
     license = licenses.gpl2Plus;
-    description = "Console-based network statistics utility for Linux";
     maintainers = with maintainers; [ nckx ];
     platforms = platforms.linux;
   };

From 9ecc0612f932157509299ea4d695b9519b8939cc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 23 Dec 2015 20:29:57 +0100
Subject: [PATCH 022/249] vnstat: add image output (gd) support

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

diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index 96de04b2733..a553de8abb2 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, gd, ncurses }:
 
 let version = "1.15"; in
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     url = "http://humdi.net/vnstat/${name}.tar.gz";
   };
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ gd ncurses ];
 
   postPatch = ''
     substituteInPlace src/cfg.c --replace /usr/local $out

From f5b52aa3827753f92d97ec18541b25f9e974f548 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 23 Dec 2015 20:57:01 +0100
Subject: [PATCH 023/249] clipgrab: 3.5.5 -> 3.5.6

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

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 4075c87146b..d4f968a3b9f 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeDesktopItem, ffmpeg, qt4 }:
 
-let version = "3.5.5"; in
+let version = "3.5.6"; in
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
 
   src = fetchurl {
-    sha256 = "01si6mqfmdwins6l18l6qyhkak0mj4yksbg30qhwywm8wmwl08jd";
+    sha256 = "0wm6hqaq6ydbvvd0fqkfydxd5h7gf4di7lvq63xgxl4z40jqc25n";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "http://download.clipgrab.de/${name}.tar.gz";
   };

From 6b508687cf6d86600f64cb2c8f27e22784af24c2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 23 Dec 2015 21:06:23 +0100
Subject: [PATCH 024/249] perlPackages.Glib: 1.314 -> 1.320 & fix licence

---
 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 04cf46e9339..8e6d02ada39 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4972,17 +4972,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   Glib = buildPerlPackage rec {
-    name = "Glib-1.314";
+    name = "Glib-1.320";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "13lhyksm7fgj6rgrgs06kr0hinbyhiq3lfr6gd2qal1j2w0rwzml";
+      sha256 = "15mrwscqjgwpkw9n4x6rakr9rjz2ss8d90k574fs5wx9cmgg3np3";
     };
     buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.glib ];
     meta = {
       homepage = http://gtk2-perl.sourceforge.net/;
       description = "Perl wrappers for the GLib utility and Object libraries";
       maintainers = with maintainers; [ nckx ];
-      license = stdenv.lib.licenses.lgpl3Plus;
+      license = stdenv.lib.licenses.lgpl21Plus;
     };
   };
 

From b8bc82a45998998f3223c5d01e4a74fe9e7dbb3c Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Sun, 20 Dec 2015 15:38:21 +0800
Subject: [PATCH 025/249] archiveopteryx: init at 3.2.0

---
 lib/maintainers.nix                          |  1 +
 pkgs/servers/mail/archiveopteryx/default.nix | 22 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 25 insertions(+)
 create mode 100644 pkgs/servers/mail/archiveopteryx/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 16e4c1e35ff..8b2ec630066 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -233,6 +233,7 @@
   phausmann = "Philipp Hausmann <nix@314.ch>";
   philandstuff = "Philip Potter <philip.g.potter@gmail.com>";
   phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
+  phunehehe = "Hoang Xuan Phu <phunehehe@gmail.com>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
   piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
   pjbarnoy = "Perry Barnoy <pjbarnoy@gmail.com>";
diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix
new file mode 100644
index 00000000000..8388d63d6b2
--- /dev/null
+++ b/pkgs/servers/mail/archiveopteryx/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, openssl, perl, zlib }:
+stdenv.mkDerivation rec {
+  version = "3.2.0";
+  name = "archiveopteryx-${version}";
+  src = fetchurl {
+    url = "http://archiveopteryx.org/download/${name}.tar.bz2";
+    sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx";
+  };
+  buildInputs = [ openssl perl zlib ];
+  installPhase = ''
+    INSTALLROOT=$out make install
+    mkdir $out/bin
+    ln --symbolic $out/usr/local/archiveopteryx/sbin/* $out/bin/
+    ln --symbolic $out/usr/local/archiveopteryx/bin/* $out/bin/
+  '';
+  meta = with stdenv.lib; {
+    homepage = http://archiveopteryx.org/;
+    description = "An advanced PostgreSQL-based IMAP/POP server";
+    license = licenses.postgresql;
+    maintainers = [ maintainers.phunehehe ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92042392094..25745518109 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9110,6 +9110,8 @@ let
   apacheHttpdPackages_2_2 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_2 pkgs.apacheHttpdPackages_2_2;
   apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4;
 
+  archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { };
+
   cadvisor = callPackage ../servers/monitoring/cadvisor { };
 
   cassandra_1_2 = callPackage ../servers/nosql/cassandra/1.2.nix { };

From 0fda4ff7152dd9c59441a6ab1f4c48978f2a4a30 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Wed, 23 Dec 2015 22:46:30 +0100
Subject: [PATCH 026/249] tahoelafs: mock is required at runtime for some
 reason

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

diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 836f3e1e60c..1f935c2f83b 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -32,12 +32,12 @@ 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 mock ];
+  buildInputs = [ unzip numpy ];
 
   # The `backup' command requires `sqlite3'.
   propagatedBuildInputs =
     [ twisted foolscap nevow simplejson zfec pycryptopp sqlite3
-      darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface
+      darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface mock
     ];
 
   postInstall = ''

From 79b4e5a8d7efe534647e2d5287f606883fc555a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 24 Dec 2015 12:07:45 +0100
Subject: [PATCH 027/249] docker module: fix kernel module loading

The docker module used different code for socket-activated docker daemon than for the non-socket activated daemon.
In particular, if the socket-activated daemon is used, then modprobe wasn't set up to be usable and in PATH for
the docker daemon, which resulted in a failure to start the daemon with overlayfs as storageDriver if the
`overlay` kernel module wasn't already loaded. This commit fixes that bug (which only appears if socket
activation is used), and also reduces the duplication between code paths so that it's easier to keep
both in sync in future.
---
 nixos/modules/virtualisation/docker.nix | 47 +++++++++----------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 718ca085147..97b2927cf1b 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -69,7 +69,8 @@ in
         description = ''
           The postStart phase of the systemd service. You may need to
           override this if you are passing in flags to docker which
-          don't cause the socket file to be created.
+          don't cause the socket file to be created. This option is ignored
+          if socket activation is used.
         '';
       };
 
@@ -81,22 +82,29 @@ in
   config = mkIf cfg.enable (mkMerge [
     { environment.systemPackages = [ pkgs.docker ];
       users.extraGroups.docker.gid = config.ids.gids.docker;
-    }
-    (mkIf cfg.socketActivation {
-
       systemd.services.docker = {
         description = "Docker Application Container Engine";
-        after = [ "network.target" "docker.socket" ];
-        requires = [ "docker.socket" ];
+        wantedBy = optional (!cfg.socketActivation) "multi-user.target";
+        after = [ "network.target" ] ++ (optional cfg.socketActivation "docker.socket") ;
+        requires = optional cfg.socketActivation "docker.socket";
         serviceConfig = {
-          ExecStart = "${pkgs.docker}/bin/docker daemon --host=fd:// --group=docker --storage-driver=${cfg.storageDriver} ${cfg.extraOptions}";
+          ExecStart = "${pkgs.docker}/bin/docker daemon --group=docker --storage-driver=${cfg.storageDriver} ${optionalString cfg.socketActivation "--host=fd://"} ${cfg.extraOptions}";
           #  I'm not sure if that limits aren't too high, but it's what
           #  goes in config bundled with docker itself
           LimitNOFILE = 1048576;
           LimitNPROC = 1048576;
         } // proxy_env;
-      };
 
+        path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
+        environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
+
+        postStart = if cfg.socketActivation then "" else cfg.postStart;
+
+        # Presumably some containers are running we don't want to interrupt
+        restartIfChanged = false;
+      };
+    }
+    (mkIf cfg.socketActivation {
       systemd.sockets.docker = {
         description = "Docker Socket for the API";
         wantedBy = [ "sockets.target" ];
@@ -108,29 +116,6 @@ in
         };
       };
     })
-    (mkIf (!cfg.socketActivation) {
-
-      systemd.services.docker = {
-        description = "Docker Application Container Engine";
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" ];
-        serviceConfig = {
-          ExecStart = "${pkgs.docker}/bin/docker daemon --group=docker --storage-driver=${cfg.storageDriver} ${cfg.extraOptions}";
-          #  I'm not sure if that limits aren't too high, but it's what
-          #  goes in config bundled with docker itself
-          LimitNOFILE = 1048576;
-          LimitNPROC = 1048576;
-        } // proxy_env;
-
-        path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
-        environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
-
-        postStart = cfg.postStart;
-
-        # Presumably some containers are running we don't want to interrupt
-        restartIfChanged = false;
-      };
-    })
   ]);
 
 }

From 2faea53f8eb16b9b7b8af16f4d4c084459d0e398 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 Dec 2015 09:48:17 +0000
Subject: [PATCH 028/249] cargo: 0.6.0 -> 0.7.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 bdd6c18e92c..aa3df6fb1ce 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.6.0";
+  version = "0.7.0";
 });
 
 buildRustPackage rec {
@@ -15,10 +15,10 @@ buildRustPackage rec {
   src = fetchgit {
     url = "git://github.com/rust-lang/cargo";
     rev = "refs/tags/${version}";
-    sha256 = "1kxri32sz9ygnf4wlbj7hc7q9p6hmm5xrb9zzkx23wzkzbcpyjyz";
+    sha256 = "139rv7d6mk31klbnccmn573i05ygjrnflag6c3qwc075i62yfmx6";
   };
 
-  depsSha256 = "1m045yywv67sx75idbsny59d3dzbqnhr07k41jial5n5zwp87mb9";
+  depsSha256 = "07p244bcw3aa1hfbsz6q89pyl8ypkw9zp1r8cvd131w890w9ab4b";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
 

From dad3cd7928a043f9e6b69939da8acbd3820b9f55 Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Thu, 24 Dec 2015 06:47:31 +0100
Subject: [PATCH 029/249] jzmq: fix missing shasum in fetchgit src

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

diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
index 508b188aef7..4576c1a1c72 100644
--- a/pkgs/development/libraries/java/jzmq/default.nix
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = git://github.com/zeromq/jzmq.git;
     rev = "946fd39780423b2df6e5efd9fa2cd863fd79c9db";
+    sha256 = "0j6kfmngqw2gpyxc1ak67d65l208vrb0h8bm8svclia8b339m37a";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig zeromq2 jdk ];

From 021c2cad22e73090959e4057e022a5d9a70713ad Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 23 Dec 2015 22:54:49 +0000
Subject: [PATCH 030/249] rustRegistry: 2015-12-10 -> 2015-12-23

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 9fee03b701e..1f43751bc73 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2015-12-10";
-  rev = "22d6577ebaf063f121fb8dc7dd3b53b73a75f453";
+  version = "2015-12-23";
+  rev = "0fd482d73d5a13fd49a36d2940ad7a069a6fc049";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "10hqb8pwi5bcxc96ddijjswxjv8yqh54w7r3x1xsz2i7160z8gs6";
+      sha256 = "18g69d7npky31rbd4bfcps9180bhfnddg2vhp9w1w0smvgzmg0i3";
   };
 
 in

From 37ebb4c2aca8ceb82fa82f48d1d6dc415b3bdc05 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 23 Dec 2015 22:55:13 +0000
Subject: [PATCH 031/249] rustfmt: 2015-12-08 -> 2015-12-23

---
 pkgs/development/tools/rust/rustfmt/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index 49a87754e72..f67b1f00a0f 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-08";
+  name = "rustfmt-git-2015-12-23";
   src = fetchFromGitHub {
-    owner = "nrc";
+    owner = "rust-lang-nursery";
     repo = "rustfmt";
-    rev = "e94bd34a06d878a41bb8be409f173a8824dda63f";
-    sha256 = "0f0ixbr5nfla0j0b91plmapw75yl3d3lxwvllj2wx4z94nfxanp6";
+    rev = "c0b7de7c521dc65b2ad2b5a3c81fb56030f4af22";
+    sha256 = "1axnp8w26c3dwlx7bby3qi6385n301rlk1ndh5yaz7vkbpn4w9km";
   };
 
-  depsSha256 = "0vsrpw4icn9jf44sqr5749hbazsxp3hqn1g7gr90fvnfvz4s5f07";
+  depsSha256 = "1s2as7qc7jbksc16gj5cxxm52zw8h4nfgka66dmwwjlv9679wj9f";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";

From a5e94225609a178e1d7b663176ccb67881fc65ef Mon Sep 17 00:00:00 2001
From: leenaars <michiel.ml@nlnet.nl>
Date: Thu, 24 Dec 2015 13:29:43 +0100
Subject: [PATCH 032/249] sipsimple: 2.5.1 -> 2.6.0

Updated SIP Simple SDK to new version, is a dependency for e.g. Blink (which needs to be updated as the old version does not build anymore because the tarball has been removed)
---
 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 26b6d7de503..eab64615606 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17983,12 +17983,12 @@ in modules // {
 
   sipsimple = buildPythonPackage rec {
     name = "sipsimple-${version}";
-    version = "2.5.1";
+    version = "2.6.0";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz";
-      sha256 = "0vpy2vss8667c0kp1k8vybl38nxp7kr2v2wa8sngrgzd65m6ww5p";
+      sha256 = "0xcyasas28q1ad1hgw4vd62b72mf1sng7xwfcls6dc05k9p3q8v3";
     };
 
     propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ];

From 92e48a4383484f21d2979728a251b257ccc2db19 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Thu, 24 Dec 2015 13:30:42 +0100
Subject: [PATCH 033/249] xserver: make xkbdir configurable

---
 nixos/modules/services/x11/xserver.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index d637a753bb2..2bcaf2cf2a3 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -280,6 +280,14 @@ in
         '';
       };
 
+      xkbDir = mkOption {
+        type = types.str;
+        default = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        description = ''
+        Path used for -xkbdir xserver parameter.
+        '';
+      };
+
       config = mkOption {
         type = types.lines;
         description = ''
@@ -462,7 +470,7 @@ in
             target = "X11/xorg.conf";
           }
           # -xkbdir command line option does not seems to be passed to xkbcomp.
-          { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+          { source = "${cfg.xkbDir}";
             target = "X11/xkb";
           }
         ]);
@@ -528,7 +536,7 @@ in
       [ "-ac"
         "-terminate"
         "-config ${configFile}"
-        "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
+        "-xkbdir" "${cfg.xkbDir}"
       ] ++ optional (cfg.display != null) ":${toString cfg.display}"
         ++ optional (cfg.tty     != null) "vt${toString cfg.tty}"
         ++ optionals (cfg.display != null) [ "-logfile" "/var/log/X.${toString cfg.display}.log" ]

From 767f145a605a72e282abc04a98d8820d0178acc8 Mon Sep 17 00:00:00 2001
From: leenaars <michiel.ml@nlnet.nl>
Date: Thu, 24 Dec 2015 14:41:23 +0100
Subject: [PATCH 034/249] blink: 1.4.1 -> 1.4.2

---
 .../networking/instant-messengers/blink/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index 7bb14efc1bb..9c75af2c77f 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -3,11 +3,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "blink-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
   
   src = fetchurl {
     url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz";
-    sha256 = "0lpc3gm0hk55m7i2hlmk2p76akcfvnqxg0hyamfhha90nv6fk7sf";
+    sha256 = "0ia5hgwyg6cm393ik4ggzhcmc957ncswycs07ilwj6vrrzraxfk7";
   };
 
   patches = [ ./pythonpath.patch ];

From 8c4bfb747ec23a7aa58ea080d386fa4f296f34f8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 24 Dec 2015 13:27:09 +0100
Subject: [PATCH 035/249] gpsprune: init at 18.2

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

diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
new file mode 100644
index 00000000000..dead3b83dcf
--- /dev/null
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -0,0 +1,32 @@
+{ fetchurl, stdenv, bash, jre8 }:
+
+stdenv.mkDerivation rec {
+  name = "gpsprune-${version}";
+  version = "18.2";
+
+  src = fetchurl {
+    url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
+    sha256 = "12zwwiy0jfrwvgrb110flx4b7k3sp3ivx8ijjymdbbk48xil93l2";
+  };
+
+  phases = [ "installPhase" ];
+
+  buildInputs = [ jre8 ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/java
+    cp -v $src $out/share/java/gpsprune.jar
+    cat > $out/bin/gpsprune <<EOF
+    #!${bash}/bin/bash
+    exec ${jre8}/bin/java -jar $out/share/java/gpsprune.jar "\$@"
+    EOF
+    chmod 755 $out/bin/gpsprune
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Application for viewing, editing and converting GPS coordinate data";
+    homepage = http://activityworkshop.net/software/gpsprune/;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.rycee ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92042392094..0aa6c7da7cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12031,6 +12031,8 @@ let
 
   gpsd = callPackage ../servers/gpsd { };
 
+  gpsprune = callPackage ../applications/misc/gpsprune { };
+
   gtk2fontsel = callPackage ../applications/misc/gtk2fontsel {
     inherit (gnome2) gtk;
   };

From d491005da1ac858621771285b66fbdff297bc3af Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 23 Dec 2015 23:52:28 +0100
Subject: [PATCH 036/249] josm: init at 9060

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
new file mode 100644
index 00000000000..275cc8ff2ad
--- /dev/null
+++ b/pkgs/applications/misc/josm/default.nix
@@ -0,0 +1,32 @@
+{ fetchurl, stdenv, bash, jre8 }:
+
+stdenv.mkDerivation rec {
+  name = "josm-${version}";
+  version = "9060";
+
+  src = fetchurl {
+    url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
+    sha256 = "0c1q0bs3x1j9wzmb52xnppdyvni4li5khbfja7axn2ml09hqa0j2";
+  };
+
+  phases = [ "installPhase" ];
+
+  buildInputs = [ jre8 ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/java
+    cp -v $src $out/share/java/josm.jar
+    cat > $out/bin/josm <<EOF
+    #!${bash}/bin/bash
+    exec ${jre8}/bin/java -jar $out/share/java/josm.jar "\$@"
+    EOF
+    chmod 755 $out/bin/josm
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An extensible editor for ​OpenStreetMap";
+    homepage = https://josm.openstreetmap.de/;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.rycee ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0aa6c7da7cf..a1e729c7f06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12206,6 +12206,8 @@ let
 
   joe = callPackage ../applications/editors/joe { };
 
+  josm = callPackage ../applications/misc/josm { };
+
   jbrout = callPackage ../applications/graphics/jbrout { };
 
   jumanji = callPackage ../applications/networking/browsers/jumanji {

From fe287dea9b69a34c7f7d504b47ce290cf188b7f8 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 24 Dec 2015 23:04:07 +0900
Subject: [PATCH 037/249] firefox-bin: 43.0.1 -> 43.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 e9b171dc94d..57f0550a793 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.1";
+  version = "43.0.2";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha256 = "77cd7332ecebd3e51cb45896d61494e95e57707dcc1393af00695f8232274c17"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha256 = "792d25a8d536d32dc89b655f5e3961b704fa27618395d3ae637180242eae2b71"; }
-    { locale = "af"; arch = "linux-i686"; sha256 = "fe211798f211a316a5ecf5a5c4dd61389e448b45166c681f886fa1e97bff4734"; }
-    { locale = "af"; arch = "linux-x86_64"; sha256 = "7a6e077c0702e7c832a9b9c5f35a70f19dd4c0c9f910a8a254fe165a5f3d8331"; }
-    { locale = "an"; arch = "linux-i686"; sha256 = "a01769decb90c7235f2cffcb6eaa135ba0a838e182f8398e12ff664e8be500c0"; }
-    { locale = "an"; arch = "linux-x86_64"; sha256 = "8e4b243cca233a6f00b07ccb5ac2330edc5de590d2d6b787d753e965fd6e777c"; }
-    { locale = "ar"; arch = "linux-i686"; sha256 = "e572f980f5d28b994b930d3a5665e92f8ab5c149a19a99132bf93cdf2bf75fbc"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "b42f56de042899d67461fab43d41f9b23817e879df23cd0c4be748b701a8d5da"; }
-    { locale = "as"; arch = "linux-i686"; sha256 = "652919614ebd2775d3a13706ffb09959655f9bb12f0a120698c1deec6c244554"; }
-    { locale = "as"; arch = "linux-x86_64"; sha256 = "62793f511b7a4244beca42d5dbb235df8431f7156a09fc4c1227cfaf19fe8885"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "e6a8ab24ef5585cc5204b5150066c8e96fb30c15b89a7c885fb8def445f2734f"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "e8c286528d5149c58bbae4a75b2d95c408e81de85cfe68e431d97f51c19ec0b0"; }
-    { locale = "az"; arch = "linux-i686"; sha256 = "829728affcb12321102bee38eb5b0e428d9a9d910a69bb299e77452c5bca6f02"; }
-    { locale = "az"; arch = "linux-x86_64"; sha256 = "aed06f78b55620e2632a9fcb4cbbf36f34ad1510ab7df2dc3de94c8c57f79263"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "257afd489537fa53ae84daf819a859a62757122d824d501d95c5010235c345e1"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "7021ac97b762b7d17a498c86c52551056b0cc388a8e10e81e034b845e05f0925"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "a2c74efe9233c4b3bf1a6b9beee417b869ef129e6b60a3078e9528a84d354149"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "a492710cc54c9bc6e406d558063bd16158059fe2e87bf172405b3c6ea38eb391"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "465bad32dc16f8ddb669d032a217ca5863410384b40a86b81290f85b2fc85811"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "063b1642e0ea6ac8b07baa3969698337bfc3a96db724b7a32a668c2e4cf516f1"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "cebcf89bafe0cb88e1d725bf4b4caf72f845a6abd7d5c0ff9b9ed02c99eba686"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "85b51db611b917d3ffddc6b1bf39405eadb69d64473731780fb21f4db42a94af"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "997ae06800cf75ec62084db0f453caebe9e6ef0cc43abaf14a623785ca365a2e"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "4455965e809900bb42595c7c05365ec1d26b7508c9d7ca24ac636be4b6583147"; }
-    { locale = "bs"; arch = "linux-i686"; sha256 = "0e88abaa021e9e435e41baf59590e4d2ee7c3ec442b01620297671f4c4fa023e"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha256 = "229ad924b0c72823e7599f8a53df0c1fe46fc4d9972e18a32caa78bbd7f72dec"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "5f03a177cd4ea81732329f7ee62494ad25f79e65f12ad4e0cb244aaa95c66e0a"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "67f29e97d323fa8ccf1e14f1638beeecf5489701a13509cd824b61e6c64e0b96"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "100c1ce1bcdbfc9b4a6f3e576e71ca9cbc771ac7d28d916fbfbbf40c7e37a42c"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "178373db4c0ca4edd6150595529d62fa38912a71ab0d6122fe8ba2ee5947f7dd"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "fbdf1b10f6f07c21669a5d515e9c14b3ad8b2a606e2bb997cb75df4928021f48"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "7444923521bf421fe60c721fa16b6005f40a108813e547ef32c0c1263d687630"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "4277aa0783b92e5a101ef52ea191347fb873700f8366d06480dc2445fe7c391e"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "9300787407ca226bf1ac9a25f8f4e9428793c032ca102c65b1841a12ebb508b6"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "ceaef87cf7553368a919396c3c303033fe6e1bb23477549ff25d2426473127e6"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "55b7296fa2643d7caee38fa0e282959cd0160fb7f8a89bca11085d6bba40a679"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "7b92682d19f457d162c537bea71f9c026b36cefdda440f2a1ea489f44fc57f63"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "be235c2af381500a5cbc4f0c400106a31b00a49fcf19d2a981f5ee7221f7617e"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "832c7f65d97795a284e93bec61c14ffcffaf74fa3fc844f1ae896058f0409e72"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "4758c97ab627cd7818f4a38febca52c11084e2c8e0ee2d05f70a6e1f2b67661f"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "02b926d46100116ab7bab27ecbfa60ded6674d5d687f76412443a52e5fdb4283"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "98d83b9434d948d7fbc24708363d1c8e8d37551711994c7b8448f6e924f49be7"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "a8530e2b5d5c16c1afef6759a9015e83767271046537a050442fd6c457986746"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "ea797acf50c2efb39968773864aeac0bd17dc3a1dc726b3ff95780aec01ea669"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "4baa2cc65dd053e226f4391a975c162c8c709f31f82c31d7707ab168f8c249c2"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "93ddb0c696131e9a7a258fc44eed88d5aecac50f101106211e69220e602c949a"; }
-    { locale = "eo"; arch = "linux-i686"; sha256 = "eabb1fad074ccc3887fb56eda2d71f51af3aa22541d310f0c25ddab0a52ba7a8"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha256 = "280f9010cad2583eaca8892cbb2600e3b98d77181ef30f5cf233951e26414df9"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "82741dd5a2bdb7541d931ed8606ec483f44b0d6416a3f4d9b3fa1c1e57cd3390"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "10499b8c57d6d6c8976e80e5b50c278846c45d408a2ead66328c780cb5a40ed2"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha256 = "e5879a71124b429250f6bea231f0411e80c28718a7cecdd7713e9512d21c22f6"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "177b19854746c70fbe1243db51b22e3a96e660def60763d79a340b08c7537d6d"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "b1f2baa7fdeb2a670289fdbea089084f01171c1a5295142aff38a36efe7c4f3f"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "231e9d0d9588732d4aa440e7d56eaa4d6a94457b0805802643c4ab6b5be46087"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha256 = "917e235734993f4a121eb01fd91cf1788b018f52477116b1848a2faebdf6c4d0"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "de6ec93363ae0f814737bb63ff17d5beb2e756d5990ca15f7dca445bfcf83331"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "dacfc817b23972d066a89c2430d0e4ae450fa7c05cc148c726e0a739aa248dcc"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "e114477a85c27f199e807b203c78c148b9b594d3dcf8fefa08bb6b15c1b60deb"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "0fba5ce5724309e251cc010b5bdff861b21934fe21ce810c11bc8f25ef6f2854"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "d43fa45c2e78c112a2dfc00e5486dad0150aca3d14ea87e6184392a394ca0e0a"; }
-    { locale = "fa"; arch = "linux-i686"; sha256 = "fb37966eca9e8077b96187b73925e3ff9d2725954db4ce6a9dcf8fe7004d1213"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha256 = "46e103d2bbaf66e123a2f178b29c20fc7e87dec3cd1ef4cf7edbee379104774a"; }
-    { locale = "ff"; arch = "linux-i686"; sha256 = "46658e4701c21276a2731efa1c64783dce29fd3cfca35edebb36dd094f826280"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha256 = "aae29a8ab6a2245536a7828dc688973589d46c32f60e3e08424d417b2fdca1ce"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "45c19f14327a5ec2a6ca64e9126467d88ff43995e98a9954a3b50b5440a2cc46"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "2ea74f89de5af4ffdcc27746a524114f5160ddc38d041a344367c85856830c7e"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "05b2998f27e59ef1a771deceef92888995503b220b4bd6e60bf62d5bf5bb3b91"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "8b39731c52323fda138e82a6152cefa5f90bed9b3997415feb508498faa96c34"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "b51c3801e852f6ded7f5cc166dba95398e14a316103e34dab71b7bb82260880f"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "44f8629a19a48748b10246df108b2dfb3b685b261462a925c64c337649ee6b55"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "62d5eda1223150bb402ab56a5bd106e5b5e95229b5f4f7542d786d7d6b4e55d0"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "8b1329faf13cd75e960f5958c98002ef486cbd76d8429e800b8930707d23bbc4"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "6f572140ee8ff1a299613c6f459a7de0097519f04fb4094bfd9736fb13bd9d58"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "4d03d82c86cf1e574264786ff2cf6d70201d0ec657ab729530ae90303a160fdc"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "f0f1ab79f93a5467f097b7c5c4ac20847c1029b975ea2bd40b772a9a6ae8c759"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "093cad0eac9c3f399a24ed5cc954f520a997562e05920cb833b44f19dfe35807"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "1ab234f32b8fbedbcf80965661f0db0245826e965d6f6266a329723ea2f5a19f"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "d10681ce58b2b2ff00b0219b0807707efb4005dcb1bb7d63ce4c297d2c6f6213"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "10f8c4ce42dc5a74754bc18d1f2883eee7c02884900435f432be01a7fdb4b8ed"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "9bc878bc21c03717f75f6a24ba604f7822dc2872afe02a00d01fefec593679d0"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "e5cf142f1aedbaee1044ef07e2ab78f9a11658d11544dd4a0f2d5a756862e8ba"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "adea7b2dffbd2b354c1fbb395c661ddf433e65ba2ea0e121e3275ecc0d691df4"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "12152b2510a30b0961715af872c93f16e178d9251b76e69e036f48576795fff9"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "37013843d5ec1056139cfd54d12c490314cf22cd0cef54dd95540baeeee6230c"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "5f9cda6b0a8a86bf22697d05625abb0b12776a5dd28e696ccece9a2eb5147bc6"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "d927c16ad103a0b2c2fa701e474d68b89cf45813b94714d1fed82140ae699d66"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "26522239478dad6fc04c06cf1a4e13998cdc69dd026afe127f5c62cf40114332"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "3742d3f582d5229e58fe918d022b8bd55e856957b95f7d75aed4aefa2983713f"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "d847834c540d40344678d20e4c0a9f30cb3af3b28e0147da9905522c1e43d553"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "672bb8abca09194ffcf402ac89296c31d46c5dd10cec7d98e7588faf98112d15"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "d6388edc053ffd8d1c8b96d09edacec503109f33b42ba89a3a35fee8593e1b58"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "7968be1865b6381f970e514f1f9268bd41cfda5b8e5695544dd93627ec0c8124"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "7239ce4db17389e1717a63827faad3ef4957ef496f2f7b4d7e1e9fc96aa864cd"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "babbec58f631050242183926f0956a3c5ff2a064a8aafdc2d1bdd945b0c353ad"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "75b5f2fa097819a5de8450422b368f0b2bd4fb8e5ff67b60abc9a014939113f5"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "63737299f29d8f52f9ef00e43160ecc3c8a9046c050e6b78c651079750853505"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "6ee7bc9487d9ac5d121a706920e8efaabe9bdc5bb7527f02f38fe27771aa1042"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "f9add10fe74ad4b1fb42618a93f686ae3929e862b24248eed7abb3ab8129808d"; }
-    { locale = "kk"; arch = "linux-i686"; sha256 = "8e10163a29fd333f31bbfa57ad92f2b3cfedec23726779cafa567de80e217548"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha256 = "b20fcb23b481ad30089bf94b704847ae8deae3841c3d032b39d3ec43eef0eda5"; }
-    { locale = "km"; arch = "linux-i686"; sha256 = "6df67080e6e2b8236432bdf7d215b674ef2d534c63dcabeb3a894966e4e8866f"; }
-    { locale = "km"; arch = "linux-x86_64"; sha256 = "983571f48d4517f25e22a0c828240bd00e8cdf5f643c7ad0b094b2a73d7cd2f5"; }
-    { locale = "kn"; arch = "linux-i686"; sha256 = "27e20cc9794805763539683407d3e40a02b8cc77ea7e4ec6d63a73bad36d6a74"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha256 = "6d4733730e57ea4aac60e0fb55b8db00c41d9848f1b9b28811cbada781b557d8"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "81cc34afd043bebd79760ec759eb47b5ac32374ee1e3698327a3520d51f308b8"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "2401953e6f1fdf8a7b5c3bf01c9ae7b0873697f8519ac8c27495053e1a23990c"; }
-    { locale = "lij"; arch = "linux-i686"; sha256 = "3d3917d0fad2cea34325d95e21208f7bc33a5f8823b633c5c4c3e38979f0e4d4"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha256 = "85e8b23f22a5349a649f892b5134ece615ba2832257cdbeebe4d44900d140070"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "4ac4805e59b4a9546b5a035d5599be3bb828d06f53ceaef1a38d7e906da40030"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "b9f0ae9691e2c956a7e7227552d86624a03e99258caab7a4fa8a028f28a50551"; }
-    { locale = "lv"; arch = "linux-i686"; sha256 = "552e9bd5a00373135a165bbf05d2edfbc6ee6708b0b6e2ff71c7762d44baa303"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha256 = "7591d8edf125a3c98383b2fdcb84016659ada7314cf15390401183641fffbe2a"; }
-    { locale = "mai"; arch = "linux-i686"; sha256 = "c25de9a04ae447b39c1ba33e0e1ab56a1e085a2fc6d0bffe4d47f3c2e6353587"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha256 = "b8bd88d4e472f12518e848900947fea0070dd6acba698fe7330a0aec0e2241c4"; }
-    { locale = "mk"; arch = "linux-i686"; sha256 = "baa001a2118908ec106717260b6aa8e8a66372f72a6424c4ec77545ddfc586c5"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha256 = "cbb8e8c9184ae617809603c0ab0704d0271d7bc5a84b0d7697dd5ab980a1108e"; }
-    { locale = "ml"; arch = "linux-i686"; sha256 = "5defd3a75c2f7858335b5bd2f5d46e555e237af7be3cb671f324a107fecc04dc"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha256 = "bc5dadffe98a2fb127fa0a83442880359123630e944516410b48a923659f0f70"; }
-    { locale = "mr"; arch = "linux-i686"; sha256 = "fa324f6e164be65b94e5d9dd56f52dfed744f71403d06e1ee6db6d653fa9c56e"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha256 = "e52a794c144c062925e310d2aae725152e70b2c1c61657772ae639f2a36bf656"; }
-    { locale = "ms"; arch = "linux-i686"; sha256 = "a27bf493efba61fc01f2c64308338e510671708895567af4b209fa3bc41718da"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha256 = "da349192ee2a36ed48e3ae8ff4d1acea55877544c77a2b07dd2f017ce4f6e1b7"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "37245f0291b519b436b1b862299960a7961bfb496ca18c247cc5014ccddf9427"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "02c93155e20775db45d05cd46a8b28e2e88c2a20dc4c847ca0ac4844691c4a2a"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "c449d3b9b9b1aa3e438e7380f7c9c89c3d91f207f798a7a5dea11ea05371caa5"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "15ccabff42c778fdff18757bfca234e0bf1bde589b76c7fb950783437cd9c0b8"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "1ec5fea33f0a150c1039386ebefef81acb004142ca4d18023d6e86852969cffb"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "3a8d31dd02895a7113ed3eb4cc004b2748c39badff206f69f2f9fe0aceb1b013"; }
-    { locale = "or"; arch = "linux-i686"; sha256 = "fa93ce73fa59876f7beb0f48e484dd4561a4d4c2c187d8c896f5e1e5f9306342"; }
-    { locale = "or"; arch = "linux-x86_64"; sha256 = "bd3cdf10fce0ac75bfa2e5fac591b09c8351a3ae2f2018e45546e77d85c384f5"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "5f2917636c1b193b3b7136bf6444a0924f693916f981456965cb452d58812400"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "a8f440c37462a4712df9cd274fd939a4c5bd1a5e4d38435499f598be36b18e1a"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "757cc7c6d9e6cfd701b0a84cce6973f356b0f16781ba80ad92b66c5bc8389d65"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "45702d113636970e97222bb7ff48f8e54e16912e39f9c576a17b1ee3fd2530a0"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "241ba56480c8e7a983e26fa8382c3a5f177d31858fd4453b6ba42578d1d0c9ef"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "90f03fbbe12256824024050698e231c3093630ebd09be56e372d4f76e89b55b2"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "af2e770bd86a2d683883ce9e28be32837be55c3e705430dd5b60d6684154969f"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "dbaefe62b8285931e1a09b70f6082c7c52404117d0ee92a343250b419a2399e3"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "b559d1ffb96587ecf335b6cefcd8f4155161780f6121d19f244d59b051f2145f"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "247029e16aa38a83aec68e7269a93a1ee6f6cb9846aca97fd4a2c44a22ff2b64"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "d3555d64bb64958c577af8ffd958eebaec8cba00a9755b2005bf480527fa52cf"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "e81aeb9737cfece9ae9e886fcf32a85aea943ef4211af8a4fee46cca8b9c9027"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "ab93abbabb9f0d605cc8a0775d3a25e383e5d16c19eda2c5d88fbb7353f4983e"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "304c4eec5ddb2416b71fec38bb2eb0bb9260a9746bccc4c31b9ebf97351d09fb"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "4f946959e40dfff8fa83654c733e3c7dc5cd4bfe2d166d454a1f9c98cf3a7d65"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "e06e5d2ea19ea5f4e8db666a53c1854f7861a06f53d2bfac8bc3c128bddc9f87"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "10aa224b3e7eac73f196d4c8ef836b903938c326ee86024f56847afb667cad35"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "376e803c1626a6cd47f1627c4d735fba422e48385bfb5333b58a52115ce13ae8"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "fb15fc51459c916a9c9c6e3969dedd873fdd89d7864d17d6cbedb29e905b6749"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "ae545eae7e637aff1825913b454eb9be87321a1fd6d9777c6aea33aa4159f629"; }
-    { locale = "son"; arch = "linux-i686"; sha256 = "9df97e243e34df135c91476a4bfb632e0a1e0935afc643f142b1536d0f6c3c1a"; }
-    { locale = "son"; arch = "linux-x86_64"; sha256 = "f8f0ba26226d12bc5896d67fb52e4f5166f307dcc1ea4a09faf11a3a57bdefa4"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "0478e708713d8a8d966442d26f02654945e8b888213e1df017b09de066ddbeb0"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "516a655ac44e81f530673aecfd3ce2d50487b79e00a89ad196ba8772bd87eb3b"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "777d1582a745eaa1134282cf9b299fabf1eaabfefa045701fdf5ccc33ea7f439"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "2675e68d168baa851bd8c7b320818add6135ac96f938ef9039807286c82d9321"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "a2af1b6c6f2a054176e2ae19d4a8d1ff659fdf25fbb6dda1ae01fe1d3e20fce6"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "dc8ed365766fe29849f3840d05516be2c68018b3165a2a83bce4c4f1fff63a9e"; }
-    { locale = "ta"; arch = "linux-i686"; sha256 = "d24f0fe9ee72cb88a214873a49d7734b9a0e78fbcf39baaa5bf72a50aea34ff7"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha256 = "5a88e39ccad7f3aca46d5f0558194b13c33e557c58c24683eadd4484566be219"; }
-    { locale = "te"; arch = "linux-i686"; sha256 = "78b61877ba4b89b9a7d2198d59c3331b2e697f8bf9c55a3e6e734cb3f4e3df91"; }
-    { locale = "te"; arch = "linux-x86_64"; sha256 = "693e5253f4564ae69a21a25e18fbbf5902e2e5e39b388d1cc30e35f9a49029c4"; }
-    { locale = "th"; arch = "linux-i686"; sha256 = "372f36a5ea8fe5b92c2aa1ec7fcde80ca0bd006cdc220b14d1175eeb11fb7679"; }
-    { locale = "th"; arch = "linux-x86_64"; sha256 = "03b1f0037809b14f7e2daafa7dd43471ed914e445fdf4d12c5bba50c4b66e0aa"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "d030908f9ed247e93a4417d48ef3b4ab136dd5325d5a7e8894f186a6a5179a3f"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "9e15c843feff5d071a4a8e3be64cb2faba9021846c7d5bfe13f206ce91300eb9"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "1b377aec5af5af4021b5385f2a46198d181d1c4d8994b2a1a4108bf9cacdcac3"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "0b158a684610ca92d95868605f18dd61040e0bab820ef7e858505d04d8b5685f"; }
-    { locale = "uz"; arch = "linux-i686"; sha256 = "8d905bac16fd022354aa54743ae12afabc6f823609586f9ca12ea6b9717ef9e7"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha256 = "e22740daf104694323437ae5885aaba67fb7392719c0872ba6f07e2ea73557c1"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "372904386e107a595179b6a0f6bed84e7f986878e054c7e052c3e0378b2a9b2e"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "9c6e2f5cfec7d468dbbf3bda667b00865fec1f10d90a0ba9971ca4c33e8e87b9"; }
-    { locale = "xh"; arch = "linux-i686"; sha256 = "b056ba0741f09be1d2d2e7980ecc17e813c587080328959e7f4362409fabac3e"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha256 = "075effe19f422430948c0a90255ba26bcbf0a4b21153652c1d582ab626eb6be6"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "e3e8b0e0bba1a9a583cb0f82e24d3898f453a9fc478f119ca15f9a8c280dc1e8"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "92236719b5553aad48215b51d13173f7c2673afc4f05d16d92d74a102efa8a22"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "7400fe4f31e95472ca7ddaf2fc0ededa7b8fe709d32674a264639bd065885aaf"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "7f5dd7597600175f7d049d99558c44910ca5a3d07b4ee1140d1ad7e5fb4e6c16"; }
+    { locale = "ach"; arch = "linux-i686"; sha256 = "da9307cb24c75665adc6a5e02d3045eac9babd33c6da778167644d13cc685de2"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha256 = "1a8f13b44107e9689aa339f19c8247142ce82ef9a63bb4be077c212d4d4ad03c"; }
+    { locale = "af"; arch = "linux-i686"; sha256 = "b8dcbf287b350becd7a4e1d812a2251bf10861fe6fe3c85ea9b56e4aafa2a156"; }
+    { locale = "af"; arch = "linux-x86_64"; sha256 = "241a503d4cd2793c538a5cc1ad0990b2a5cd40a584504cf5dde77a28d2f47049"; }
+    { locale = "an"; arch = "linux-i686"; sha256 = "530f5e4743384e543e4cf829f00e5f37adccf64b4af5067aab1e316aba72c579"; }
+    { locale = "an"; arch = "linux-x86_64"; sha256 = "1bbde5a3c897ebed7c7820362257626835c1adfafb29a20e80bcc4b1c40407b4"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "f254b2f7117b866e2c8611d5367fc1e2a8e20e1997746204234ae6869c01f6e9"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "bec6a50c9ce11906edb09591ed1f37d94291fb67b2d4ab9a8f5f87b0e837c0be"; }
+    { locale = "as"; arch = "linux-i686"; sha256 = "b894da79ba753489a3f0509aa54abb9cf67c84e80a73bc00d0e7e7483e1c4ac9"; }
+    { locale = "as"; arch = "linux-x86_64"; sha256 = "ef435b67eac29cf4024ad8df1d4efd413ea58fd76c0e4ec2f2595e7c90743953"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "96566e2de543bb4b3bba195b99efb8ec1c01f6ec969dc75293ed66033b52a92b"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "29f9ccdfc93a72db314df43564fce754ddc678b89a55035f23582bf4a7c66135"; }
+    { locale = "az"; arch = "linux-i686"; sha256 = "cc58914388b53df51d5bd78f0e63286166bbf278e691b8589bc7db18257627c5"; }
+    { locale = "az"; arch = "linux-x86_64"; sha256 = "7f1db3428190e1bbc01506a029df8c81a0ea67b301f161a5bb297c47d5db41d8"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "c8bd88c4ffb98d8611d760b144f46ab3cef4f7808f2b1008cd5aa75eadaf02eb"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "1b063e4e4a33b9d29f01d7c98a942446d738b195877a617dd454c2697fd6a539"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "1186851b6a27a2d23572c9fa0a9bfabcfca1925d36e7fa79e5918541892bcda9"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "d185c5eb1640d13ee9fd049db41d267af728de56f833bc32a182f69c4921d1c0"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "fcc0a0c46e913cb7b4d44c502f62ece83ae8d22703419edafd15321b77758625"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "d1e066c2347e109fab28e525b5780edb9c5c063322745d971e4ad79a110568f6"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "3a85767878b840411c57d176af597666aaeaede9a290032f374629eac536eeca"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "a3314e2a9f74d9f2c85e592a74e1353b2f048349ba65bf4cfdf35c72b130cd61"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "a6cd3445e65ca3c818856d6a3b9069aa437ea638f11bb8be520db73604150090"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "9c9f5720b568d768933d7d55bfa7853bb7918bcc651b7c2e281ccf3d2a5e2218"; }
+    { locale = "bs"; arch = "linux-i686"; sha256 = "9c0844cc1dde7712219626148988df642ab10e81494d4794a51a61bb92ddd110"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha256 = "44d91b25d18aa108adf49677069ebd75236f82c7016ee9d518e2ff3f6ad40ffb"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "5669828dec411832064e790e65203dabd3703a86090e87a931c6bd495fd39bc7"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "1e1cec512fb7038327488ce884e171ecda23ae26f98d39159ca96b8acea2029a"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "a7bdf99153ae8351c3f4f98db5e65d2a0598457dc0774508fc6ebe26c40ff43e"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "16fd46498fa33334a5bd1cf06351b410f7df41526c195de21959bf837ce5d488"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "8a251c77bbdb6a44163285cacb3a78ffe85835cbe0b9156ad300e733c9ee3934"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "61f2b6b13d9ce1066b6207b16865a038cb35c51f61a5bc05503cf948704320f7"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "d1e5d20f7b396bb8b823e7a15a6e220fb930601c2df6e9fc5ca588d3ffce1698"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "a5f20fb678a51a526ebd135b149c6769dda46827174259cabbc4912c6f0619d5"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "74e9e40b191fd56e99708910c8798d4a8588271a90eef6f7658e042a0765d0e5"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "470781e1debb2085fa538008cd3203c64b534b5a88c6a6ac01418a3ef344216b"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "459e0d6c55ad822bae10a47a7b14004153a3f3363026556568d7108411318104"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "97fd138bb33c80a3213b33d4796573b65d4659b888959730cc02e726bcc65388"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "41b684530ed9bd80c03cb0cd8b1e4de8b3af383f611884965e98215ade1dd8c7"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "b1a7f2a4de87510b9630c6cade94b7f628bbf04289119d3912ea0eb5260b55b2"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "3c40217b451bd28dd5f1aebcb9a9f7aafdfa3c9c7fd635d69674912a9e73f77c"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "6aa6cd0945bbe97b30e431fdb09a4deb45a0aba6e1283f881a35732b7403e247"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "dd6c585c24e1e9212b65eabee8e52c5dbc9e4acce4fc51c32aacd82b3c6333e3"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "9c56ff8734eb860a6038f6bd00d98aeabe57037e230c66d551aac451a27efa79"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "0335775eb1a073d1889e8a43f913ea096bbd735a0b98687c75c7fde5eb636f44"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "5ab68e226bfc141167a477779181c48a84cabe80f250c874182ad0364d0c3dd5"; }
+    { locale = "eo"; arch = "linux-i686"; sha256 = "99a0cf562a067cd30d1047814c1984364b1702e93e638016a4fe8910868cfcdf"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha256 = "ba0bc0093bf2b0ea82eb958fdf06683f4941bd9a44138c793175a0b9e5a86ad4"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "3adaec2ccb2b1949492c27c466daa5809afc690bf0559418d2d60faae0b5456a"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "67f774442c64d653d624a270eea1202fad389f926c6b7dee56ef965e65311ef0"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha256 = "ee56546d943795434a6759a55dec6e848f244691dc234f4c62746aa1f73cb85d"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "cdbf12f21efb2e18d23ef9c6322c96469c72140200fa47c554067df3a9f89b8d"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "d3518ffe26d3c21beb009c657b93cf2f01be416f697d89beac497c71044f134a"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "ae34d9f586b28b1063cfebb755edc2a11214085f3a185f31d757c2358493ed13"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha256 = "09a03624363efba7e5d707c312f58e577019b8b7987d817fe1cf77bf2afa7dfc"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "820c50a0991779f664be8013e10a6db2833caa4b1fed370a7d6a8eb71f5766f3"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "bb2d259606836c5d01d149f2735639cad7411efcd5e0e5deacdc3f1bbae8d80d"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "17265f828cb3232cca73b3bf5b806cf361769c77bfef0e6571a16eb73036cccb"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "0bedcadc3b60ecb58af25d5950fe693063eb80f65d6d85e72ff0cdab3e7f2030"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "371d5648c7ffaf325ef34030ad0a9971246bc1df354fc11dd66bc461dce303fc"; }
+    { locale = "fa"; arch = "linux-i686"; sha256 = "a7c55492f08e5f44d5cccb015d00abf8b8e74dec7da37e937f8d0f76a4c49338"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha256 = "6fe831c56d96dbed1c4a6859ba58dc20bbdf43efbc2bb225a707df7966f8b9dc"; }
+    { locale = "ff"; arch = "linux-i686"; sha256 = "5cf4f3235db02c385ffc355e0fa1060b79afd5a8899ff31da1d0dad4d065e4cf"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha256 = "0576772ddcbdbe3d26ae20dd47b4e635de709c34eb6a797afab7743ac68815bf"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "8edd2e8058fc848456b2dc1bb54f669159b232b5423dcde6638e5d61294f1ffe"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "94bd189308502abea3d6d762378220097d3d743cc42872e6c43cdcd86aa51b4f"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "652f87501ba2a5baf1de865d7a607837a9ed623834c2d796baf4e3891fc78a6b"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "94c3725ea6fc2a7833e9ee60fdcd0ae3a53c80ce7f13ca00634b5d99b12a4607"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "8d9ed839afa148da954acfdca139dbcf9f235c097fc7c562a8ab52f9ece68b4b"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "650c8a50b8473fd09dbcd1c818ca8c3ab0c6618696198124f32e0153307e2aa3"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "a70af727b36bc7d084211a880318f3a9f73977ff75f728b50cc4bfa9398c61d2"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "01d3635c38068facc135fcca979517d729999db52f4a00c0b2ee27cf830df870"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "9763cbe0387cb86f91cdd6b1dfa6e257cc40c4525c753869ee091bfe49f172e8"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "16d3452fdbabada41626d981dee0e48282d672d9d6073b363ede9e86c4ed56ce"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "facde8f17e2f90e49a02b36d016535e1123c7f78ac44ee1110c80dc472e84133"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "b0955c4381f7f0013e9e0b1dcf8d8c53a3bf694af6970638b2e88dc080771ed7"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "cb42e0750736bd14c81bbb76bb05e02c97e798b01d9f41bad091295f9bbb5655"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "c497650eda2e4fc0f99b9d9c1ef0df33b0ea7b6e32d2eb7d4ee109e5ae1f2add"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "d4cc561b6ce55f0820e6bd8479de9fd1ed53fd228e7cef28a890aebd687c26aa"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "9294083a0ce8b06cc565c9d643d3e45d50393a5abff230dde8fe42aa29d8b870"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "3493dda678fe94e13d34a62d194b612037f472546b96a94de2390706139636ef"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "db45625e758d3db82705373004cc16176f8376bf087ac11da06c7c22e613dc2a"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "227399d033c4a7877387ac965d84ac265600bc16614de1b99618f39808b92894"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "a4f061ed24c66f936da13f8d93eb311f8fda7cc468d7cc9f71a4c747bbd9af19"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "41bc010d4cca63bc77b8d637e6ca2731e3c5900b6783955335aae0ee3d2eedae"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "4618d03269cad3fe8ca3d618de581d37fef37b9276e72613d2c12b212bb2c894"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "be456ef5df061985f7413fc7af45b4f0b86ac4a99a57d3574d8ad6dba727a8fe"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "c229ca2c9fba2ac98e912e5c5f4500d423b1f2cbf768e539112e97c0f0fe410b"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "0a569d1b8c8d685c3eb5701471420aa47110c737504a105f660dca72a82490af"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "b15c86feb6d69005244f409290489d8f5ffaff0c85ec876ba931be38c7de07b0"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "dc8ca98414ccc67087c896c84a0a223026f12ed9fec499eba6203b8ec0b3e6e7"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "6a831ab4c2605fdbac15ac81853a19f5c8633756ad5136f93c3eb76637e2b997"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "02e9a2022c0da27e069689d25ba80c1d04dc29e6a045833fa1c5e503b5ca9f9a"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "0ffd2b8f1fdafd91ae4e089c075446f57adcc748bea4994d40207e5cba9a5655"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "f84d5304a37e33883322c9c508f4d342f99901c9339d293308ef78bb561a3c40"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "78c5cb912d6c24d5a7636fd400470d298e4f58493ca6fd3e5f6b88e4b8037e77"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "a3d563846ef60176712574a9f66d24a785f749390afde21cbc4823e9d30cc3ba"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "56bdf673d645dff09e96970fc4cb33b1810d57051e7c12f6fe1ba01fa971e293"; }
+    { locale = "kk"; arch = "linux-i686"; sha256 = "a5b10502bacf265e2157b7246457c33adcf037e4e28291e26a7fdd9f53f94638"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha256 = "2a7c74168d040653cbc31d6d03846b9165f617cebb74388818d73d681056561d"; }
+    { locale = "km"; arch = "linux-i686"; sha256 = "26e696f0a03d7d6c3541563f89ba08d06a47039ca93f15d2f1909db7ca1b8d08"; }
+    { locale = "km"; arch = "linux-x86_64"; sha256 = "18676450680d18631a855dcf91fd4592f8e3e908b04122476ae62d619bfbdd4f"; }
+    { locale = "kn"; arch = "linux-i686"; sha256 = "cf6c95c0f06381f3aa4eb03c8854a530e63b0b5c6d971dc019a5c6cf81f80b0b"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha256 = "fabd1b824a4593454f8c9d7c6c47f7244ec9d1800cbe397042fb3bc41a75d09b"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "d3d9ff36de18ca424511df1ddbd4c49c84499491510a064a6f55f15599e1c172"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "e8eef3e4c6201e1d1e936ee6ec53f875b6c2a0496d308b8fbe03b5cbdf229bec"; }
+    { locale = "lij"; arch = "linux-i686"; sha256 = "de6b35a675539d1bf0ff1c8f3837ba030da64b0e51c30e594515ac13578495f5"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha256 = "9d2351a7bed09127b618cfd86f2d394fdefcbbf2801da3a60a697982b5bbb9f1"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "5e5c3d5083b8d71a249f9e5009072132c9524063fa0cdb1f47ad0ff5260725c7"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "c57df2ce20d09070514f783a12e179ff05a4ac14e7ec67b0081f284f70079468"; }
+    { locale = "lv"; arch = "linux-i686"; sha256 = "30267f85939965eab0ec50f4c869a0a42fa0d0775ae516088f9a3ff57f1bf3d2"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha256 = "c1389231d627df347910d28172a823da18f2ebd5697093035faa499da24755eb"; }
+    { locale = "mai"; arch = "linux-i686"; sha256 = "6dec829e1ea28f8c4480d0517f72909d2d652fd827693dc919298906b62b47d2"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha256 = "29ed57ad173243d7cc2460a534c3f63709e235db74810a0d6f12dc460c5f4a52"; }
+    { locale = "mk"; arch = "linux-i686"; sha256 = "98d4c529ca979e4ba03b3c1640feb0c93ca1ac2a92ac07403a39a07adce8df44"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha256 = "53d6752d67e3277afe3ea239ceb1f890edc5a15fe078d41bc074246598376603"; }
+    { locale = "ml"; arch = "linux-i686"; sha256 = "321d682e8e1e42e8e4522d791e7e7ae13d1622d740038f3586813099f0275d96"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha256 = "f0dfba4cd8fd961ef6c088ef9139b8ce5e33fcefa8cda142c9f51bfae663c092"; }
+    { locale = "mr"; arch = "linux-i686"; sha256 = "b40b8fbbe5ab56055d57f7b9a67ff00e84b7c7d19afc7bb07b4311ef3fb6c66b"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha256 = "3bb64e13d59a1c65460282e4236655a0c2997d894e9b897a8dc3b20a4baca3c9"; }
+    { locale = "ms"; arch = "linux-i686"; sha256 = "15aeda467f0c0c893dd923ee56fcf2547242f0a4089709ce0cbdb27778c71b1b"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha256 = "32cea21ff68efd7c384746c32c0138464fbae4d25065fe58d6d56e191ee5b082"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "371af3de1ae68ba242cc55cb7c080008ca305c61d5c8c4e687f53568bcb8f416"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "54e17787e0d31893dcba314e98cfb795fd6f85e335a0e84ce35a0f44a56b6e1d"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "92df7a99107ccd938800161e759beb6269a6a30f69c892064e130280a3caa692"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "41c1bfc828917d58cf8f334b8d2b333ddb50dd416faaae41a0c063bd8c23942c"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "ad96e3c670c244d366ce0d600d87a308d95e51309ab86becf1c8c69245dbed0f"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "eee10d92a2bcc32507936c3c2c5c2c220a4de955aa8b48d23f0d923c9b0faa48"; }
+    { locale = "or"; arch = "linux-i686"; sha256 = "1ddaa000c9b3d5a7dccdddaeb8fda53ba821935bf24ee5c2ca0053e3b2900bd7"; }
+    { locale = "or"; arch = "linux-x86_64"; sha256 = "0d62ab80bdd5853d8dfae01d9420929d9321d1f6b9f40d372c6241f1345de76a"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "accdde423ac5c518d14b435d00e1f536cd240f31108b58f0b5e1a925637faab4"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "89ae2f460c6fdab846d6b41dba84f63c94a7bfc1f61e3e79da5d643d4c1a1fca"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "d8e043d8ba0c223f0232facef10b6d2e2ee13733bf8670a9101796bfddb3c2f1"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "f6ada91433d48b699c02fddf22e2d8aa36e6b0cc365b73625bf6fb80ed3fb877"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "b2d294d7761cfc3c8a58ee072bb8a0b82cc79724f6b103073632e682fda32f60"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "642c56b5d510f5efc8a365be956789d7760bfe983aa397ae194eef5bd15f601b"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "6bc224414c39047c42040ebaaa7e7d61bb09939a9878ec4a2d7d7e8c31a7ecfc"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "cc00a2fb38fed6ffef5a6a6931b043c65948c18f3d502a0e3ae641a1847203b7"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "2cebf2678e1a469447205a7495f17185259d73a72439f8fd400eee957e571bbc"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "32fe2ef01b0d495476768eff7e4750c2c82196e60f50c2e824adbf611f275289"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "289cef6b438a59bac459c203a6b1b2965b089f1487ea78ff524a6a68f5996862"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "7df67b1a5a12297a214d1f794c84b58ca12a182ee780e2574116214dfc785388"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "65fd6a9a90b4e5c8fc784850dd5bce41901b0d241dae9c37110bf99643d52d32"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "585683dca4c427ecbcc17d42465b6e374a76d5266b908df1b47f4a1ad81e7794"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "6567d5ab15a1bd20426569a6480d6e44f2c1917145fa607357f0d3d0502c840a"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "f0aad93013b6070516851a13352d1aabd0d10bd7891eaea878d3632c1b295296"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "c6da9d539302dca6ad8e3165ca595eb80438fb4caea11979c0e07ca215696929"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "236dd9171f471849e8cddb2b8ff0166e41bdedcb0bb3c1662fdffa83c3e89374"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "4b9160bfa7579fc893a40387f0185cb74d7db2cfb0eabd2aa032259ed53b7a97"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "56bc853e4e5e21d08b2ccd04687388473c45ac4403d0b51ed41d8a6a3a26e396"; }
+    { locale = "son"; arch = "linux-i686"; sha256 = "b73fcee703ce937ec25993da5e09163541fef9eaa4e65ec7d5358f1dfa1b596f"; }
+    { locale = "son"; arch = "linux-x86_64"; sha256 = "95ef838ac58e82ec435ddf7e2ea0bbf8b8d1bdb34832aa664d1ad8f5abbd9a13"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "370313d2cf543ab3aeaa5de11f748d69a168a82d6e29c27d4c398bb577fdb06d"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "a86a6604169ab6d9bc2657a0d26db0a3f96b2927223c5a43128dcf49bad243f1"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "a7ad2ec678944f37cfee69025871369b658013f77df9df0f1bbfd9cbc03666d2"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "b081bc35064722b4de95f4e29c4ee203bca124ebe0c33bbf91f0e11f904928f7"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "5a6fe1f1c7e1d5bd91a0c82e47ce5b88e31611cf51d6452afde3ef06d2d1a695"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "9a09a020acabfaef4fa25d94723fa437c57761f0dbd9bda880b8ca3acb5248df"; }
+    { locale = "ta"; arch = "linux-i686"; sha256 = "0e0839d5a899576f3fd796079748dba8612526bd5f855e8718eccb3ed05944c0"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha256 = "cdcd8e06216289df7cdb4f82f01207a7112fa4f52040bd70c2f497b3d701730a"; }
+    { locale = "te"; arch = "linux-i686"; sha256 = "e4609f803edb243ba8c8fbfb7ecea2e652a9e94adeec2f6c03af42c2e8bc5b74"; }
+    { locale = "te"; arch = "linux-x86_64"; sha256 = "b9151a27be6a8de94fa25b53dfb85e765cc2ff823c2de6a0d0583883fc30ea48"; }
+    { locale = "th"; arch = "linux-i686"; sha256 = "48349866a10948cc0b4f8b6bc2fecd5dcbd4d09ff4ba569f7fb3e569edadd976"; }
+    { locale = "th"; arch = "linux-x86_64"; sha256 = "ef38e6a99cc8cb9e32e95af0ae7f7c99b82310e28b082b6aa085aa80f180ef60"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "fbad5fa2196dddb5061fec1f47fa7af85c0a824f520588b7446d2740928e34cd"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "c644f251f1e43acc3baa550b540750fb7d11c2f440c7906e1955d34694a0d718"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "9db7dc494734011ed61c5286fcb1f4b4dfb418528792ef92fbfc3734a9618129"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "06cbcceb189bad7174cf46678535cd4bfb1062e5ac878fd313fc341315001106"; }
+    { locale = "uz"; arch = "linux-i686"; sha256 = "cfa94474277edc7739c11795b2907b894c87f5c573c43aaf5a951a2f13a9c8ef"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha256 = "e3a581e965fbb3711e6ca6d6d5b378eded8e8ea9767f94993c50632b6f4a7aed"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "ecd4a5b8fa66e78cdb93b04eb2b3a5ac354bd5e231d8f4bcbf2acfb94b5190b5"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "1d52852d973d5d6bea8ef860b216aff4eea59dff576f13ae67aa9b96ef0c9878"; }
+    { locale = "xh"; arch = "linux-i686"; sha256 = "24befe5e2fe2001ab3827543f97b52ecd15f5cbad89d977584aa4dc08a0e9c11"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha256 = "4cafc2a6028d8141e47b09a9d8d96404cb4b5806cfaab452566f9a7baff89f25"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "80ec43ed8918fa452271988d53875f184196460b15086fe793af4842458ab790"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "1d3fc933a5b3f4082fac9176f6a802e01f8a26d711c339116799e58629843f27"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "a255ce81f6ac1774ae6c8a5b9208169864a672f22f7037c93f01758c4eaa357b"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "27b048c3df2ff25fd6f7c33cc30016e8a657a2f30ef7b0da9a2f4097c1b5e494"; }
   ];
 }

From 66cddef22178f13209df06427a14d169a2a1085d Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 25 Dec 2015 00:21:01 +0900
Subject: [PATCH 038/249] thunderbird-bin: 38.4.0 -> 38.5.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 e07e972bf41..8b06d083dc0 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.4.0";
+  version = "38.5.0";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha256 = "30383ea1567d2338af99de09f144e4a3cf6c195bc3707c1011171b4c09a885ab"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "0325b8da77e0ec1c97eac81367cbf68c2e4cf62ddd086ab07494cd1705d6134e"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "5e91cb9df7aab8c887dadcdf8d01b0dd2e6427ed570333b66a680c57ff9391b2"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "3e275d4db234f2ce1c226577dbd6289f870c7ac9f3963136eaa6fa097cb7fbef"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "74a4dcbcf45e766b3a4b23a0bf4c08d61b8e8e8923b45d27ca23f2785dd4120b"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "52e9c46cb12b4cdb8d6eaa384717572ef5bd845c18a36d8cfd15db39c4d0332f"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "0dde851fee0eba8be214f8f673a5da9924f84cf1b558d3f76aa80f6008e518f1"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "198607f773ddc38ab1c2433500f53578fab38dea817a24ae94849fa8045bbb67"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "a34e8ae21b22cb80b772a31341a7dd5da23aaddf8685c6a1a20be6f8f3c312af"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "03f611a7029002e593175cb4e624b1d3885c12847115a027d89625d3be9247c4"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "6c61dcc67472b3fd1b8361d4960e0ec2a190e7a18aa9e05060fa80a7d23b3796"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "f4589f1e31697fd65296f306350558ca9355962182e69d0c6f4b303b62407e5b"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "dd2f59e278a34081c6ac3f1c8dbb61b2e9fe188b23715e6917c7034ac562ae42"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "0f77e01e3a9dda94c8dd7cc34ab2eefbfd4bcacc6d09b3a8563632130c3fb83b"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "389e99cc4b2c56067ea02eef9e2e347ef972fe21a20a094c6d056aa5e7fb65ff"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "c34ee1e3607df27a9edc03faed4476533489a962715a9d7920282044e9af2dd6"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "f77986fb3ab81e82e611247066ba6856518a209694cc71592895c4186ec80607"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "549a0c15bbd298e9d3753782e97a0874bf2bfca607bfed484efe3b9fdce3c9b0"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "e56cf65ce0719a3a22d2fdb33ce08113348022afd3a557f2ac39a25e35f632de"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "991b5ff474cff16d106b88ee31ac889c6e0543e15b3bf4340c3c263cd3a3ea4c"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "7f28547c9e67c4d76815337d8f5f39e303d1a1055077a77af42ad4162dd3b476"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "4c16d7477792759eb754cb5770be67dc78dab3cdfb47c29bb3bf038dbfe6601e"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "8f5a82f61c80dd9a1358ee43e192364f34dbba0253aeba00ad0c5d1656e57a34"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "7804c72b8c758193fbd45feedc185d01717133bf2fa1b1d0054ea421224c780e"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "8128d4330fdfa0c5b0e5b309d1957b7523b337f862bd1e9d2286f50fc652f339"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "1d1f7859cd25aa5bd18222f97b4496c8f661a375b1e0404eb92b0bec3bb60ae7"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "980f494e26c8a2904490d55ff2bdfcf8b3d2c82c4b251a7ade3bce90d1e4632c"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "3f3fd4139c64bbea32c53683a2ba75be24fa4a2024922c42b4647ce28a59457f"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "bca69f68e6296608e50bb798e46e209cc3be9f20b5baacc102f7571316f7f65e"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "e8d9a31537a6db91efec6372106e655d73ab3e55f3c0ff2e42e564e2a4da7781"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "bbb8817ed30f591f54d47066765cc4796786f5fa41cd2ee2dbf59001fcaad4c6"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "06b55c261bc0cfbc257c264e9643088682256aaf739c8905cfbd4cd08f0868bd"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "44a77de45e05ad469cd03d17efa4766a1e2e06bc8e2e7a5d954db3aea17b8407"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "f14c54fc64eb586c8015352d24b392268d3b2ced7312a5647fc1385e14f6d93d"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "81b28a75d61d9f8463f18ce48943b0f701f392201655eba4899fa609cb59cd9c"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "974247ffb2e003026d46888b425a5f497b7a6d06213190e5668c085e1c44453d"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "f45344ec704ad5a07639da1076ad2e6b1cad21bb75c9462e5e46abad3e57b588"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "4acba2bb5780f85e45a28f58027b75b2832281a7f001f780b215c564a2da2671"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "74c4d196d31fbc000d541d057ed7dfa31cf713f7964be4bc6fe1c3f80680824d"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "14dfe7b1cf2b1feb8a27628a27d5ef00e64dc401c5aebac1e01e1b94f7d091b6"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "a6749feae77747703f3a07a1c58bc5679c5faaeb207cb5e46f98cbac733294e1"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "201af3653ade9411902e208a2d16a7b0357d2a4a44d5dfcccf59d7939e24e787"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "8521f1f0551531aef107a21ad953fdeaf0b025266f709e9cfd49eab92a3dcaf2"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "195f0f25dab810e4f8a89d01f3ddb837378cd9fd691425b0b6b50653ac9bad73"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "f3f216995781f4ec55346822483d073e4a1c15449df78e56a05acb7743198292"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "ebcbc721eee9020ac52eeee92531307512a8a3f2306eee3952b9343a52381d4b"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "234e5cb13726b1025c96403e8522c2cbb169ba547513c007501230d6fff3face"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "2cffd346a895b520c804d8efc7f92e38ace1256a007d8a95abd5687c6fdebcbc"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "e65afb4d848a4d6922b550888990733046227dd9201c917b161f19d9b5cab232"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "ec85e88f167c195fb1f5ac07adcd4b1ebe538ccb94959a1d2d9ca33406fc2277"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "2b6f436f26ab131d6d6e883a16d27f5a5b9570ada883fe8a387462ad6a2e50ea"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "e37020bd431a697b73b88cfc1a9ddee0168009627ce3848684d8de499ad3b053"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "7c005e34cde48c606dbd67d43fa691c96cd8a27ce50b552b1c1b3e114ae112b3"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "b41260a478e8afa2ae530d6b170514a815b8962bbb3bd32431032604868c3d48"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "b4b2e41f9afe8eea8b347bd8fe0ba8d03ac8b9cf9b055469e053e4f72bc1c665"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "b6540fe80976a53828058e91f4a311192a7da37fd1ea8574161c0cfe494d17f2"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "c7b27a351e095353f2f53b50275ed7774faeb9254b980dd6571d48a935b50630"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "d5b014fd679bc475ade1278ba661a97e0a92d0fea8a6351e199677f5185f19f4"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "e6748c7f84a6040e98bb0cb3b1ec1c975f2174f8a89c2cc0ef83921dd56d2b1c"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "ce902a1ecadf1a89ab7f32ed17eef33725c946447fd67bc83cde0492fd65022b"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "6f2851c35f8b3fa5187d05d252da8d593f5ec4f9d268dc9c6973b0f87ed0733e"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "1a89f09b6a4c3418fb4a1490430e96742e5e8f5dc8b2613ccd9214950c6e8c80"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "e1cdede34db4b9d289596a689e04452813b6c9a83c72513d51c9f356879af9b2"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "eeb91667080edb15bb5e023333ff7410580b70de878628b4e6bbaa3d0db2bdfa"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "bd531bf775d991710fd63f1de90b6389c176d6a0c7d7068a8139f70379d6a76b"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "89fe33ffda15340926c727b535b378bf629389edccf8f8627b03b4056284b93b"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "6e22ad0f04be5ce33dfe1d33d4d935e0dce425d80c5e6e07f3b7f2c856f64aee"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "2aaafcb3b5da060458e67f493c10a3f02266e328222f25f96b8229f8dfec37b2"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "7a0a5957bb1cf2724e551fe2f05e06e4493f95ea939812f535a166428d127a25"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "ee62aee7a4b549d95e4bcab696c28ada842f352111bb44f4d39d1fe05a49d970"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "ed13eeea81f3673ae082e92db0cb966889f00cfc14c6f54f4f90677a3adc0fd4"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "22fdb92474591dcb05fae0c6bf65d696bcba718b208224411867a38af187c87a"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "44c999f4f73d02ea3c336ceba5771ddd187ce241fd3dcc027f315bdd935ba1c4"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "04aaf3ce92aaadfc975730956b0e92a3b26b5b1abfb376bbc2e8c35b2b1d5169"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "06b86c4bc4018e5117a8e8a129f81d8ca5fb2781bd06a2f2ec29fcaceba23d58"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "186ee5e191160a72f6f5f99371412cc0cb44fc66184d5a33b0aa8cc480b784c7"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "0ce71ba703d3b307ae66502768c6fe924fbd838570f917e1ab65fc8ffedddfc8"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "4e5f3b1ac34c61ae977d9f346fa04de7a3b21a21756bbf120f5d1bd8f56a98c9"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "7b99742ca9ccca0f5151d4f9ff4b3fffbc9df5f6c8e89c3f2236da84639d6050"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "6e66778a0c318add8d8fdac631400af94a9fff77d90c1c039a91e3b4ae8e66fe"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "7d50ff91e15954c4736309e23425603ae731c9d221936106a67517a5caf8c24d"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "bc224b70b522199e6c3c7012f3aec9a4cd6b31feb8eea23e3701ff891bcd2d77"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "7194b4ef864aa1cfcc00d9ba108cb9436bfcb72fda9a4bf2ff3abbf47877a5f4"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "6a94b5a6448af6c273fa526b3a359f4435482d1f55f9fbd40ef0d7aded98b1ad"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "1a0fab79901d40fe8709e8675a3c8cc6cb6474e10c64730bcda13a3577f94334"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "3672d9b0e9de882ef9f9851e0ecd9deb52053c65b4a747ac8ef0700b53426f5a"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "5f2008f9225ade5e1cff93f804e59b95f998129b1de7910280a3a7f508ea9ca5"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "645d13223d1aaf5ca3768515e6d9ac12a4205834bf1329765fbc6ff0410eed8e"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "582bafffc11ff585860b5af8e8f75d359f4f8e928c794cf35522c083089664ea"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "bf3d9ca3e1ee0d55dd601d25be1b2f2c9ebbe78094a2df725704b060b834eda0"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "3f3ebf446a22176b429cc328b002ffa723e27727ca29def5dfb88eeddef605f7"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "41f17ef5311d0d1cb10893adb68ca312710f16b07c41d64b31695013cfe15cdd"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "de99654352ff974fcf0c83d0f6aca669bf6fbfcc6ad534b0a26568d30c650564"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "554e32f4c204a8c7aa1b3d83dd736524abc0595c5fde6c5f58b0b5a644133df1"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "c54c6039343bd0bdbe449e6c8633a8aa18ce187850a4d81912b0751d84769fa4"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "cc38fdc0202da4a7292564f3f30fc01080582991dd5a5fb28860ccb4f4c8d75f"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "a276c5f8d1ce308f79f6ae6f95118164bd8882acc9c2aa8140c544626d1c1960"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "ccbbb0cfd53a9ac5f500e7313111a74d305107578ab94e17bf54175f3366279e"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "ede984ffb03f4a35ee18699a217d1d75492a4e7a372168a9c6ccc8fb7d133922"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "43a3fdb69989c0365d568eb7d7e697fd9d94ce59f0438a3f9b0e615c255e1eb3"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "48ee50e180515633db238d73ec8d50cd3dd5dd79e8ab7050f341a5be73401dd9"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "2a7deb046cd8652e04aafcd88b8d621a2503f7061c6b48cdafcbc763143e88bd"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "e87406cb2503ab7cc0ee8df8ac4ec92c90e5033a0133da72b14fd72e736c5360"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "f6227e1c4442dca0ff7ececf90c03bd711d6a5a83d0f8bf9857dd5c964ed243f"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "758c22dac6d97296ef1543f7eafca7d937a2313dd09ac3ca4bfe401009afe210"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "5f1993c3c54cd0ae42cdac9606664d8127de26ef31a94ec4f7da264a233d788e"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "68a3dce3a3c84d111b36dc544a82496364d3b16b411d70ee148bf8f9b8d650a0"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "facf8cc17d37049ce5c48a9aec9ce97a46242c46c18b2b52a2b3d6ca14217f63"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "836cd0eca497cc554da3e68e2274c16c875dc600b8541854a4c11e54e3262b49"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "2fdaafbd212530c309639aa0ee3ebc113c8aeddf7811b5db51e9792a98deeecb"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "9b263fb42a5ed939dc63a452e7cb87c295c6eaf270bfa97d9c858eed2931c0ae"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "b7684a1836b489b5ef8ad9b28ce0837a846fa55305f83d3a998f6722a97c0e65"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "39b0d87388ae8646f7b81d1008e8b9019a3f702031103e497326bb80988559ed"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "c85ad956bb69a97abd116b30ca5e2303fe4aebdffb08a8120ce7fdeda161b117"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "e2f931b5ffbb1d6169e16125bcc40bc432debc01354f193450075d19f0a23a78"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "3d9310cec9c1370e6a9fa8185935c6c48c3029fc17b6f2fcc311e8f8565ac804"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "29237bd1fff3790d891fcfa18959b808afa88c35b9c7036cc3cf79737560c3a5"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "480120055452c284eef26329419faa176cc5abff90c3dd986ea1d3478b869984"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "e659e19bc053a95bb4d753ff452637a29f792e61247fd1b70f70e90f62e8a268"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "1755ad5c097b92342224f7d659fc1c0db899b15f6874fcd256f76fac1bf27488"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "3682652d2aae978ceef32b4dccb2e20c4dc5584b6840df823664c214495e89bd"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "99a5e05ea1cd5a302b24b0bf8a87e495de1bd044d7335609016fbae49786a6b0"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "cd0b6cf8b620d619040a64f8692f78fcacf5500b5c092a6a40552397f56e2757"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "4001a26df6cee9182b85370e51d9e54284a066e8f8002c6dafc2ca872153ca36"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "bcdc5791b3a95c12e8cb19f92d57191360fff12ddf116d92b8ca1b32aa977827"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "037459abe2bf39d0ca05b0abfb18d112b9e56b4888b64ae956a6317800cc0047"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "1c907debf9f9c9a949bd1c7e7329ebc2fbdd6ff19ecf9411a67ce27079dae1ee"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "ace19a987e0a5fb10cf73d1b031e96c9333054083ab380e9a602f00b3347f334"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "5553dcde7e432643516405f465a981f52d5eaf3e53f7cec7d179034778d74122"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "1d3ee5b1487ff62243147aaaa1ba984976a969ddc0c7697b1f361db6a5d66023"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "d22a52c3e5d66a4cb8d084e7127f0acf79a36fbc1e96cccbb66adb205a4eb7a6"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "f75b81a8a984ef52bd5a11fbd98f00b16a1696c5dca9b2315ca35d23ed6ad4b9"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "0cae8f5bcff66cea0ea7a92f4503039078402eb149bca9a1bbbb170423a9625f"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "e4d5c5d920489ad73ceb2a0582285d35bc9fdf2e817a14a20d563b3f36dca71b"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "7cdbc0622b71ead86d7d180fab328b4346bba324f43381680cb9e4cad026667d"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "95cb578a1b9d271c7597852be14c18bd057eae01ef62429197ea47cb97f367b7"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "5e7a7d84bba7e3ce06a31678e2b97439597b5185866586c69f61d3eeaead7bf8"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "6d221dc885188ae683eb0c103b8551d25f2c26a82456abfcaea695b4555c83e1"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "d5cc9990acc678c483bc19649d67af96dda0308f66eea61f5917fcb40db13a4f"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "01ad8dbd1b9fac2dfe269ed171ab6fe32751892147f136f9ab8c8d023ed0fe11"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "7040a9d0c51ce310e74e9d3b1c04f5088ba688212100700f78e1c7b4f8722739"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "e2a3b0f3b022c320b0b7b372442cb85ac716f85e757cdf107246a6b7d4715835"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "c7258c7864087eb90d59f763ed0b23ee99f2a6a45c433d97e89583ea37ccdb32"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "af32ae7ba6d7b61d46c074ec0086fce4150b5b6255eb43c3c17c97f597b688d1"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "c7794f3e1d51fa7e0935d689078b348114d3abf010a0525b22e5375950b6098e"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "01bb4a3bd43aa5dde30197178cb50ac35ac62cde637227aca8bdd410c9f62546"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "f89e5f28d792161cd5b791ad68eb64c6a55a5de15dc00d5b042153b8fe549ab4"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "a7c3102c5c5c6999723fa889af88f1d14630867334db8703ca9b5f5368359127"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "a01fc84e9ce676f9b163e882cee5b6ca70b98a43b2937c6f5298f800b7ee3d78"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "030840e14241776d60cbd1ce9d0790df4e4f7b1fd5f554df9a3a51c9421af573"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "f6da6a171f4a00afaf5af2fbcc6cdd7504e00cc38f62baad1f9aad51467ef191"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "8fed1407c48e0f7f39c888f08001ec0705c09b587a6921b2644e91020e8f2763"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "0f1c30b2e5c6d1a2359a1714605ab382c617a00fb2a3ab9aa0570c27df6bc1a6"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "5192b9230659a8ec35abf4353201d6f2ac66c1ffce33d0dd68c38dbb1302029c"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "5812be19808c789c6f36484aad72ead4a5b75ce52d91047794da0c5919a4f68f"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "64243724356329e81f8754f4bc1d3e848a6544f598ceec44ac63a69d52003944"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "63117d10a3fa00b86eaf9023d562ca817ea44b89788de190d7870c22df6ee5b1"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "22715532882458ff60ccf52c5502eddb5f7a9ef646a22915c3928ff6ca244bdf"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "9be2f10d9f5dcddc7b5119609ac9b864aa61b2e1839e3bdce3f4e742f5e94c12"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "a71900daca5ac832240fa27c15ad76afca75b8b86c101899c58f6ee20bd33fc2"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "4426fcb698d40fc796a3affafda1f142e4f252e3861354915a8ba4db41e28754"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "a7533879eda14dd1b6e8ce4e68006fd1d1fff9b7fec12c14f30871084625581c"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "82593c88c14b6ac518d0da17aced0ffe4a78e06faf4275508218fd09da535f4b"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "3ec0a23d6ac098dd97dec52778202d6dc24cd76d7f142a452b4309be32d9cc29"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "64cd467c054da7506b5e72e159c0829a6d41db1482d9343a8cdd5b0bf7166d0f"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "a9ec09c8cbc54f071f80226bb203f4f5823f71cf376978d0e69cefc5562cd5bf"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "bb21099de57446c1a9284fa54ed491bbd1d104b64f9c479b8d0ded607fb79c7d"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "4397b52af2d90e0642b7e66fc39b60987dbba94737666e205df8b1b0b4c280de"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "65164ae7e551458bcb8afef5da13d1a632c7ddb181e112833b1fe0a0ab391c17"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "e026eae7e0eb85558ad58616a90240e14bd9011bbe6ed5bcf68788ad21d182eb"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "c2bd24db8c46a11108241a3aa6f57f234aa52e982af013e081c4b45621878b7b"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "b01690e94a2f8b5d8049ac62061206fc296b6a7e2c609d3368facefa246f06e5"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "7ea9be32fc7b198e300273a973162364a4dbe17bfa6b7e5fe39bd01fbd93c79e"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "d9ca99cb52265fe8cf89c9b48469479dcb9e251f8c3f3527540c19f44439234b"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "899906072114caaab0e7f48a7b67f77dbeca7d2130171a2277c98116479951ea"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "6a636b312c1a38474cd26700b0419e2cb174c440e4ac652a6d29bf6837a2bdd1"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "9827c378de89d3eed6bd297233c934fa7a84796efb02d82a4be1f8235c2dbe6c"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "23075b98ac7a1674cd1189806680062eb0eb35cbe08d7d0592242295184932bc"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "e64f2b7dfa4654bb681bfa5c34adc9d64400c3c7dfb1f9dd7ab0c04d998c6784"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "2049e8c19e3a58f1f0f08926e786c3a2d81292d94eb0346b54ae86edba35bf3b"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "12941cb1feec8beacc8cf62b94f902ddacadc424abe511226be2e85248496a60"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "9da22cef1e8b5d92c048c8bee59ca88b9801f95073083c218412de0406af6dc4"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "bdd5fee3bc2d807b1b6329f0f8f14bed85f8eacfc1210f4a5204687b7c0e250b"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "c48477523b11d7ec6314f54c2d0d62b35c6474b06bbd7c0bd0317971303a1073"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "d887a32f4073231856522ba034c4e952eb56d7ed06895e0d26dfc3d3a7488b0f"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "c02ff12289d32d5d3ad5f88a5c851f46f8d31c66ce8013622959f537cae1101b"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "99095f5f55c3ce6d0bb485d25eff1afdadb63e8f41caaddacceced71a92bbb9e"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "a4de32255d7334bf1eabda06332f8665a9d60bdf667a43c219ba2de08865f1e8"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "8b547faa6f76d1aa1f0f33235380e5379663c5d6e66e55ea0baa61a62f37e272"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "17873b2664d665d1d53fe69c4041aa6474f58a18cf5dc0f86b739d95d193bb48"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "ba36cb5c4b008f878b181ed3ff56198cd83739fb9d2018d6710288daafa6df7a"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "04afe1c59bfdfb9573623e9e84165863465356ec7872f1afc448c841c4e9392d"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "2fa6cc0e585574d3460597b25c6549b2aebd2b2af203edef960dea2b81bae954"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "ca8bdb92d16a89f7baca59e0c11662d2dfead62eb209746d738fbccbea8d00c5"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "79575806b00f77adae3b2ad794c2e268436e2b4b2904186ea88caa2bbcc5e232"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "2220b6bc45f98f088c653ee255718613b43e93691173441f0825c39e3ea8c263"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "829788db6afdb0f09b23d0230abf176153a252a76964ae4ad6df161568e03b6b"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "89792685c6ff26bae9d42326dbe0ca77b6a651df51ba02bd76a85692c83aba5a"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "b7898b8fde2c32c8d7fe105ab88751fb9acaa756f3826dfaab3fa33fa7bfd5a4"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "691e722d24695960574fb5423d2d5713d3729a0cf3bbffdbe3f550b1b0a8a91b"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "06e9c005c45b6d71e4f4957ae0d92578baf2b0ff783f38dca4a5018f84319bfd"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "5422bf1e694a462864759374bc3afdf9f0033121b879413a3edc18a20d406b4e"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "54c0f6dfc40b748f74ab9fd79dd4b0987ce17eced23b293cf83b1867f38d7c53"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "a164dfa18736b3f84ce2a80fea1f6441bbd3de113c26eab503ab7710866f7555"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "3135adfb8c2b674545d3e80a8f3d77a89332dbe4cdff0f05817d5ae2edac8025"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "7a95f8853d5776267ab62fcc208214a7a4f2a7d82350ac7967ca90ab2178e737"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "df9cb429c6fe10e7aeae06d49329fed27cf9cd84b3b28e7fef82008399dfe453"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "aa97b360bd5cfd0686b0d75df21500249e0f7ab1586e37774d60040abdd2ecd8"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "ba1ef9b8576589a9bf8523f26fe42416f14f4c38b74b4519792aff6896a4c34b"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "bcd73d4a1187d8e43dcbfd7bb4df3c0f7893175785d633113b0a5b526bb718d8"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "004423ed395fcc4cba02e703f5086f9255758edd2bd3125adeb8fb006a4f769e"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "9abb27a35c2076fc3c85e18b20f909ba41b4618afda51f2adbb0ef960b67483f"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "ff2dca954720bcb1947c18b1013666c6568f6638b204adf5a0277e6bff64f468"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "a334a65d54efaacdafcddad336f313d24b594c14bfc874159cd9a4ca9ded2b03"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "b5e53cd682a8b4494074c1c0c7e4d4fb94a36a06e81522cb4b7289b4ed6bd486"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "747174de108fcf0a7201e22df90f613846a0b66384b007ccddeb51b6dc651aca"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "fa53bfe3c00878b462e6aa3a0bf76a6e1e4dc6d9095f2104a355ac5b773e936c"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "308965f1b97405e7c6db95e7cffae69fe6a899539782c06b1446ab97ddb19d45"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "0b2e6e13cd30b46b81c8fb9fd195d27ce96c40f03d17ba0f8095d4ddd226ff45"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "dc47f9c38a845461db14a08d67f143c8b5ba04aa441aeecae8bd8f3cbf79fca6"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "3f5afc0975aebe8981202927fe5507065c47ccd64f1ddd8adb426c0032ee267e"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "8a9b241836c0b495865e9d64d2e89cb054a01e8e3fb55ee8a1cbbd0def7d5a93"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "c104cbdfaee89946ab11b3bc0de6cfaf5d88f5e18a6be400dc573e7b1c10319d"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "717c460478cdb986fbfcd5fcd16f7fb66af930e3ca2826176b7158ff865d51a5"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "dcfbdd8ba1897bdfcb26b0ec1c50a88808c2ca988418cca56eab74e1f870ba1c"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "648764a8aad2ea954416f2293023598cd26d4bae1bb44da1406868d1286c3f58"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "2b938e4c4614de013b9e0f7d4bdde0353cea42c7651491f2d92323a25d9157d6"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "82571f95eaf3a88c7cc7fc056779ed4f4ea5664333c5e015ccd4995fc48ca0a7"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "db6a5619c7fcd9487ecd5518590a7ad28ee4a9fd12348c950ce1b12de5232dfe"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "36ac3599d3bba4a4e982df6cbb355becc0e0e237b127c3b2afea3618754fafbe"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "269dccd617074567654a053186d6830fff38503431156db5a00d70bef093bf0e"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "c78e2ad7df58f86a26bb81c13a27a8722884573278a1dd179ffba577902c92e5"; }
   ];
 }

From 47f17939c24179d8d7bf296b64a3f471d87774d6 Mon Sep 17 00:00:00 2001
From: makefu <makefu@syntax-fehler.de>
Date: Thu, 24 Dec 2015 15:43:47 +0100
Subject: [PATCH 039/249] cvs2nix: 2.0.1 -> 2.4.0

---
 .../version-management/cvs2svn/default.nix     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index 65c2c84d0da..870248ed75d 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl, python, makeWrapper}:
+{stdenv, lib, fetchurl, python, cvs, makeWrapper}:
 
-stdenv.mkDerivation {
-  name = "cvs2svn-2.0.1";
+stdenv.mkDerivation rec {
+  name = "cvs2svn-2.4.0";
 
   src = fetchurl {
-    url = http://cvs2svn.tigris.org/files/documents/1462/39919/cvs2svn-2.0.1.tar.gz;
-    sha256 = "1pgbyxzgn22lnw3h5c2nd8z46pkk863jg3fgh9pqa1jihsx1cg1j";
+    url = "http://cvs2svn.tigris.org/files/documents/1462/49237/${name}.tar.gz";
+    sha256 = "05piyrcp81a1jgjm66xhq7h1sscx42ccjqaw30h40dxlwz1pyrx6";
   };
 
   buildInputs = [python makeWrapper];
@@ -13,8 +13,11 @@ stdenv.mkDerivation {
   buildPhase = "true";
   installPhase = ''
     python ./setup.py install --prefix=$out
-    wrapProgram $out/bin/cvs2svn \
-        --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
+    for i in bzr svn git; do
+      wrapProgram $out/bin/cvs2$i \
+          --prefix PATH : "${lib.makeSearchPath "bin" [ cvs ]}" \
+          --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
+    done
   '';
 
   /* !!! maybe we should absolutise the program names in
@@ -23,5 +26,6 @@ stdenv.mkDerivation {
   meta = {
     description = "A tool to convert CVS repositories to Subversion repositories";
     homepage = http://cvs2svn.tigris.org/;
+    maintainers = [ lib.maintainers.makefu ];
   };
 }

From 6e27454728d4e5970c4b5c7f3f4fcc9d3a7f9d3d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 24 Dec 2015 10:08:32 -0600
Subject: [PATCH 040/249] sddm: build with Qt 5.5

---
 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 a1e729c7f06..2a8c459a019 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13131,9 +13131,7 @@ let
 
   printrun = callPackage ../applications/misc/printrun { };
 
-  sddm = qt5.callPackage ../applications/display-managers/sddm {
-    themes = [];  # extra themes, etc.
-  };
+  sddm = kde5.sddm;
 
   slim = callPackage ../applications/display-managers/slim {
     libpng = libpng12;
@@ -14773,6 +14771,10 @@ let
       withKDE = false;
     };
 
+    sddm = callPackage ../applications/display-managers/sddm {
+      themes = [];  # extra themes, etc.
+    };
+
   };
 
   kde5 =

From ac79d3ad611ce7927cc8eabaf57803f41440bff9 Mon Sep 17 00:00:00 2001
From: Ryan Seto <mr.werewolf@gmail.com>
Date: Thu, 24 Dec 2015 12:06:59 -0500
Subject: [PATCH 041/249] pythonPackages.maildir-deduplicate: init at 1.0.2

---
 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 26b6d7de503..1d41cb84112 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22955,6 +22955,26 @@ in modules // {
     };
   };
 
+  maildir-deduplicate = buildPythonPackage rec {
+    name = "maildir-deduplicate-${version}";
+    version = "1.0.2";
+
+    disabled = !isPy27;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/m/maildir-deduplicate/${name}.tar.gz";
+      sha256 = "1xy5z756alrjgpl9qx2gdx898rw1mryrqkwmipbh39mgrvkl3fz9";
+    };
+
+    propagatedBuildInputs = with self; [ click ];
+
+    meta = with stdenv.lib; {
+      description = "Command-line tool to deduplicate mails from a set of maildir folders";
+      homepage = "https://github.com/kdeldycke/maildir-deduplicate";
+      license = licenses.gpl2;
+    };
+  };
+
 
   mps-youtube = buildPythonPackage rec {
     name = "mps-youtube-${version}";

From 269f261c738a88799f348cbb42e8617ff79c6710 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 24 Dec 2015 19:31:07 +0200
Subject: [PATCH 042/249] installation-cd: Add separate boot entry that has
 'nomodeset'

We seem to be in an unfortunate situation: booting without 'nomodeset'
causes hangs when booting on some NVIDIA cards (6948c3ab807), but on the
other hand adding 'nomodeset' prevents X from starting on other hardware
(e.g. issue #10381 and my Thinkpad X250 with an integrated Broadwell GPU).

Attempt to remedy this situation a bit by adding a separate entry in the
ISOLINUX menu (with the non-'nomodeset' being the default).
---
 nixos/modules/installer/cd-dvd/iso-image.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index fa9cc6fa20b..d3353ee7d64 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -43,6 +43,13 @@ let
     LINUX /boot/bzImage
     APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
     INITRD /boot/initrd
+
+    # A variant to boot with 'nomodeset'
+    LABEL boot-nomodeset
+    MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (with nomodeset)
+    LINUX /boot/bzImage
+    APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset
+    INITRD /boot/initrd
   '';
 
   isolinuxMemtest86Entry = ''
@@ -59,10 +66,18 @@ let
     mkdir -p $out/EFI/boot
     cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/EFI/boot/boot${targetArch}.efi
     mkdir -p $out/loader/entries
+
     echo "title NixOS Live CD" > $out/loader/entries/nixos-livecd.conf
     echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd.conf
     echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd.conf
     echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> $out/loader/entries/nixos-livecd.conf
+
+    # A variant to boot with 'nomodeset'
+    echo "title NixOS Live CD (with nomodeset)" > $out/loader/entries/nixos-livecd-nomodeset.conf
+    echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd-nomodeset.conf
+    echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd-nomodeset.conf
+    echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset" >> $out/loader/entries/nixos-livecd-nomodeset.conf
+
     echo "default nixos-livecd" > $out/loader/loader.conf
     echo "timeout ${builtins.toString config.boot.loader.gummiboot.timeout}" >> $out/loader/loader.conf
   '';
@@ -230,7 +245,6 @@ in
     boot.kernelParams =
       [ "root=LABEL=${config.isoImage.volumeID}"
         "boot.shell_on_fail"
-        "nomodeset"
       ];
 
     fileSystems."/" =

From 84accab674a1aaac3b73748a6542a160e7b2bb2e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tsteinbach@trustwave.com>
Date: Thu, 24 Dec 2015 13:24:57 -0500
Subject: [PATCH 043/249] kotlin: 1.0.0-beta-4583 -> 1.0.0-beta-4584

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 9b7c97c8c25..b17be1c534b 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip, which }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0-beta-4583";
+  version = "1.0.0-beta-4584";
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/build-${version}/kotlin-compiler-${version}.zip";
-    sha256 = "4db71d3c1f150618568ebd1f8c17567ff15afe022c2f0121368c17afad9e8188";
+    sha256 = "191698784f4a1f769df14757bad40243293aa6bc3d8e906bfa0c80c3db0a1d2c";
   };
 
   propagatedBuildInputs = [ jre which ] ;

From 8c42b26fa28fbce374e9c9fc6253fc201a2f126b Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 24 Dec 2015 19:59:44 +0000
Subject: [PATCH 044/249] libvirt: switch who makes assertions about whose
 version

Previously, the native libvirt package was making an assertion that
the dependent Python package had a compatible version. This commit
switches that so that the Python package makes the assertion, since
it makes more sense to me to have a child package making an
assertion about its parent than vice versa.
---
 pkgs/development/libraries/libvirt/default.nix | 8 ++------
 pkgs/top-level/python-packages.nix             | 5 +++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 27e67866fe3..888cf833eab 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,16 +1,12 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
 , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng
-, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl
-, pythonPackages, perlPackages
+, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
 }:
 
-let version = "1.2.19"; in
-
-assert version == pythonPackages.libvirt.version;
-
 stdenv.mkDerivation rec {
   name = "libvirt-${version}";
+  version = "1.2.19";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.gz";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eab64615606..0bcc1714982 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21724,9 +21724,10 @@ in modules // {
     };
   };
 
-  libvirt = pkgs.stdenv.mkDerivation rec {
+  libvirt = let
+    version = "1.2.18";
+  in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
-    version = "1.2.19";
 
     src = pkgs.fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";

From e5e8d3e250dfa82b18e0a27b7a50cb84cfc7c500 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 24 Dec 2015 20:02:38 +0000
Subject: [PATCH 045/249] libvirt-python: fix broken version that I included by
 accident in 8c42b26fa28fbce374e9c9fc6253fc201a2f126b

---
 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 0bcc1714982..e5359b97168 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21725,7 +21725,7 @@ in modules // {
   };
 
   libvirt = let
-    version = "1.2.18";
+    version = "1.2.19";
   in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
 

From b45161fbbe5b36ba7f8bc27af6493d6e63f7c2ee Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 24 Dec 2015 14:18:27 +0100
Subject: [PATCH 046/249] llvm: Add backported patch for Rust.

Rust runs into a bug with LLVM 3.7.0 that's fixed in the upcoming
release 3.7.1. This commit backports this fix.
---
 pkgs/development/compilers/llvm/3.7/llvm.nix  |  5 ++
 .../3.7/r242372-fix-LLVMBuildLandingPad.patch | 60 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/3.7/r242372-fix-LLVMBuildLandingPad.patch

diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index 060c0f3e867..bbeb0c858e5 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -22,6 +22,11 @@ let
 in stdenv.mkDerivation rec {
   name = "llvm-${version}";
 
+  patches = [
+    # Backport for Rust, remove when 3.7.1 is released
+    ./r242372-fix-LLVMBuildLandingPad.patch
+  ];
+
   unpackPhase = ''
     unpackFile ${src}
     mv llvm-${version}.src llvm
diff --git a/pkgs/development/compilers/llvm/3.7/r242372-fix-LLVMBuildLandingPad.patch b/pkgs/development/compilers/llvm/3.7/r242372-fix-LLVMBuildLandingPad.patch
new file mode 100644
index 00000000000..749de6e9b6a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/r242372-fix-LLVMBuildLandingPad.patch
@@ -0,0 +1,60 @@
+Index: llvm/bindings/ocaml/llvm/llvm_ocaml.c
+===================================================================
+--- llvm/bindings/ocaml/llvm/llvm_ocaml.c	(revision 242371)
++++ llvm/bindings/ocaml/llvm/llvm_ocaml.c	(revision 242372)
+@@ -1745,7 +1745,7 @@
+ CAMLprim LLVMValueRef llvm_build_landingpad(LLVMTypeRef Ty, LLVMValueRef PersFn,
+                                             value NumClauses,  value Name,
+                                             value B) {
+-    return LLVMBuildLandingPad(Builder_val(B), Ty, Int_val(NumClauses),
++    return LLVMBuildLandingPad(Builder_val(B), Ty, PersFn, Int_val(NumClauses),
+                                String_val(Name));
+ }
+ 
+Index: llvm/bindings/go/llvm/ir.go
+===================================================================
+--- llvm/bindings/go/llvm/ir.go	(revision 242371)
++++ llvm/bindings/go/llvm/ir.go	(revision 242372)
+@@ -1731,7 +1731,7 @@
+ func (b Builder) CreateLandingPad(t Type, nclauses int, name string) (l Value) {
+ 	cname := C.CString(name)
+ 	defer C.free(unsafe.Pointer(cname))
+-	l.C = C.LLVMBuildLandingPad(b.C, t.C, C.unsigned(nclauses), cname)
++	l.C = C.LLVMBuildLandingPad(b.C, t.C, nil, C.unsigned(nclauses), cname)
+ 	return l
+ }
+ 
+Index: llvm/lib/IR/Core.cpp
+===================================================================
+--- llvm/lib/IR/Core.cpp	(revision 242371)
++++ llvm/lib/IR/Core.cpp	(revision 242372)
+@@ -2257,7 +2257,14 @@
+ }
+ 
+ LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty,
+-                                 unsigned NumClauses, const char *Name) {
++                                 LLVMValueRef PersFn, unsigned NumClauses,
++                                 const char *Name) {
++  // The personality used to live on the landingpad instruction, but now it
++  // lives on the parent function. For compatibility, take the provided
++  // personality and put it on the parent function.
++  if (PersFn)
++    unwrap(B)->GetInsertBlock()->getParent()->setPersonalityFn(
++        cast<Function>(unwrap(PersFn)));
+   return wrap(unwrap(B)->CreateLandingPad(unwrap(Ty), NumClauses, Name));
+ }
+ 
+Index: llvm/include/llvm-c/Core.h
+===================================================================
+--- llvm/include/llvm-c/Core.h	(revision 242371)
++++ llvm/include/llvm-c/Core.h	(revision 242372)
+@@ -2675,7 +2675,8 @@
+                              LLVMBasicBlockRef Then, LLVMBasicBlockRef Catch,
+                              const char *Name);
+ LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty,
+-                                 unsigned NumClauses, const char *Name);
++                                 LLVMValueRef PersFn, unsigned NumClauses,
++                                 const char *Name);
+ LLVMValueRef LLVMBuildResume(LLVMBuilderRef B, LLVMValueRef Exn);
+ LLVMValueRef LLVMBuildUnreachable(LLVMBuilderRef);
+ 

From b26aa99d9dbda8ef5e83625d88977aedb63f7443 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 23 Dec 2015 23:21:35 +0000
Subject: [PATCH 047/249] rustc: 1.4.0 -> 1.5.0

---
 pkgs/development/compilers/rustc/default.nix  |  7 +++---
 pkgs/development/compilers/rustc/head.nix     |  2 +-
 .../compilers/rustc/patches/grsec-head.patch  | 24 -------------------
 .../compilers/rustc/patches/grsec.patch       | 16 +++++++++----
 4 files changed, 16 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/development/compilers/rustc/patches/grsec-head.patch

diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
index 19e746d7dbf..1a2e9b1e4bb 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.4.0";
+  shortVersion = "1.5.0";
   isRelease = true;
-  forceBundledLLVM = false;
+  forceBundledLLVM = true;
   configureFlags = [ "--release-channel=stable" ];
-  srcSha = "13wpi9nb3h6wwck2mxhza85fahzcwgas00w8m25086v34dha4dp1";
+  srcSha = "1vfpwx6a2f2rn528774cz9r7r82ppycn8z8ybll6bphdw7cyar1g";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.
@@ -22,7 +22,6 @@ callPackage ./generic.nix {
   snapshotDate = "2015-08-11";
   snapshotRev = "1af31d4";
 
-  # cc-ar-opts.patch should be removable in 1.4.0+
   patches = [ ./patches/remove-uneeded-git.patch ]
     ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 }
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index ac232348328..ccbfc51b671 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -23,6 +23,6 @@ callPackage ./generic.nix {
   snapshotRev = "1af31d4";
 
   patches = [ ./patches/remove-uneeded-git.patch ]
-    ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec-head.patch;
+    ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 }
 
diff --git a/pkgs/development/compilers/rustc/patches/grsec-head.patch b/pkgs/development/compilers/rustc/patches/grsec-head.patch
deleted file mode 100644
index b97b40c2409..00000000000
--- a/pkgs/development/compilers/rustc/patches/grsec-head.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
-index b22f34f..c6489bd 100644
---- a/src/test/run-make/relocation-model/Makefile
-+++ b/src/test/run-make/relocation-model/Makefile
-@@ -2,9 +2,11 @@
- 
- all: others
- 	$(RUSTC) -C relocation-model=dynamic-no-pic foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 
- 	$(RUSTC) -C relocation-model=default foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 
- 	$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
-@@ -16,6 +18,7 @@ others:
- else
- others:
- 	$(RUSTC) -C relocation-model=static foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 	$(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs
- endif
diff --git a/pkgs/development/compilers/rustc/patches/grsec.patch b/pkgs/development/compilers/rustc/patches/grsec.patch
index 84582ab7d70..b97b40c2409 100644
--- a/pkgs/development/compilers/rustc/patches/grsec.patch
+++ b/pkgs/development/compilers/rustc/patches/grsec.patch
@@ -1,16 +1,24 @@
 diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
-index 2fcdd32..2d9ddb0 100644
+index b22f34f..c6489bd 100644
 --- a/src/test/run-make/relocation-model/Makefile
 +++ b/src/test/run-make/relocation-model/Makefile
-@@ -5,9 +5,11 @@ all:
+@@ -2,9 +2,11 @@
+ 
+ all: others
+ 	$(RUSTC) -C relocation-model=dynamic-no-pic foo.rs
++	paxctl -czexm $(TMPDIR)/foo
  	$(call RUN,foo)
  
  	$(RUSTC) -C relocation-model=default foo.rs
 +	paxctl -czexm $(TMPDIR)/foo
  	$(call RUN,foo)
  
+ 	$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
+@@ -16,6 +18,7 @@ others:
+ else
+ others:
  	$(RUSTC) -C relocation-model=static foo.rs
 +	paxctl -czexm $(TMPDIR)/foo
  	$(call RUN,foo)
- 
- 	$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
+ 	$(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs
+ endif

From c11f6c9dc7333d6039c2e4edb1f86d12cffac520 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 24 Dec 2015 21:12:57 +0100
Subject: [PATCH 048/249] rustc-1.5.0: Don't force bundled LLVM

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

diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
index 1a2e9b1e4bb..ce1e4cf1f5c 100644
--- a/pkgs/development/compilers/rustc/default.nix
+++ b/pkgs/development/compilers/rustc/default.nix
@@ -3,7 +3,7 @@
 callPackage ./generic.nix {
   shortVersion = "1.5.0";
   isRelease = true;
-  forceBundledLLVM = true;
+  forceBundledLLVM = false;
   configureFlags = [ "--release-channel=stable" ];
   srcSha = "1vfpwx6a2f2rn528774cz9r7r82ppycn8z8ybll6bphdw7cyar1g";
 

From a193ea37008ed7295eb8d5e49f4d2341cc890b26 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Thu, 24 Dec 2015 22:36:19 +0100
Subject: [PATCH 049/249] dnsmasq: create state dir for dhcp leases file

ref #11718
---
 nixos/modules/services/networking/dnsmasq.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 6907d63d761..fcf5aa5f175 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -5,8 +5,10 @@ with lib;
 let
   cfg = config.services.dnsmasq;
   dnsmasq = pkgs.dnsmasq;
+  stateDir = "/var/lib/dnsmasq";
 
   dnsmasqConf = pkgs.writeText "dnsmasq.conf" ''
+    dhcp-leasefile=${stateDir}/dnsmasq.leases
     ${optionalString cfg.resolveLocalQueries ''
       conf-file=/etc/dnsmasq-conf.conf
       resolv-file=/etc/dnsmasq-resolv.conf
@@ -76,12 +78,11 @@ in
 
     services.dbus.packages = [ dnsmasq ];
 
-    users.extraUsers = singleton
-      { name = "dnsmasq";
-        uid = config.ids.uids.dnsmasq;
-        description = "Dnsmasq daemon user";
-        home = "/var/empty";
-      };
+    users.extraUsers = singleton {
+      name = "dnsmasq";
+      uid = config.ids.uids.dnsmasq;
+      description = "Dnsmasq daemon user";
+    };
 
     systemd.services.dnsmasq = {
         description = "Dnsmasq Daemon";
@@ -89,6 +90,9 @@ in
         wantedBy = [ "multi-user.target" ];
         path = [ dnsmasq ];
         preStart = ''
+          mkdir -m 755 -p ${stateDir}
+          touch ${stateDir}/dnsmasq.leases
+          chown -R dnsmasq ${stateDir}
           touch /etc/dnsmasq-{conf,resolv}.conf
           dnsmasq --test
         '';

From ca277c2257ff981b47ad4b025712cc4f549267c8 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 24 Dec 2015 22:11:41 +0000
Subject: [PATCH 050/249] python-gnupg: use gnupg1 instead of 2

---
 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 e5359b97168..b4788050784 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -426,7 +426,7 @@ in modules // {
     # Let's make the library default to our gpg binary
     patchPhase = ''
       substituteInPlace gnupg.py \
-        --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg}/bin/gpg'"
+        --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'"
     '';
 
     meta = {

From 5925f9f709c083b6fdbcceb1589ff2eea51fc9a5 Mon Sep 17 00:00:00 2001
From: Timofei Kushnir <timophey@ecotelecom.ru>
Date: Fri, 25 Dec 2015 03:43:49 +0300
Subject: [PATCH 051/249] Network script module fix

---
 nixos/modules/tasks/network-interfaces-scripted.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 80b7f718580..f07e7baeb11 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -83,13 +83,13 @@ in
                   # FIXME: get rid of "|| true" (necessary to make it idempotent).
                   ip route add default via "${cfg.defaultGateway}" ${
                     optionalString (cfg.defaultGatewayWindowSize != null)
-                      "window ${cfg.defaultGatewayWindowSize}"} || true
+                      "window ${toString cfg.defaultGatewayWindowSize}"} || true
                 ''}
                 ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6 != "") ''
                   # FIXME: get rid of "|| true" (necessary to make it idempotent).
                   ip -6 route add ::/0 via "${cfg.defaultGateway6}" ${
                     optionalString (cfg.defaultGatewayWindowSize != null)
-                      "window ${cfg.defaultGatewayWindowSize}"} || true
+                      "window ${toString cfg.defaultGatewayWindowSize}"} || true
                 ''}
               '';
           };

From 50a00101c17eb081d84145492f74e3d172040008 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 24 Dec 2015 23:27:31 -0500
Subject: [PATCH 052/249] dnsmasq: get it working on darwin again

---
 pkgs/tools/networking/dnsmasq/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 35cd7ae4661..63720faf707 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -3,10 +3,10 @@
 with stdenv.lib;
 let
   copts = concatStringsSep " " ([
-    "-DHAVE_DBUS"
     "-DHAVE_IDN"
     "-DHAVE_DNSSEC"
   ] ++ optionals stdenv.isLinux [
+    "-DHAVE_DBUS"
     "-DHAVE_CONNTRACK"
   ]);
 in
@@ -29,13 +29,16 @@ stdenv.mkDerivation rec {
     "LOCALEDIR=$(out)/share/locale"
   ];
 
-  postBuild = ''
+  postBuild = optionalString stdenv.isLinux ''
     make -C contrib/wrt
   '';
 
+  # XXX: Does the systemd service definition really belong here when our NixOS
+  # module can create it in Nix-land?
   postInstall = ''
-    install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf
     install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf
+  '' + optionalString stdenv.isLinux ''
+    install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf
     install -Dm755 contrib/wrt/dhcp_lease_time $out/bin/dhcp_lease_time
     install -Dm755 contrib/wrt/dhcp_release $out/bin/dhcp_release
 
@@ -50,8 +53,8 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ dbus_libs nettle libidn ]
-    ++ optional stdenv.isLinux libnetfilter_conntrack;
+  buildInputs = [ nettle libidn ]
+    ++ optionals stdenv.isLinux [ dbus_libs libnetfilter_conntrack ];
 
   meta = {
     description = "An integrated DNS, DHCP and TFTP server for small networks";

From 6878b2b21ded9e29e55ea7a3c564715877692e58 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 24 Dec 2015 23:34:47 -0500
Subject: [PATCH 053/249] libvirt: make it build on darwin

Not sure if it works, but it no longer fails miserably at build time
---
 .../development/libraries/libvirt/default.nix | 34 ++++++++++++++-----
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 888cf833eab..2c31ef323f2 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -2,6 +2,7 @@
 , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
+, curl, libiconv, gmp
 }:
 
 stdenv.mkDerivation rec {
@@ -14,25 +15,39 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
-    utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
-    libcap_ng libnl libxslt xhtml1 perlPackages.XMLXPath numad numactl
+    pkgconfig libxml2 gnutls perl python readline
+    gettext libtasn1 libgcrypt yajl makeWrapper
+    libxslt xhtml1 perlPackages.XMLXPath curl
+  ] ++ stdenv.lib.optionals stdenv.isLinux [
+    libpciaccess devicemapper lvm2 utillinux udev libcap_ng libnl numad numactl
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+     libiconv gmp
   ];
 
-  preConfigure = ''
-    PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH
+  preConfigure = stdenv.lib.optionalString stdenv.isLinux ''
+    PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH
     substituteInPlace configure --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"'
+  '' + ''
+    PATH=${dnsmasq}/bin:$PATH
     patchShebangs . # fixes /usr/bin/python references
   '';
 
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"
-    "--with-init-script=redhat"
+    "--with-libpcap"
+    "--with-vmware"
+    "--with-vbox"
+    "--with-test"
+    "--with-esx"
+    "--with-remote"
+  ] ++ stdenv.lib.optionals stdenv.isLinux [
+    "--with-numad"
     "--with-macvtap"
     "--with-virtualport"
-    "--with-libpcap"
-    "--with-numad"
+    "--with-init-script=redhat"
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    "--with-init-script=none"
   ];
 
   installFlags = [
@@ -44,6 +59,7 @@ stdenv.mkDerivation rec {
     sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh
     substituteInPlace $out/libexec/libvirt-guests.sh \
       --replace "$out/bin" "${gettext}/bin"
+  '' + stdenv.lib.optionalString stdenv.isLinux ''
     wrapProgram $out/sbin/libvirtd \
       --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin:${numad}/bin:${numactl}/bin
   '';
@@ -60,6 +76,6 @@ stdenv.mkDerivation rec {
       versions of Linux (and other OSes)
     '';
     license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 5303351c72b725b2138daa87ef4f852dd826bdd2 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Fri, 25 Dec 2015 13:56:26 +0100
Subject: [PATCH 054/249] make taglib-extras work with taglib > 1.9

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

diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix
index 05fe67eb9d7..1edabe4c81f 100644
--- a/pkgs/development/libraries/taglib-extras/default.nix
+++ b/pkgs/development/libraries/taglib-extras/default.nix
@@ -8,4 +8,7 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [ taglib ];
   nativeBuildInputs = [ cmake ];
+  preConfigure = ''
+    sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
+  '';
 }

From ca4c35478979106fe64163c11606516e3b3d2e7e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 25 Dec 2015 15:54:35 +0100
Subject: [PATCH 055/249] slurm service: improve config

---
 .../services/computing/slurm/slurm.nix        | 56 ++++++++++++++++---
 1 file changed, 48 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 019d7fbb16c..cf00d894655 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -34,6 +34,15 @@ in
 
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.slurm-llnl;
+        example = literalExample "pkgs.slurm-llnl-full";
+        description = ''
+          The packge to use for slurm binaries.
+        '';
+      };
+
       controlMachine = mkOption {
         type = types.nullOr types.str;
         default = null;
@@ -91,38 +100,69 @@ in
 
   ###### implementation
 
-  config = mkIf (cfg.client.enable || cfg.server.enable) {
+  config =
+    let
+      wrappedSlurm = pkgs.stdenv.mkDerivation {
+        name = "wrappedSlurm";
 
-    environment.systemPackages = [ pkgs.slurm-llnl ];
+        propagatedBuildInputs = [ cfg.package configFile ];
+
+        builder = pkgs.writeText "builder.sh" ''
+          source $stdenv/setup
+          mkdir -p $out/bin
+          find  ${cfg.package}/bin -type f -executable | while read EXE
+          do
+            exename="$(basename $EXE)"
+            wrappername="$out/bin/$exename"
+            cat > "$wrappername" <<EOT
+          #!/bin/sh
+          if [ -z "$SLURM_CONF" ]
+          then
+            SLURM_CONF="${configFile}" "$EXE" "\$@"
+          else
+            "$EXE" "\$0"
+          fi
+          EOT
+            chmod +x "$wrappername"
+          done
+        '';
+      };
+
+  in mkIf (cfg.client.enable || cfg.server.enable) {
+
+    environment.systemPackages = [ wrappedSlurm ];
 
     systemd.services.slurmd = mkIf (cfg.client.enable) {
-      path = with pkgs; [ slurm-llnl coreutils ];
+      path = with pkgs; [ wrappedSlurm coreutils ];
 
       wantedBy = [ "multi-user.target" ];
       after = [ "systemd-tmpfiles-clean.service" ];
 
       serviceConfig = {
         Type = "forking";
-        ExecStart = "${pkgs.slurm-llnl}/bin/slurmd -f ${configFile}";
+        ExecStart = "${wrappedSlurm}/bin/slurmd";
         PIDFile = "/run/slurmd.pid";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       };
+
+      preStart = ''
+        mkdir -p /var/spool
+      '';
     };
 
     systemd.services.slurmctld = mkIf (cfg.server.enable) {
-      path = with pkgs; [ slurm-llnl munge coreutils ];
+      path = with pkgs; [ wrappedSlurm munge coreutils ];
       
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "auditd.service" "munged.service" "slurmdbd.service" ];
+      after = [ "network.target" "munged.service" ];
       requires = [ "munged.service" ];
 
       serviceConfig = {
         Type = "forking";
-        ExecStart = "${pkgs.slurm-llnl}/bin/slurmctld";
+        ExecStart = "${wrappedSlurm}/bin/slurmctld";
         PIDFile = "/run/slurmctld.pid";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       };
-      environment = { SLURM_CONF = "${configFile}"; };
     };
 
   };

From 4994f0f7d062f932ef36ca6e36d5556334c4c93a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 25 Dec 2015 15:55:07 +0100
Subject: [PATCH 056/249] slurm service: add tests

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

diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
new file mode 100644
index 00000000000..0dd00dfb04c
--- /dev/null
+++ b/nixos/tests/slurm.nix
@@ -0,0 +1,80 @@
+import ./make-test.nix ({ pkgs, ... }:
+let mungekey = "mungeverryweakkeybuteasytointegratoinatest";
+    slurmconfig = {
+      client.enable = true;
+      controlMachine = "control";
+      nodeName = ''
+        control
+        NodeName=node[1-3] CPUs=1 State=UNKNOWN
+      '';
+      partitionName = "debug Nodes=node[1-3] Default=YES MaxTime=INFINITE State=UP";
+    };
+in {
+  name = "slurm";
+
+  nodes =
+    let
+    computeNode =
+      { config, pkgs, ...}:
+      {
+        # TODO slrumd port and slurmctld port should be configurations and
+        # automatically allowed by the  firewall.
+        networking.firewall.enable = false;
+        services.munge.enable = true;
+        services.slurm = slurmconfig;
+      };
+    in {
+    control =
+      { config, pkgs, ...}:
+      {
+        networking.firewall.enable = false;
+        services.munge.enable = true;
+        services.slurm = {
+          server.enable = true;
+        } // slurmconfig;
+      };
+    node1 = computeNode;
+    node2 = computeNode;
+    node3 = computeNode;
+  };
+
+  testScript =
+  ''
+  startAll;
+
+  # Set up authentification across the cluster
+  foreach my $node (($control,$node1,$node2,$node3))
+  {
+    $node->waitForUnit("default.target");
+
+    $node->succeed("mkdir /etc/munge");
+    $node->succeed("echo '${mungekey}' > /etc/munge/munge.key");
+    $node->succeed("chmod 0400 /etc/munge/munge.key");
+    $node->succeed("systemctl restart munged");
+  }
+
+  # Restart the services since they have probably failed due to the munge init
+  # failure
+
+  subtest "can_start_slurmctld", sub {
+    $control->succeed("systemctl restart slurmctld");
+    $control->waitForUnit("slurmctld.service");
+  };
+
+  subtest "can_start_slurmd", sub {
+    foreach my $node (($control,$node1,$node2,$node3))
+    {
+      $node->succeed("systemctl restart slurmd.service");
+      $node->waitForUnit("slurmd");
+    }
+  };
+
+  # Test that the cluster work and can distribute jobs;
+
+  subtest "run_distributed_command", sub {
+    # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes).
+    # The output must contain the 3 different names
+    $control->succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq");
+  };
+  '';
+})

From 59ed410d6da12459bbfec2f59b2ae098a16bf7b7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 26 Dec 2015 02:32:09 +0000
Subject: [PATCH 057/249] fix ftp.mozilla.org URLs

The old URLs time out.
---
 .../interpreters/spidermonkey/default.nix           |  6 +++---
 pkgs/development/libraries/java/rhino/default.nix   |  2 +-
 pkgs/development/libraries/svrcore/default.nix      |  2 +-
 pkgs/top-level/perl-packages.nix                    | 13 +++++++------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix
index e8d548df548..b7744ea53c3 100644
--- a/pkgs/development/interpreters/spidermonkey/default.nix
+++ b/pkgs/development/interpreters/spidermonkey/default.nix
@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation rec {
   name = "spidermonkey-1.7";
-  
+
   src = fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz;
+    url = https://ftp.mozilla.org/pub/js/js-1.7.0.tar.gz;
     sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4";
   };
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   makefileExtra = ./Makefile.extra;
   makefile = "Makefile.ref";
-  
+
   patchPhase =
     ''
       cat ${makefileExtra} >> ${makefile}
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index 74aa8c9ba16..87958512925 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   name = "rhino-${version}";
 
   src = fetchurl {
-    url = "ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip";
+    url = "https://ftp.mozilla.org/pub/js/rhino1_7R2.zip";
     sha256 = "1p32hkghi6bkc3cf2dcqyaw5cjj7403mykcp0fy8f5bsnv0pszv7";
   };
 
diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix
index 637b8b8ab7f..a5559e87aad 100644
--- a/pkgs/development/libraries/svrcore/default.nix
+++ b/pkgs/development/libraries/svrcore/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "4.0.4";
 
   src = fetchurl {
-    url = "ftp://ftp.mozilla.org/pub/mozilla.org/directory/svrcore/releases/${version}/src/${name}.tar.bz2";
+    url = "https://ftp.mozilla.org/pub/directory/svrcore/releases/${version}/src/${name}.tar.bz2";
     sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7";
   };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8e6d02ada39..1d9211fae2f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8047,17 +8047,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  MozillaLdap = buildPerlPackage {
-    name = "Mozilla-Ldap-1.5.3";
-    USE_OPENLDAP=1;
-    LDAPSDKDIR=pkgs.openldap;
+  MozillaLdap = buildPerlPackage rec {
+    name = "Mozilla-Ldap-${version}";
+    version = "1.5.3";
+    USE_OPENLDAP = 1;
+    LDAPSDKDIR = pkgs.openldap;
     src = fetchurl {
-      url = "ftp://ftp.mozilla.org/pub/mozilla.org/directory/perldap/releases/1.5.3/src/perl-mozldap-1.5.3.tar.gz";
+      url = "https://ftp.mozilla.org/pub/directory/perldap/releases/${version}/src/perl-mozldap-${version}.tar.gz";
       sha256 = "0s0albdw0zvg3w37s7is7gddr4mqwicjxxsy400n1p96l7ipnw4x";
     };
     meta = {
       description = "Mozilla's ldap client library";
-      license = "unknown";
+      license = with stdenv.lib.licenses; [ mpl20 lgpl21Plus gpl2Plus ];
     };
   };
 

From 5a2f0541a1ff3756bae30b0115c1610222858a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 26 Dec 2015 09:06:28 +0100
Subject: [PATCH 058/249] nixos/xserver: fix evaluation of xkbDir

I solved it this way because it seems the current state-of-the-art 89e983786
The problem was introduced in #11930. Close #11951 (a different solution).
---
 nixos/modules/services/x11/xserver.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 2bcaf2cf2a3..768fa50313a 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -281,10 +281,9 @@ in
       };
 
       xkbDir = mkOption {
-        type = types.str;
-        default = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        type = types.path;
         description = ''
-        Path used for -xkbdir xserver parameter.
+          Path used for -xkbdir xserver parameter.
         '';
       };
 
@@ -548,6 +547,8 @@ in
         xorg.xf86inputevdev
       ];
 
+    services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb";
+
     services.xserver.config =
       ''
         Section "ServerFlags"

From ae4a7f9351ae77d24fe72f88ee95cc56554528b4 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Sat, 26 Dec 2015 11:35:56 +0100
Subject: [PATCH 059/249] hostapd: rename extraCfg -> extraConfig, added
 asserts

---
 nixos/modules/rename.nix                      |  2 +
 nixos/modules/services/networking/hostapd.nix | 47 ++++++++++---------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 28ac1c3e888..2a3d89e9f6f 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -75,6 +75,8 @@ with lib;
     # DNSCrypt-proxy
     (mkRenamedOptionModule [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ])
 
+    (mkRenamedOptionModule [ "services" "hostapd" "extraCfg" ] [ "services" "hostapd" "extraConfig" ])
+
     # Options that are obsolete and have no replacement.
     (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ])
     (mkRemovedOptionModule [ "programs" "bash" "enable" ])
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 5a6ca139dda..287964aab07 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -2,21 +2,17 @@
 
 # TODO:
 #
-# asserts 
+# asserts
 #   ensure that the nl80211 module is loaded/compiled in the kernel
-#   hwMode must be a/b/g
-#   channel must be between 1 and 13 (maybe)
 #   wpa_supplicant and hostapd on the same wireless interface doesn't make any sense
-#   perhaps an assertion that there is a dhcp server and a dns server on the IP address serviced by the hostapd?
 
 with lib;
 
 let
 
   cfg = config.services.hostapd;
-  
-  configFile = pkgs.writeText "hostapd.conf"  
-    ''
+
+  configFile = pkgs.writeText "hostapd.conf" ''
     interface=${cfg.interface}
     driver=${cfg.driver}
     ssid=${cfg.ssid}
@@ -37,8 +33,8 @@ let
       wpa_passphrase=${cfg.wpaPassphrase}
       '' else ""}
 
-    ${cfg.extraCfg}
-    '' ;
+    ${cfg.extraConfig}
+  '' ;
 
 in
 
@@ -65,9 +61,9 @@ in
 
       interface = mkOption {
         default = "";
-        example = "wlan0";
+        example = "wlp2s0";
         description = ''
-          The interfaces <command>hostapd</command> will use. 
+          The interfaces <command>hostapd</command> will use.
         '';
       };
 
@@ -89,8 +85,7 @@ in
       };
 
       hwMode = mkOption {
-        default = "b";
-        example = "g";
+        default = "g";
         type = types.string;
         description = ''
           Operation mode.
@@ -98,17 +93,16 @@ in
         '';
       };
 
-      channel = mkOption { 
+      channel = mkOption {
         default = 7;
         example = 11;
         type = types.int;
-        description = 
-          ''
+        description = ''
           Channel number (IEEE 802.11)
           Please note that some drivers do not use this value from
           <command>hostapd</command> and the channel will need to be configured
           separately with <command>iwconfig</command>.
-          '';
+        '';
       };
 
       group = mkOption {
@@ -131,16 +125,15 @@ in
         default = "my_sekret";
         example = "any_64_char_string";
         type = types.string;
-        description = 
-          ''
+        description = ''
           WPA-PSK (pre-shared-key) passphrase. Clients will need this
           passphrase to associate with this access point.
           Warning: This passphrase will get put into a world-readable file in
           the Nix store!
-          '';
+        '';
       };
 
-      extraCfg = mkOption {
+      extraConfig = mkOption {
         default = "";
         example = ''
           auth_algo=0
@@ -158,17 +151,25 @@ in
 
   config = mkIf cfg.enable {
 
+    assertions = [
+      { assertion = (cfg.hwMode == "a" || cfg.hwMode == "b" || cfg.hwMode == "g");
+        message = "hwMode must be a/b/g";
+      }
+      { assertion = (cfg.channel >= 1 && cfg.channel <= 13);
+        message = "channel must be between 1 and 13";
+      }];
+
     environment.systemPackages =  [ pkgs.hostapd ];
 
     systemd.services.hostapd =
       { description = "hostapd wireless AP";
 
-        path = [ pkgs.hostapd ]; 
+        path = [ pkgs.hostapd ];
         wantedBy = [ "network.target" ];
 
         after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service"];
 
-        serviceConfig = 
+        serviceConfig =
           { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}";
             Restart = "always";
           };

From d9ad002b2c49fed8fd416cbbf6eba4962e17fa1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 26 Dec 2015 13:39:48 +0100
Subject: [PATCH 060/249] Prefer GnuPG 2.0.x by default.

"nix-env -iA gnupg" installs the 2.0.x version of GNU Privacy Guard. This patch
ensures that "nix-env -i gnupg" chooses the same version, instead of installing
GnuPG 2.1.x, which is considered a "development version".

Closes https://github.com/NixOS/nixpkgs/issues/11899.
---
 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 8ec08438a2a..08259db1cb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1657,7 +1657,7 @@ let
 
   gnupg20 = callPackage ../tools/security/gnupg/20.nix { };
 
-  gnupg21 = callPackage ../tools/security/gnupg/21.nix { };
+  gnupg21 = lowPrio (callPackage ../tools/security/gnupg/21.nix { });
 
   gnupg = gnupg20;
 

From d623916494772649d8868f496210605544024a17 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Sat, 26 Dec 2015 14:08:56 +0100
Subject: [PATCH 061/249] maintainers: Change my email address

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8b2ec630066..610d399b906 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -142,7 +142,7 @@
   jcumming = "Jack Cummings <jack@mudshark.org>";
   jefdaj = "Jeffrey David Johnson <jefdaj@gmail.com>";
   jfb = "James Felix Black <james@yamtime.com>";
-  jgeerds = "Jascha Geerds <jg@ekby.de>";
+  jgeerds = "Jascha Geerds <jascha@jgeerds.name>";
   jgillich = "Jakob Gillich <jakob@gillich.me>";
   jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>";
   joachifm = "Joachim Fasting <joachifm@fastmail.fm>";

From 4400f01c0bb2630e4ff175024e05d2b171c2782b Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Sat, 26 Dec 2015 18:00:20 +0100
Subject: [PATCH 062/249] amarok: fix taglib search

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

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index d99e1b7a150..95f55abddba 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
     libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
   ];
 
+  preConfigure = ''
+    sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
+  '';
+
   cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";
 
   propagatedUserEnvPkgs = [ qtscriptgenerator ];

From a25de32033e22ba9d70c813b81f6acd43d3f794e Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Sat, 26 Dec 2015 18:00:32 +0100
Subject: [PATCH 063/249] cantata: fix taglib search

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

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 2d399ba44da..c3b4e60b87c 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -93,6 +93,10 @@ stdenv.mkDerivation rec {
     "-DENABLE_UDISKS2=ON"
   ];
 
+  preConfigure = ''
+    sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake
+  '';
+
   postInstall = stdenv.lib.optionalString withQt5 ''
     wrapQtProgram "$out/bin/cantata"
   '';

From e94139f8c8a5e4c56ae7868e2348af47c4955a58 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Sat, 26 Dec 2015 18:42:03 +0100
Subject: [PATCH 064/249] Add comments identifying workarounds

---
 pkgs/applications/audio/amarok/default.nix           | 1 +
 pkgs/applications/audio/cantata/default.nix          | 1 +
 pkgs/development/libraries/taglib-extras/default.nix | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index 95f55abddba..e0519f2db5c 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
   ];
 
+  # This is already fixed upstream, will be release in 2.9
   preConfigure = ''
     sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
   '';
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index c3b4e60b87c..6906c7bccb5 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -93,6 +93,7 @@ stdenv.mkDerivation rec {
     "-DENABLE_UDISKS2=ON"
   ];
 
+  # This is already fixed upstream but not released yet. Maybe in version 2.
   preConfigure = ''
     sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake
   '';
diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix
index 1edabe4c81f..623119703d4 100644
--- a/pkgs/development/libraries/taglib-extras/default.nix
+++ b/pkgs/development/libraries/taglib-extras/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [ taglib ];
   nativeBuildInputs = [ cmake ];
+
+  # Workaround for upstream bug https://bugs.kde.org/show_bug.cgi?id=357181
   preConfigure = ''
     sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
   '';

From 0f52d33f96f82bb2e981bd98b88d849ef6523613 Mon Sep 17 00:00:00 2001
From: Drew Carey Buglione <drew@drewb.ug>
Date: Sat, 26 Dec 2015 12:36:19 -0600
Subject: [PATCH 065/249] nixos/manual: typo

---
 nixos/doc/manual/installation/installing.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 6d734cd8cac..9aec57fb6d5 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -35,7 +35,7 @@
   <command>systemctl stop network-manager</command>.</para></listitem>
 
   <listitem><para>The NixOS installer doesn’t do any partitioning or
-  formatting yet, so you need to that yourself.  Use the following
+  formatting yet, so you need to do that yourself.  Use the following
   commands:
 
   <itemizedlist>

From bbcc08cb30ff8ec21b39a58344e3c1171e09f454 Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Sat, 26 Dec 2015 10:38:17 -0800
Subject: [PATCH 066/249] NixOS manual: fix typo

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

diff --git a/nixos/modules/misc/nixos.xml b/nixos/modules/misc/nixos.xml
index f8d3b4bc6e3..064bdd80b3c 100644
--- a/nixos/modules/misc/nixos.xml
+++ b/nixos/modules/misc/nixos.xml
@@ -35,7 +35,7 @@ nixos.path = ./nixpkgs-16-03/nixos;
 
 <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
+<literal>pkgs.fetchFromGitHub</literal> function and use the result as an
 input.
 
 <programlisting>

From f3048aed1d8b1461a89a2fcd60e7d2994d80d429 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 25 Dec 2015 14:38:16 +0100
Subject: [PATCH 067/249] eid-viewer: 4.1.4 -> 4.1.9

---
 pkgs/tools/security/eid-viewer/default.nix | 14 +++++---------
 pkgs/top-level/python-packages.nix         |  2 --
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix
index c9663253761..ac6dee4beaa 100644
--- a/pkgs/tools/security/eid-viewer/default.nix
+++ b/pkgs/tools/security/eid-viewer/default.nix
@@ -1,16 +1,12 @@
-{ stdenv, fetchurl, jre, makeWrapper, pcsclite }:
+{ stdenv, fetchurl, makeWrapper, jre, pcsclite }:
 
-let
-  # TODO: find out what the version components actually mean, if anything:
-  major = "4.1.4-v4.1.4";
-  minor = "tcm406-270732";
-  version = "${major}-${minor}";
-in stdenv.mkDerivation rec {
+let version = "4.1.9"; in
+stdenv.mkDerivation rec {
   name = "eid-viewer-${version}";
 
   src = fetchurl {
-    url = "http://eid.belgium.be/en/binaries/eid-viewer-${major}.src.tar_${minor}.gz";
-    sha256 = "06kda45y7c3wvvqby153zcasgz4jibjypv8gvfwvrwvn4ag2z934";
+    url = "https://downloads.services.belgium.be/eid/eid-viewer-${version}-v${version}.src.tar.gz";
+    sha256 = "0bq9jl4kl97j0dfhz4crcb1wqhn420z5vpg510zadvrmqjhy1x4g";
   };
 
   buildInputs = [ jre pcsclite ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index baadc405537..c8def0b907a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17993,8 +17993,6 @@ in modules // {
 
     propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ];
     buildInputs = with pkgs; [ alsaLib ffmpeg libv4l pkgconfig sqlite libvpx ];
-
-    doCheck = false;
   };
 
 

From cf699caf4d9be4445b3516f9b9b362dd3d442edf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 25 Dec 2015 15:56:05 +0100
Subject: [PATCH 068/249] saneBackends: don't add option for 1 udev rule

---
 pkgs/applications/graphics/sane/backends/generic.nix | 12 +++---------
 pkgs/top-level/all-packages.nix                      |  2 --
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index a8963b438b8..9fbeb612614 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -2,13 +2,9 @@
 , avahi, libusb1, libv4l, net_snmp
 , gettext, pkgconfig
 , gt68xxFirmware ? null, snapscanFirmware ? null
-, hotplugSupport ? true
 , version, src, ...
 }:
 
-assert hotplugSupport ->
-  builtins.elem stdenv.system [ "i686-linux" "x86_64-linux" ];
-
 stdenv.mkDerivation {
   inherit src;
 
@@ -25,11 +21,9 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ gettext pkgconfig ];
 
   postInstall = ''
-    if test "$hotplugSupport" = "1"; then
-      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
-    fi
+    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
   '';
 
   preInstall =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08259db1cb7..a9593b36186 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15542,13 +15542,11 @@ let
   saneBackends = callPackage ../applications/graphics/sane/backends {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;
     snapscanFirmware = config.sane.snapscanFirmware or null;
-    hotplugSupport = config.sane.hotplugSupport or true;
   };
 
   saneBackendsGit = callPackage ../applications/graphics/sane/backends/git.nix {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;
     snapscanFirmware = config.sane.snapscanFirmware or null;
-    hotplugSupport = config.sane.hotplugSupport or true;
   };
 
   mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };

From c05165ba5ce24fb793040218b8e899c53bda448c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 26 Dec 2015 19:05:48 +0100
Subject: [PATCH 069/249] saneBackends: don't add epson2 to dll.conf

It's already in there by default.
---
 pkgs/applications/graphics/sane/backends/generic.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 9fbeb612614..5b6c8943783 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -33,8 +33,6 @@ stdenv.mkDerivation {
     else if snapscanFirmware != null then
       "mkdir -p \${out}/share/sane/snapscan ; ln -s " + snapscanFirmware +
       " \${out}/share/sane/snapscan/your-firmwarefile.bin"
-      "mkdir -p \${out}/etc/sane.d ; " +
-      "echo epson2 >> \${out}/etc/sane.d/dll.conf"
     else "";
 
   meta = with stdenv.lib; {

From 8b4273a65dfc73044f27f6f43fc7f9a7c2202d9f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 26 Dec 2015 19:48:33 +0100
Subject: [PATCH 070/249] saneBackends: add generic extraFirmware support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This usurps the model-specific gt68xxFirmware and snapscanFirmware,
which are still supported for backwards compatibility – hopefully
not forever.
---
 .../graphics/sane/backends/generic.nix        | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 5b6c8943783..e98774a4368 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,7 +1,14 @@
 { stdenv, fetchurl
 , avahi, libusb1, libv4l, net_snmp
 , gettext, pkgconfig
+
+# List of { src name backend } attibute sets - see installFirmware below:
+, extraFirmware ? []
+
+# For backwards compatibility with older setups; use extraFirmware instead:
 , gt68xxFirmware ? null, snapscanFirmware ? null
+
+# Passed from versioned package (e.g. default.nix, git.nix):
 , version, src, ...
 }:
 
@@ -20,20 +27,30 @@ stdenv.mkDerivation {
   buildInputs = [ avahi libusb1 libv4l net_snmp ];
   nativeBuildInputs = [ gettext pkgconfig ];
 
-  postInstall = ''
+  postInstall = let
+
+    compatFirmware = extraFirmware
+      ++ stdenv.lib.optional (gt68xxFirmware != null) {
+        src = gt68xxFirmware.fw;
+        inherit (gt68xxFirmware) name;
+        backend = "gt68xx";
+      }
+      ++ stdenv.lib.optional (snapscanFirmware != null) {
+        src = snapscanFirmware;
+        name = "your-firmwarefile.bin";
+        backend = "snapscan";
+      };
+
+    installFirmware = f: ''
+      mkdir -p $out/share/sane/${f.backend}
+      ln -sv ${f.src} $out/share/sane/${f.backend}/${f.name}
+    '';
+
+  in ''
     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
-  '';
-
-  preInstall =
-    if gt68xxFirmware != null then
-      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + gt68xxFirmware.fw +
-      " \${out}/share/sane/gt68xx/" + gt68xxFirmware.name
-    else if snapscanFirmware != null then
-      "mkdir -p \${out}/share/sane/snapscan ; ln -s " + snapscanFirmware +
-      " \${out}/share/sane/snapscan/your-firmwarefile.bin"
-    else "";
+  '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware);
 
   meta = with stdenv.lib; {
     inherit version;

From bb3a2aa8eb710b8950d7b65cd3270b11da5003d1 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 26 Dec 2015 13:46:34 -0800
Subject: [PATCH 071/249] autossh: build on darwin too

Tested it out just now - seems like it works fine.
---
 pkgs/tools/networking/autossh/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix
index 5addf30c322..9ff0376c8bc 100644
--- a/pkgs/tools/networking/autossh/default.nix
+++ b/pkgs/tools/networking/autossh/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://www.harding.motd.ca/autossh/;
     description = "Automatically restart SSH sessions and tunnels";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ pSub ];
   };
 }

From 5cfeedc9147d543b5409f1d19e9303c813200e9d Mon Sep 17 00:00:00 2001
From: Yuri Albuquerque <yuridenommus@gmail.com>
Date: Sun, 27 Dec 2015 00:02:09 -0400
Subject: [PATCH 072/249] fontforge: needs pango on Linux, too

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

diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 3ecb886419f..9ee3eb23e0e 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -29,10 +29,9 @@ stdenv.mkDerivation {
   buildInputs = [
     git autoconf automake gnum4 libtool perl pkgconfig gettext uthash
     python freetype zlib glib libungif libpng libjpeg libtiff libxml2
+    pango
   ]
-    ++ lib.optionals withGTK [ gtk2 ]
-    # I'm not sure why pango doesn't seem necessary on Linux
-    ++ lib.optionals stdenv.isDarwin [ pango ];
+    ++ lib.optionals withGTK [ gtk2 ];
 
   configureFlags =
     lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ]

From 9c6fecbda0f713a1394bcfd9054050205133835d Mon Sep 17 00:00:00 2001
From: Yuri Albuquerque <yuridenommus@gmail.com>
Date: Sun, 27 Dec 2015 00:01:58 -0400
Subject: [PATCH 073/249] playonlinux: needs which and curl during runtime

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

diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index 731cf5a6ba9..178fc13065b 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -17,6 +17,8 @@
 , xterm
 , pkgs
 , pkgsi686Linux
+, which
+, curl
 }:
 
 assert stdenv.isLinux;
@@ -39,6 +41,8 @@ let
       wine
       xdg-user-dirs
       xterm
+      which
+      curl
     ];
 
   ld32 =

From d4406237a9731f1a9f3330f675bf57b8eb58a048 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 27 Dec 2015 06:33:35 +0100
Subject: [PATCH 074/249] dvdisaster: 0.72.6 -> 0.79.5

---
 pkgs/tools/cd-dvd/dvdisaster/default.nix      | 27 +++++++++++++------
 pkgs/tools/cd-dvd/dvdisaster/encryption.patch | 24 ++++++++---------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index 101d69c0903..7d17b8b3282 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, which, gettext, intltool
+{ stdenv, fetchurl, pkgconfig, gettext, which
 , glib, gtk2
 , enableSoftening ? true
 }:
 
+let version = "0.79.5"; in
 stdenv.mkDerivation rec {
-  name = "dvdisaster-0.72.6";
+  name = "dvdisaster-${version}";
 
   src = fetchurl {
     url = "http://dvdisaster.net/downloads/${name}.tar.bz2";
-    sha256 = "e9787dea39aeafa38b26604752561bc895083c17b588489d857ac05c58be196b";
+    sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w";
   };
 
+  nativeBuildInputs = [ gettext pkgconfig which ];
+  buildInputs = [ glib gtk2 ];
+
   patches = stdenv.lib.optional enableSoftening [
     ./encryption.patch
     ./dvdrom.patch
@@ -21,8 +25,13 @@ stdenv.mkDerivation rec {
     sed -i 's/dvdisaster48.png/dvdisaster/' contrib/dvdisaster.desktop
   '';
 
-  # Explicit --docdir= is required for on-line help to work:
-  configureFlags = [ "--docdir=$out/share/doc" ];
+  configureFlags = [
+    # Explicit --docdir= is required for on-line help to work:
+    "--docdir=$out/share/doc"
+    "--with-nls=yes"
+    "--with-embedded-src-path=no"
+  ] ++ stdenv.lib.optional (builtins.elem stdenv.system
+      stdenv.lib.platforms.x86_64) "--with-sse2=yes";
 
   buildInputs = [
     pkgconfig which gettext intltool
@@ -35,11 +44,13 @@ stdenv.mkDerivation rec {
 
     for size in 16 24 32 48 64; do
       mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps/
-      cp contrib/dvdisaster"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/dvdisaster.png
+      cp contrib/dvdisaster"$size".png \
+        $out/share/icons/hicolor/"$size"x"$size"/apps/dvdisaster.png
     done
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     homepage = http://dvdisaster.net/;
     description = "Data loss/scratch/aging protection for CD/DVD media";
     longDescription = ''
@@ -48,8 +59,8 @@ stdenv.mkDerivation rec {
       data which is used to recover unreadable sectors if the disc becomes
       damaged at a later time.
     '';
-    license = licenses.gpl2;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ jgeerds ];
+    maintainers = with maintainers; [ jgeerds nckx ];
   };
 }
diff --git a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch b/pkgs/tools/cd-dvd/dvdisaster/encryption.patch
index a9383cb13cf..21e35889382 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch
+++ b/pkgs/tools/cd-dvd/dvdisaster/encryption.patch
@@ -1,21 +1,19 @@
 Author: n/a
 Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
 
-Index: dvdisaster/scsi-layer.c
-===================================================================
---- dvdisaster.orig/scsi-layer.c	2012-04-08 21:51:10.995588783 +0900
-+++ dvdisaster/scsi-layer.c	2012-04-08 21:51:29.259678075 +0900
-@@ -2693,11 +2693,12 @@
-        	 return NULL;
+diff -Naur dvdisaster-0.79.5.orig/scsi-layer.c dvdisaster-0.79.5/scsi-layer.c
+--- dvdisaster-0.79.5.orig/scsi-layer.c	2015-10-28 21:56:57.000000000 +0100
++++ dvdisaster-0.79.5/scsi-layer.c	2015-12-27 06:19:32.012253661 +0100
+@@ -2712,12 +2712,6 @@
        }
     }
--
-+/*
-    if(dh->mainType == DVD && query_copyright(dh))
-    {  CloseDevice(dh);
-       Stop(_("This software does not support encrypted media.\n"));
-    }
-+*/
  
+-   if(dh->mainType == DVD && query_copyright(dh))
+-   {  CloseImage(image);
+-      Stop(_("This software does not support encrypted media.\n"));
+-      return NULL;
+-   }
+-
     /* Create the bitmap of simulated defects */
  
+    if(Closure->simulateDefects)

From 5d03506df77885e1ac4a18236723d37663cf8709 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 27 Dec 2015 06:36:30 +0100
Subject: [PATCH 075/249] dvdisaster: run tests & build in parallel

It seems like a good idea to test back-up software...
---
 pkgs/tools/cd-dvd/dvdisaster/default.nix | 28 ++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index 7d17b8b3282..a98ce2088bd 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -33,10 +33,30 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional (builtins.elem stdenv.system
       stdenv.lib.platforms.x86_64) "--with-sse2=yes";
 
-  buildInputs = [
-    pkgconfig which gettext intltool
-    glib gtk2
-  ];
+  enableParallelBuilding = true;
+
+  doCheck = true;
+  checkPhase = ''
+    pushd regtest
+
+    mkdir -p "$TMP"/{log,regtest}
+    substituteInPlace common.bash \
+      --replace /dev/shm "$TMP/log" \
+      --replace /var/tmp "$TMP"
+
+    for test in *.bash; do
+      case "$test" in
+      common.bash)
+        echo "Skipping $test"
+        continue ;;
+      *)
+        echo "Running $test"
+        ./"$test"
+      esac
+    done
+
+    popd
+  '';
 
   postInstall = ''
     mkdir -pv $out/share/applications

From 39c43bc6e22ac739952b5e2e45c1ad6e57ff9e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 26 Dec 2015 11:07:29 +0100
Subject: [PATCH 076/249] archiveopteryx: improve install paths, parallel build

---
 pkgs/servers/mail/archiveopteryx/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix
index 8388d63d6b2..966f90c40f1 100644
--- a/pkgs/servers/mail/archiveopteryx/default.nix
+++ b/pkgs/servers/mail/archiveopteryx/default.nix
@@ -1,18 +1,24 @@
-{ stdenv, fetchurl, openssl, perl, zlib }:
+{ stdenv, fetchurl, openssl, perl, zlib, jam }:
 stdenv.mkDerivation rec {
   version = "3.2.0";
   name = "archiveopteryx-${version}";
+
   src = fetchurl {
     url = "http://archiveopteryx.org/download/${name}.tar.bz2";
     sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx";
   };
+
+  nativeBuildInputs = [ jam ];
   buildInputs = [ openssl perl zlib ];
+
+  preConfigure = ''export PREFIX="$out" '';
+  buildPhase = ''jam "-j$NIX_BUILD_CORES" '';
   installPhase = ''
-    INSTALLROOT=$out make install
-    mkdir $out/bin
-    ln --symbolic $out/usr/local/archiveopteryx/sbin/* $out/bin/
-    ln --symbolic $out/usr/local/archiveopteryx/bin/* $out/bin/
+    jam install
+    mkdir -p "$out/share/doc/archiveopteryx"
+    mv -t "$out/share/doc/archiveopteryx/" "$out"/{bsd.txt,COPYING,README}
   '';
+
   meta = with stdenv.lib; {
     homepage = http://archiveopteryx.org/;
     description = "An advanced PostgreSQL-based IMAP/POP server";

From 42557425bc2b3554d09698648d46711320d7c797 Mon Sep 17 00:00:00 2001
From: codsl <codsl@riseup.net>
Date: Sun, 27 Dec 2015 07:20:11 +0000
Subject: [PATCH 077/249] tor: 0.2.7.5 -> 0.2.7.6

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

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index a03a945f805..7ff1cd9cca5 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libevent, openssl, zlib, torsocks, libseccomp }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.2.7.5";
+  name = "tor-0.2.7.6";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
-    sha256 = "0pxayvcab4cb107ynbpzx4g0qyr1mjfba2an76wdx6dxn56rwakx";
+    sha256 = "0p8hjlfi8dwghlyjif5s0q98cmpgz9kn9jja25430l04z5wqcfj9";
   };
 
   # Note: torsocks is specified as a dependency, as the distributed

From d776afef095fb8763ab9f0dc47e769c696852c4f Mon Sep 17 00:00:00 2001
From: wedens <kirill.wedens@gmail.com>
Date: Sun, 27 Dec 2015 14:02:21 +0600
Subject: [PATCH 078/249] rtv: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 84f9bdcadb7..2126ce23d3a 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "1.7.0";
+  version = "1.8.0";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "0fynymia3c2rynq9bm0jssd3rad7f7hhmjpkby7yj6g3jvk7jn4x";
+    sha256 = "0vp9yapm6bm4zdhd1ibbirc23ck7smrbsrask7xkrnz7qysxgsd3";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 8fb46420efcbfb06108f47d831db5d38ed1371b4 Mon Sep 17 00:00:00 2001
From: codsl <codsl@riseup.net>
Date: Sun, 27 Dec 2015 09:30:47 +0000
Subject: [PATCH 079/249] torbrowser: 5.0.4 -> 5.0.6

---
 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 3ff4ce724b8..e6ce333cc91 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.4";
+  version = "5.0.6";
 
   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
-      "03vn1wkkpgr6wzd6iiyqs7zv7yxl9q99j755n8l2579bd10w1xcn" else
-      "1yc13cykr4fafz6r8hnjccl0s33sk297c779cknbdbhj3z3yn163";
+      "1ix05760l9j6bwbswd2fnk4b6nrrzxp3b8abvm4y4979pkkmasfw" else
+      "1q5mf91xxj1xs4ajj9i6mdhnzqycbdvprkzskx8pl6j9ll2hlsyh";
   };
 
   patchPhase = ''

From 56aa0ff1d9d14486de2ebad3b5605c43695bae95 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 27 Dec 2015 14:23:52 +0100
Subject: [PATCH 080/249] runzip: init at 1.4

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

diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix
new file mode 100644
index 00000000000..9b2fd0eda59
--- /dev/null
+++ b/pkgs/tools/archivers/runzip/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchFromGitHub, libzip, autoconf, automake, libtool, m4}:
+stdenv.mkDerivation rec {
+  baseName = "runzip";
+  version = "1.4";
+  name = "${baseName}-${version}";
+  buildInputs = [libzip autoconf automake libtool m4];
+  src = fetchFromGitHub {
+    owner = "vlm";
+    repo = "zip-fix-filename-encoding";
+    rev = "v${version}";
+    sha256 = "0l5zbb5hswxczigvyal877j0aiq3fc01j3gv88bvy7ikyvw3lc07";
+  };
+  preConfigure = ''
+    autoreconf -iv
+  '';
+  meta = {
+    inherit version;
+    description = ''A tool to convert filename encoding inside a ZIP archive'';
+    license = stdenv.lib.licenses.bsd2 ;
+    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 a9593b36186..88dc7faced3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2964,6 +2964,8 @@ let
   rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
 
   rubber = callPackage ../tools/typesetting/rubber { };
+  
+  runzip = callPackage ../tools/archivers/runzip { };
 
   rxp = callPackage ../tools/text/xml/rxp { };
 

From 5d682e515ebba4b395dd3557a3479c732bca112b Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sun, 27 Dec 2015 13:32:44 +0000
Subject: [PATCH 081/249] release-notes: add pump.io as a new service

---
 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 1b8efe8770e..f74fff83b48 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -30,6 +30,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>
   </itemizedlist>
 </para>
 

From 3eda86cfea3e8900abe1d83966cdaf196e9899e5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 27 Dec 2015 08:33:28 -0600
Subject: [PATCH 082/249] elpa-packages 2015-12-27

---
 pkgs/applications/editors/emacs-modes/elpa-packages.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.json b/pkgs/applications/editors/emacs-modes/elpa-packages.json
index a3813435f63..479808d1d03 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.json
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.json
@@ -246,10 +246,10 @@
     "org": {
         "fetch": {
             "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/org-20151214.tar",
-            "sha256": "15m9l7p7xfmcrxrcsxbvpp8bq5ajcapknvqblhmk77j7ca3jffi1"
+            "url": "http://elpa.gnu.org/packages/org-20151221.tar",
+            "sha256": "01p8c70bd2mp3w08vpha0dvpljhj4r5797b0m9q16z4zhxqaqbqx"
         },
-        "version": "20151214",
+        "version": "20151221",
         "deps": []
     },
     "bug-hunter": {

From 5558dc828c1b1b28ed87bf749e90f9caa5e01430 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 27 Dec 2015 15:01:04 +0100
Subject: [PATCH 083/249] anki: major refactor

This refactoring changes a number of things:

 - use system copies of Python libraries BeautifulSoup, and HTTPLIB2,

 - custom install to avoid installation of unnecessary files and poor
   directory structure, and

 - add patch for sorting out file paths, in particular this fixes
   localization.
---
 pkgs/games/anki/default.nix     | 66 ++++++++++++++--------
 pkgs/games/anki/fix-paths.patch | 98 +++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/games/anki/fix-paths.patch

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index f99a8ddb4a8..ca18ca194da 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchurl, lame, mplayer, libpulseaudio, portaudio
-, python, pyqt4, pythonPackages
+{ stdenv, lib, fetchurl, substituteAll, lame, mplayer
+, libpulseaudio, python, pyqt4, qt4, pythonPackages
 # This little flag adds a huge number of dependencies, but we assume that
 # everyone wants Anki to draw plots with statistics by default.
 , plotsSupport ? true }:
@@ -18,37 +18,59 @@ stdenv.mkDerivation rec {
       sha256 = "1d5rf5gcw98m38wam6wh3hyh7qd78ws7zipm67xg744flqsjrzmr";
     };
 
-    pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy9 py.pyaudio ]
+    pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy9 py.pyaudio py.beautifulsoup py.httplib2 ]
               ++ lib.optional plotsSupport py.matplotlib;
 
     buildInputs = [ python py.wrapPython lame mplayer libpulseaudio ];
 
-    patchPhase = ''
-      substituteInPlace anki/sound.py --replace '["mplayer"]' '["${mplayer}/bin/mplayer"]'
+    phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+
+    patches = [
+      (substituteAll {
+        src = ./fix-paths.patch;
+        inherit lame mplayer qt4;
+        qt4name = qt4.name;
+      })
+    ];
+
+    postPatch = ''
+      substituteInPlace oldanki/lang.py --subst-var-by anki $out
+      substituteInPlace anki/lang.py --subst-var-by anki $out
+
+      # Remove unused starter. We'll create our own, minimalistic,
+      # starter.
+      rm anki/anki
+
+      # Remove QT translation files. We'll use the standard QT ones.
+      rm "locale/"*.qm
     '';
 
-    preConfigure = ''
-      substituteInPlace anki/anki \
-        --replace /usr/share/ $out/share/
+    installPhase = ''
+      pp=$out/lib/${python.libPrefix}/site-packages
 
-      substituteInPlace Makefile \
-        --replace PREFIX=/usr PREFIX=$out \
-        --replace /local/bin/ /bin/
-
-      sed -i '/xdg-mime/ d' Makefile
-    '';
-
-    preInstall = ''
       mkdir -p $out/bin
-      mkdir -p $out/share/pixmaps
       mkdir -p $out/share/applications
+      mkdir -p $out/share/doc/anki
       mkdir -p $out/share/man/man1
-    '';
+      mkdir -p $out/share/mime/packages
+      mkdir -p $out/share/pixmaps
+      mkdir -p $pp
+
+      cat > $out/bin/anki <<EOF
+      #!${python}/bin/python
+      import aqt
+      aqt.run()
+      EOF
+      chmod 755 $out/bin/anki
+
+      cp -v anki.desktop $out/share/applications/
+      cp -v README* LICENSE* $out/share/doc/anki/
+      cp -v anki.1 $out/share/man/man1/
+      cp -v anki.xml $out/share/mime/packages/
+      cp -v anki.{png,xpm} $out/share/pixmaps/
+      cp -rv locale $out/share/
+      cp -rv anki aqt thirdparty/send2trash $pp/
 
-    postInstall = ''
-      mkdir -p "$out/lib/${python.libPrefix}/site-packages"
-      ln -s "$out/share/anki/"* $out/lib/${python.libPrefix}/site-packages/
-      export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
       wrapPythonPrograms
     '';
 
diff --git a/pkgs/games/anki/fix-paths.patch b/pkgs/games/anki/fix-paths.patch
new file mode 100644
index 00000000000..cfd3424f799
--- /dev/null
+++ b/pkgs/games/anki/fix-paths.patch
@@ -0,0 +1,98 @@
+diff -Nurp anki-2.0.33.orig/anki/lang.py anki-2.0.33/anki/lang.py
+--- anki-2.0.33.orig/anki/lang.py	2015-12-27 11:23:02.334908723 +0100
++++ anki-2.0.33/anki/lang.py	2015-12-27 14:06:00.688003103 +0100
+@@ -71,13 +71,7 @@ def ngettext(single, plural, n):
+     return localTranslation().ungettext(single, plural, n)
+ 
+ def langDir():
+-    dir = os.path.join(os.path.dirname(
+-        os.path.abspath(__file__)), "locale")
+-    if not os.path.isdir(dir):
+-        dir = os.path.join(os.path.dirname(sys.argv[0]), "locale")
+-    if not os.path.isdir(dir):
+-        dir = "/usr/share/anki/locale"
+-    return dir
++    return "@anki@/share/locale"
+ 
+ def setLang(lang, local=True):
+     trans = gettext.translation(
+diff -Nurp anki-2.0.33.orig/anki/sound.py anki-2.0.33/anki/sound.py
+--- anki-2.0.33.orig/anki/sound.py	2015-12-27 11:23:02.334908723 +0100
++++ anki-2.0.33/anki/sound.py	2015-12-27 11:34:11.863147265 +0100
+@@ -29,8 +29,9 @@ processingDst = u"rec.mp3"
+ processingChain = []
+ recFiles = []
+ 
++lameCmd = "@lame@/bin/lame"
+ processingChain = [
+-    ["lame", "rec.wav", processingDst, "--noreplaygain", "--quiet"],
++    [lameCmd, "rec.wav", processingDst, "--noreplaygain", "--quiet"],
+     ]
+ 
+ # don't show box on windows
+@@ -44,13 +45,6 @@ if isWin:
+ else:
+     si = None
+ 
+-if isMac:
+-    # make sure lame, which is installed in /usr/local/bin, is in the path
+-    os.environ['PATH'] += ":" + "/usr/local/bin"
+-    dir = os.path.dirname(os.path.abspath(__file__))
+-    dir = os.path.abspath(dir + "/../../../..")
+-    os.environ['PATH'] += ":" + dir + "/audio"
+-
+ def retryWait(proc):
+     # osx throws interrupted system call errors frequently
+     while 1:
+@@ -62,13 +56,7 @@ def retryWait(proc):
+ # Mplayer settings
+ ##########################################################################
+ 
+-if isWin:
+-    mplayerCmd = ["mplayer.exe", "-ao", "win32"]
+-    dir = os.path.dirname(os.path.abspath(sys.argv[0]))
+-    os.environ['PATH'] += ";" + dir
+-    os.environ['PATH'] += ";" + dir + "\\..\\win\\top" # for testing
+-else:
+-    mplayerCmd = ["mplayer"]
++mplayerCmd = ["@mplayer@/bin/mplayer"]
+ mplayerCmd += ["-really-quiet", "-noautosub"]
+ 
+ # Mplayer in slave mode
+@@ -220,7 +208,7 @@ class _Recorder(object):
+         self.encode = encode
+         for c in processingChain:
+             #print c
+-            if not self.encode and c[0] == 'lame':
++            if not self.encode and c[0] == lameCmd:
+                 continue
+             try:
+                 ret = retryWait(subprocess.Popen(c, startupinfo=si))
+diff -Nurp anki-2.0.33.orig/aqt/__init__.py anki-2.0.33/aqt/__init__.py
+--- anki-2.0.33.orig/aqt/__init__.py	2015-12-27 11:23:02.338908782 +0100
++++ anki-2.0.33/aqt/__init__.py	2015-12-27 12:35:03.405565214 +0100
+@@ -107,7 +107,7 @@ def setupLang(pm, app, force=None):
+         app.setLayoutDirection(Qt.LeftToRight)
+     # qt
+     _qtrans = QTranslator()
+-    if _qtrans.load("qt_" + lang, dir):
++    if _qtrans.load("qt_" + lang, "@qt4@/share/@qt4name@/translations"):
+         app.installTranslator(_qtrans)
+ 
+ # App initialisation
+diff -Nurp anki-2.0.33.orig/oldanki/lang.py anki-2.0.33/oldanki/lang.py
+--- anki-2.0.33.orig/oldanki/lang.py	2015-12-27 11:23:02.390909551 +0100
++++ anki-2.0.33/oldanki/lang.py	2015-12-27 14:05:51.663920453 +0100
+@@ -32,11 +32,7 @@ def ngettext(single, plural, n):
+     return localTranslation().ungettext(single, plural, n)
+ 
+ def setLang(lang, local=True):
+-    base = os.path.dirname(os.path.abspath(__file__))
+-    localeDir = os.path.join(base, "locale")
+-    if not os.path.exists(localeDir):
+-        localeDir = os.path.join(
+-            os.path.dirname(sys.argv[0]), "locale")
++    localeDir = "@anki@/share/locale"
+     trans = gettext.translation('libanki', localeDir,
+                                 languages=[lang],
+                                 fallback=True)

From 9602a20835acfbf2fd63dc85930013c35e8a6f39 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 27 Dec 2015 10:14:57 -0600
Subject: [PATCH 084/249] melpa-packages 2015-12-27

---
 .../editors/emacs-modes/melpa-packages.json   | 7102 +++++++++--------
 1 file changed, 3665 insertions(+), 3437 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.json b/pkgs/applications/editors/emacs-modes/melpa-packages.json
index 39e720553ca..889b4cea4a5 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.json
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.json
@@ -9,7 +9,7 @@
         },
         "recipe": {
             "sha256": "181linsbg5wrx1z7zbj3in2d3d4zd2v7drspkj0b6l0c5yfxwayf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150202.1017",
         "deps": []
@@ -24,7 +24,7 @@
         },
         "recipe": {
             "sha256": "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140118.244",
         "deps": [
@@ -37,14 +37,14 @@
             "tag": "fetchFromGitHub",
             "owner": "sshbio",
             "repo": "drawille",
-            "sha256": "0ay71bny5sn8ndv5b7mpr19hjislaaah0sw2wbqxcvh219l05gna",
-            "rev": "d56a71a168b391365c8d6f567391a6892bbd3909"
+            "sha256": "1i4kccig2qy9rqfblibjj0aml7yqxjl9j2za4nkqdjwqkn9ihin7",
+            "rev": "2b31e339a64e06ae817b29cade04a2a141c69121"
         },
         "recipe": {
             "sha256": "01rl21hbj3hwy072yr27jl6iql331v131d3mr9zifg9v6f3jqbil",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151213.1208",
+        "version": "20151222.1832",
         "deps": [
             "cl-lib"
         ]
@@ -59,7 +59,7 @@
         },
         "recipe": {
             "sha256": "1q2h9wjnyg7wlk913px4vj1cxqynd6xfh9ind7kjyra436yw3l4j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140915.1610",
         "deps": []
@@ -74,7 +74,7 @@
         },
         "recipe": {
             "sha256": "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150910.1440",
         "deps": []
@@ -84,11 +84,11 @@
             "tag": "fetchsvn",
             "url": "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs",
             "sha256": "1v8wgm3cvz4xx2jlx95ipd9340mxfxgk5hqialp76y74x03vfzq1",
-            "rev": "11156"
+            "rev": "11174"
         },
         "recipe": {
             "sha256": "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150819.604",
         "deps": []
@@ -103,7 +103,7 @@
         },
         "recipe": {
             "sha256": "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150909.43",
         "deps": [
@@ -120,7 +120,7 @@
         },
         "recipe": {
             "sha256": "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141012.511",
         "deps": [
@@ -137,7 +137,7 @@
         },
         "recipe": {
             "sha256": "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.2305",
         "deps": []
@@ -152,7 +152,7 @@
         },
         "recipe": {
             "sha256": "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151118.215",
         "deps": [
@@ -170,7 +170,7 @@
         },
         "recipe": {
             "sha256": "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150504.1811",
         "deps": []
@@ -185,7 +185,7 @@
         },
         "recipe": {
             "sha256": "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151106.249",
         "deps": []
@@ -200,7 +200,7 @@
         },
         "recipe": {
             "sha256": "1dcw8pa3r9b7n7dc8fgzijz7ywwxb3nlfg7n0by8dnvpjq2c30bg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150418.355",
         "deps": []
@@ -215,7 +215,7 @@
         },
         "recipe": {
             "sha256": "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.144",
         "deps": [
@@ -235,7 +235,7 @@
         },
         "recipe": {
             "sha256": "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151114.516",
         "deps": [
@@ -254,7 +254,7 @@
         },
         "recipe": {
             "sha256": "0hwhvf1qwkmzzlzdda1flw6p1jjh9rzxsfwm2sc4795ac2xm6dhc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140128.1334",
         "deps": []
@@ -269,7 +269,7 @@
         },
         "recipe": {
             "sha256": "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151003.2131",
         "deps": [
@@ -288,7 +288,7 @@
         },
         "recipe": {
             "sha256": "1fyzjkw9xp126bzfv1254bvyakh323iw3wdzrkd9gb4ir39k5jzw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.350",
         "deps": [
@@ -304,7 +304,7 @@
         },
         "recipe": {
             "sha256": "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.837",
         "deps": []
@@ -319,7 +319,7 @@
         },
         "recipe": {
             "sha256": "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.1347",
         "deps": [
@@ -336,7 +336,7 @@
         },
         "recipe": {
             "sha256": "1bzx5ii06r64nra92zv1dvw5zv3im7la2dd3md801hxyfrpb74gc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120223.1650",
         "deps": []
@@ -351,7 +351,7 @@
         },
         "recipe": {
             "sha256": "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.814",
         "deps": []
@@ -366,7 +366,7 @@
         },
         "recipe": {
             "sha256": "1a6k47z5kmacj1s5479393jyj27bjx0911yaqfmmwg2hr0yz7vll",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151125.657",
         "deps": [
@@ -382,7 +382,7 @@
         },
         "recipe": {
             "sha256": "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.1640",
         "deps": [
@@ -399,7 +399,7 @@
         },
         "recipe": {
             "sha256": "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.245",
         "deps": [
@@ -419,7 +419,7 @@
         },
         "recipe": {
             "sha256": "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150824.901",
         "deps": []
@@ -434,7 +434,7 @@
         },
         "recipe": {
             "sha256": "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151028.210",
         "deps": [
@@ -450,7 +450,7 @@
         },
         "recipe": {
             "sha256": "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1906",
         "deps": []
@@ -465,7 +465,7 @@
         },
         "recipe": {
             "sha256": "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140418.915",
         "deps": [
@@ -484,7 +484,7 @@
         },
         "recipe": {
             "sha256": "1z776jbpjks5bir6bd0748mlrmz05nf0jy9l4hlmwgyn72dcbx16",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140211.149",
         "deps": []
@@ -499,7 +499,7 @@
         },
         "recipe": {
             "sha256": "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150404.701",
         "deps": []
@@ -514,7 +514,7 @@
         },
         "recipe": {
             "sha256": "1nrjkrr64rry6fjya22b0lcs0f8a2ijvr87192z311y9mw5rvb29",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150607.941",
         "deps": [
@@ -531,7 +531,7 @@
         },
         "recipe": {
             "sha256": "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150715.1404",
         "deps": []
@@ -544,7 +544,7 @@
         },
         "recipe": {
             "sha256": "0a0n1lqakgsbz0scn6617rkkkvzwranzlvkzw9q4zapiz1s9xqp9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1750",
         "deps": []
@@ -559,7 +559,7 @@
         },
         "recipe": {
             "sha256": "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151120.1915",
         "deps": [
@@ -576,7 +576,7 @@
         },
         "recipe": {
             "sha256": "085yayzph3y7fh6pd5sdjdkhdcvwfzcyqd6y3xlbz7wni5ac6b5f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150209.1626",
         "deps": []
@@ -591,7 +591,7 @@
         },
         "recipe": {
             "sha256": "17bl1g4ais73ws596mha0l8dgckfqhx9k2v9m9k0gw7kg7dcjhnb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150110.2226",
         "deps": [
@@ -608,7 +608,7 @@
         },
         "recipe": {
             "sha256": "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150906.1159",
         "deps": [
@@ -626,7 +626,7 @@
         },
         "recipe": {
             "sha256": "1jqc6pspgcrdzm7ij46r1q6vpjq7il5dy2xyxwn2c1ky5a80paby",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131201.130",
         "deps": []
@@ -641,7 +641,7 @@
         },
         "recipe": {
             "sha256": "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151124.1009",
         "deps": [
@@ -660,7 +660,7 @@
         },
         "recipe": {
             "sha256": "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141208.908",
         "deps": [
@@ -677,7 +677,7 @@
         },
         "recipe": {
             "sha256": "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150623.533",
         "deps": []
@@ -692,7 +692,7 @@
         },
         "recipe": {
             "sha256": "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.814",
         "deps": [
@@ -710,7 +710,7 @@
         },
         "recipe": {
             "sha256": "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121104.1302",
         "deps": [
@@ -727,7 +727,7 @@
         },
         "recipe": {
             "sha256": "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150801.1144",
         "deps": []
@@ -742,7 +742,7 @@
         },
         "recipe": {
             "sha256": "11z3svlzvmhdy0pkxbx9qz9bnq056cgkbfyw9z34aq1yxazi2cpq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.351",
         "deps": [
@@ -760,7 +760,7 @@
         },
         "recipe": {
             "sha256": "0b5k2ihbjm5drv4lf64ap31yj873x1fcq85y6yq1ayahn6s52rql",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140121.1143",
         "deps": []
@@ -775,7 +775,7 @@
         },
         "recipe": {
             "sha256": "0ma4rfmgwd6k24jzn6pgk46b88jfix7mz0ib7c7r90h5vmpiq814",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140211.2245",
         "deps": []
@@ -790,7 +790,7 @@
         },
         "recipe": {
             "sha256": "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.839",
         "deps": [
@@ -809,7 +809,7 @@
         },
         "recipe": {
             "sha256": "11n3id1iiip99lj8c0iffbrf59s2yvmwlhqbf8xzxkhws7vwdl5q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140730.1449",
         "deps": []
@@ -824,7 +824,7 @@
         },
         "recipe": {
             "sha256": "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131103.413",
         "deps": []
@@ -839,7 +839,7 @@
         },
         "recipe": {
             "sha256": "07qxm1rkw2cbxf4g2vqk3s7xnqldqkdm2zw1qh2kqjscg5gwpkqp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150919.530",
         "deps": [
@@ -859,7 +859,7 @@
         },
         "recipe": {
             "sha256": "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150913.1933",
         "deps": [
@@ -881,7 +881,7 @@
         },
         "recipe": {
             "sha256": "02pkrxvzrpyjrr2fkxnl1qw06aspzv8jlp2c1piln6zcjd92l3j7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150911.2223",
         "deps": [
@@ -898,7 +898,7 @@
         },
         "recipe": {
             "sha256": "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141229.1329",
         "deps": [
@@ -917,7 +917,7 @@
         },
         "recipe": {
             "sha256": "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131118.426",
         "deps": []
@@ -927,14 +927,14 @@
             "tag": "fetchFromGitHub",
             "owner": "clojure-emacs",
             "repo": "inf-clojure",
-            "sha256": "1vjzykbh9fid490481zr913hzw2vyhzsym44pkqafzm9q27075mc",
-            "rev": "f7948896f05e4e35a6aba97bd3c7e330f416e548"
+            "sha256": "1b1w999gsz2w7djc46pcxchqzpkwvqg3cfsh3j8mhb1rvmh33m7a",
+            "rev": "54fe6de266db1bbdaa634ce7680ea8733971335c"
         },
         "recipe": {
             "sha256": "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151129.234",
+        "version": "20151224.1407",
         "deps": [
             "clojure-mode",
             "emacs"
@@ -950,7 +950,7 @@
         },
         "recipe": {
             "sha256": "1cmpd303chldss7kylpinv8qc3c78srz02a9cp9x79c8arq7apwl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140209.1235",
         "deps": [
@@ -968,7 +968,7 @@
         },
         "recipe": {
             "sha256": "13448bykmy0jqcajhn2gjiar3m8cingyr8394vxybp2m1zvv0pws",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140406.2019",
         "deps": [
@@ -985,7 +985,7 @@
         },
         "recipe": {
             "sha256": "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150408.506",
         "deps": [
@@ -1002,7 +1002,7 @@
         },
         "recipe": {
             "sha256": "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.830",
         "deps": [
@@ -1019,7 +1019,7 @@
         },
         "recipe": {
             "sha256": "0jhsm31zcfwkbpsdh1lvmjm1fv2m7y849930sjvf5nxv3ffhx3b4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.2337",
         "deps": [
@@ -1037,7 +1037,7 @@
         },
         "recipe": {
             "sha256": "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140702.1009",
         "deps": []
@@ -1052,7 +1052,7 @@
         },
         "recipe": {
             "sha256": "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150202.1143",
         "deps": [
@@ -1069,7 +1069,7 @@
         },
         "recipe": {
             "sha256": "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130522.1603",
         "deps": [
@@ -1086,7 +1086,7 @@
         },
         "recipe": {
             "sha256": "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150614.246",
         "deps": []
@@ -1101,7 +1101,7 @@
         },
         "recipe": {
             "sha256": "1yqbzmmazamgf8fi8ipq14ffm8h1pp5d2lkflbxjsagdq61hirxm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150101.910",
         "deps": [
@@ -1118,7 +1118,7 @@
         },
         "recipe": {
             "sha256": "0m6hc2amwnnii4y189kkridhapl9jipkmadvrmwvspgy3lxhlafs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150225.242",
         "deps": [
@@ -1135,7 +1135,7 @@
         },
         "recipe": {
             "sha256": "0lfhving19wcfr40gjb2gnginiz8cncixiyyxhwx08lm84qb3a7p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131117.1111",
         "deps": [
@@ -1152,7 +1152,7 @@
         },
         "recipe": {
             "sha256": "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150901.450",
         "deps": [
@@ -1170,7 +1170,7 @@
         },
         "recipe": {
             "sha256": "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151103.412",
         "deps": [
@@ -1190,7 +1190,7 @@
         },
         "recipe": {
             "sha256": "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151110.2246",
         "deps": [
@@ -1207,7 +1207,7 @@
         },
         "recipe": {
             "sha256": "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150716.802",
         "deps": [
@@ -1225,7 +1225,7 @@
         },
         "recipe": {
             "sha256": "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150812.347",
         "deps": [
@@ -1243,7 +1243,7 @@
         },
         "recipe": {
             "sha256": "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1751",
         "deps": []
@@ -1258,7 +1258,7 @@
         },
         "recipe": {
             "sha256": "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131019.2358",
         "deps": []
@@ -1273,7 +1273,7 @@
         },
         "recipe": {
             "sha256": "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151006.432",
         "deps": [
@@ -1290,7 +1290,7 @@
         },
         "recipe": {
             "sha256": "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151113.224",
         "deps": [
@@ -1307,7 +1307,7 @@
         },
         "recipe": {
             "sha256": "10gdlz4l9iqw1zdlk5i3knysn36iqxdh3xabjq8kq04jkl7i36dl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140627.307",
         "deps": []
@@ -1322,7 +1322,7 @@
         },
         "recipe": {
             "sha256": "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140829.738",
         "deps": []
@@ -1337,7 +1337,7 @@
         },
         "recipe": {
             "sha256": "0m0pi2qjis9p6z9cd8hlxm1r88ynwmd2ks8wg65sffffwsdbg4kz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130615.1633",
         "deps": []
@@ -1352,7 +1352,7 @@
         },
         "recipe": {
             "sha256": "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151004.1155",
         "deps": [
@@ -1369,7 +1369,7 @@
         },
         "recipe": {
             "sha256": "14drqwcp9nv269aqm34d426a7gx1a7kr9ygnqa2c8ia1fsizybl3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140805.505",
         "deps": []
@@ -1379,17 +1379,18 @@
             "tag": "fetchFromGitHub",
             "owner": "emacs-pe",
             "repo": "jist.el",
-            "sha256": "0irfqrga1hzi8g1bji5mq01z63sp0dqnd8nf0jkf02vgaagrhdc8",
-            "rev": "9e0f37812eb5a215518d9b2beb089ef9e1c28950"
+            "sha256": "0c53awaf93pxc8fn1wf6gkd46x1c0q98ygssz8gflp0a88fmm78g",
+            "rev": "6f36b550b65083ac4a6e824382891518b578e9f3"
         },
         "recipe": {
             "sha256": "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150927.1318",
+        "version": "20151221.1752",
         "deps": [
-            "cl-lib",
+            "dash",
             "emacs",
+            "let-alist",
             "magit",
             "pkg-info",
             "request"
@@ -1405,7 +1406,7 @@
         },
         "recipe": {
             "sha256": "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.154",
         "deps": []
@@ -1419,7 +1420,7 @@
         },
         "recipe": {
             "sha256": "07s4gja1w8piabkajbzrgq77mkdkxr0jy9bmy2qb9w2svfsyns9b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120510.1430",
         "deps": []
@@ -1434,7 +1435,7 @@
         },
         "recipe": {
             "sha256": "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150630.916",
         "deps": [
@@ -1451,7 +1452,7 @@
         },
         "recipe": {
             "sha256": "195wcfn434yp0p93zqih1snkkg1v7nxgb4gn0klajahmyrrjq2a2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.1350",
         "deps": []
@@ -1466,7 +1467,7 @@
         },
         "recipe": {
             "sha256": "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140603.2331",
         "deps": [
@@ -1485,7 +1486,7 @@
         },
         "recipe": {
             "sha256": "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.1523",
         "deps": [
@@ -1505,7 +1506,7 @@
         },
         "recipe": {
             "sha256": "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151029.707",
         "deps": [
@@ -1526,11 +1527,28 @@
         },
         "recipe": {
             "sha256": "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -1541,7 +1559,7 @@
         },
         "recipe": {
             "sha256": "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150501.610",
         "deps": []
@@ -1556,7 +1574,7 @@
         },
         "recipe": {
             "sha256": "0y9ji3c8kndrz605n7b4w5xq0qp093d61hxwhblm3qrh3370mws7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150827.1840",
         "deps": []
@@ -1571,7 +1589,7 @@
         },
         "recipe": {
             "sha256": "1szgirakfnkn9ksls16p233sr7x9ck5m1f1kbk6ancj36yja2nki",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.2352",
         "deps": [
@@ -1589,7 +1607,7 @@
         },
         "recipe": {
             "sha256": "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.341",
         "deps": []
@@ -1604,7 +1622,7 @@
         },
         "recipe": {
             "sha256": "0kbfj2l1rcv74c88nabkwkcl7k9pkim835l24q61zv3i6wf9sykf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130720.849",
         "deps": []
@@ -1619,7 +1637,7 @@
         },
         "recipe": {
             "sha256": "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100510.2305",
         "deps": []
@@ -1634,7 +1652,7 @@
         },
         "recipe": {
             "sha256": "1hxrvyq8my5886q7wj5w3mhyja7d6cf19gyclap492ci7kmrkdk2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130828.1144",
         "deps": []
@@ -1649,7 +1667,7 @@
         },
         "recipe": {
             "sha256": "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150516.919",
         "deps": [
@@ -1666,7 +1684,7 @@
         },
         "recipe": {
             "sha256": "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.905",
         "deps": [
@@ -1686,7 +1704,7 @@
         },
         "recipe": {
             "sha256": "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150815.1032",
         "deps": []
@@ -1699,7 +1717,7 @@
         },
         "recipe": {
             "sha256": "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121026.950",
         "deps": []
@@ -1714,7 +1732,7 @@
         },
         "recipe": {
             "sha256": "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151010.936",
         "deps": []
@@ -1729,7 +1747,7 @@
         },
         "recipe": {
             "sha256": "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150603.1636",
         "deps": []
@@ -1744,7 +1762,7 @@
         },
         "recipe": {
             "sha256": "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140227.929",
         "deps": [
@@ -1761,7 +1779,7 @@
         },
         "recipe": {
             "sha256": "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130421.1434",
         "deps": []
@@ -1776,7 +1794,7 @@
         },
         "recipe": {
             "sha256": "0l9mb7g3xzasna1bw2p7vh2wdg1hmjkff40p8kpqvwwzszdm9v76",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150413.1518",
         "deps": []
@@ -1791,7 +1809,7 @@
         },
         "recipe": {
             "sha256": "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151014.1530",
         "deps": [
@@ -1810,7 +1828,7 @@
         },
         "recipe": {
             "sha256": "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150314.802",
         "deps": [
@@ -1828,7 +1846,7 @@
         },
         "recipe": {
             "sha256": "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141219.2357",
         "deps": [
@@ -1846,7 +1864,7 @@
         },
         "recipe": {
             "sha256": "0wgbm6qxqkpsbzj9wccicsphajaii07dl27b8x2vidsyw6ambj5h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141221.249",
         "deps": []
@@ -1859,7 +1877,7 @@
         },
         "recipe": {
             "sha256": "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1616",
         "deps": []
@@ -1874,7 +1892,7 @@
         },
         "recipe": {
             "sha256": "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140301.802",
         "deps": []
@@ -1889,7 +1907,7 @@
         },
         "recipe": {
             "sha256": "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151008.212",
         "deps": [
@@ -1906,7 +1924,7 @@
         },
         "recipe": {
             "sha256": "0sn8y57895bfpgiynnj4m9b3x3dbb9v5fwkcwmf9jr39dbf98v6s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140104.1607",
         "deps": []
@@ -1916,14 +1934,14 @@
             "tag": "fetchFromGitHub",
             "owner": "emacs-helm",
             "repo": "helm",
-            "sha256": "1dsipz9qz3bsmgj49z42vfs3ggdv37jcn852hffwjyzlhalwpi8i",
-            "rev": "e42e3ed6543b72756e6f2f1a96cbd0d35166cb6e"
+            "sha256": "0l7dzk4xa4nfyj943x4gqcn1brfznfyrdxfwf1v097fp4ix8654q",
+            "rev": "e6fbd80f9f21e7cdb5d530f7aba138ad1dc527ab"
         },
         "recipe": {
             "sha256": "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.1416",
+        "version": "20151224.1416",
         "deps": [
             "async",
             "cl-lib",
@@ -1941,7 +1959,7 @@
         },
         "recipe": {
             "sha256": "1g6xry2y6396pg7rg8hc0l84z5r3j2df7dpd1jgffxa8xa3i661f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151026.1112",
         "deps": [
@@ -1958,7 +1976,7 @@
         },
         "recipe": {
             "sha256": "1id1l473azmc9hm5vq5wba8gad9np7sv38x94qd2zkf8b78pzkbw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151023.1503",
         "deps": []
@@ -1973,7 +1991,7 @@
         },
         "recipe": {
             "sha256": "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.2136",
         "deps": [
@@ -1990,7 +2008,7 @@
         },
         "recipe": {
             "sha256": "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.1059",
         "deps": []
@@ -2005,7 +2023,7 @@
         },
         "recipe": {
             "sha256": "1jia80sqmm83kzjcf1h1d9iz2k4k9albzvfka5hx6hpa4h8nm5q4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151102.843",
         "deps": [
@@ -2024,7 +2042,7 @@
         },
         "recipe": {
             "sha256": "0i2d2gyzzvpr5qm2cqzbn9my21lfb66315hg9fj86ac5pkc25zrd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150120.1240",
         "deps": []
@@ -2039,7 +2057,7 @@
         },
         "recipe": {
             "sha256": "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150329.523",
         "deps": [
@@ -2057,7 +2075,7 @@
         },
         "recipe": {
             "sha256": "0kl1psykx7akxwabszk4amszh3zil8ia4bfbjjvr6h9phgx66pb0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.102",
         "deps": [
@@ -2073,7 +2091,7 @@
         },
         "recipe": {
             "sha256": "11ddkfddmsy26mmhgw24757f753ssh056v9vxn89pxp4qypxidfz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20090723.1019",
         "deps": []
@@ -2088,7 +2106,7 @@
         },
         "recipe": {
             "sha256": "0rb1cr7zrfl1s5prxy3xwdqgnm8ddw33pcvk049km2qbccb08v6a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140106.1939",
         "deps": [
@@ -2107,7 +2125,7 @@
         },
         "recipe": {
             "sha256": "1w9zxy6jwiln28cmdgkbbdfk3pdscqlfahrqi6lbgpjvkw9z44mb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131014.1707",
         "deps": [
@@ -2125,7 +2143,7 @@
         },
         "recipe": {
             "sha256": "0izxhivhmv49dja4wy9n0ipd41xdzdza2ql7pfa7ny35ji5hskik",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.102",
         "deps": [
@@ -2140,7 +2158,7 @@
         },
         "recipe": {
             "sha256": "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.659",
         "deps": []
@@ -2154,8 +2172,8 @@
             "rev": "21248bd852c9520ec27692f286c5f43b50892b12"
         },
         "recipe": {
-            "sha256": "034gnxmcdn1f9b08gs9r8ycbam4212ip1z4kmmpwgpl9zcq9z5kj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.222",
         "deps": [
@@ -2174,7 +2192,7 @@
         },
         "recipe": {
             "sha256": "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150830.1315",
         "deps": []
@@ -2189,7 +2207,7 @@
         },
         "recipe": {
             "sha256": "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.305",
         "deps": [
@@ -2207,7 +2225,7 @@
         },
         "recipe": {
             "sha256": "0yrwvahv4l2s1aavy6y6mjlrw8l11i00a249825ab5yaxrkzz7xc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150426.749",
         "deps": [
@@ -2224,7 +2242,7 @@
         },
         "recipe": {
             "sha256": "0vwv8cv38gx8rnfskbmnaf8y8sffjqy1408655bwhjz6dp69qmah",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151125.15",
         "deps": [
@@ -2247,7 +2265,7 @@
         },
         "recipe": {
             "sha256": "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150805.1448",
         "deps": []
@@ -2262,7 +2280,7 @@
         },
         "recipe": {
             "sha256": "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150101.918",
         "deps": []
@@ -2277,7 +2295,7 @@
         },
         "recipe": {
             "sha256": "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151016.2353",
         "deps": [
@@ -2294,7 +2312,7 @@
         },
         "recipe": {
             "sha256": "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.523",
         "deps": [
@@ -2311,7 +2329,7 @@
         },
         "recipe": {
             "sha256": "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121224.2049",
         "deps": []
@@ -2326,7 +2344,7 @@
         },
         "recipe": {
             "sha256": "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150812.205",
         "deps": []
@@ -2341,7 +2359,7 @@
         },
         "recipe": {
             "sha256": "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140329.1629",
         "deps": [
@@ -2358,7 +2376,7 @@
         },
         "recipe": {
             "sha256": "1bcvxf62bfi5lmhprma9rh670kka9p9ygbkgmv6dg6ajjfsplgwc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150903.903",
         "deps": [
@@ -2378,7 +2396,7 @@
         },
         "recipe": {
             "sha256": "1wdnia9q42x7vky3ks555iic5s50g4mx7ss5ppaljvgxvbxyxqh1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140227.2236",
         "deps": []
@@ -2391,7 +2409,7 @@
         },
         "recipe": {
             "sha256": "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130328.633",
         "deps": []
@@ -2406,7 +2424,7 @@
         },
         "recipe": {
             "sha256": "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150701.1015",
         "deps": []
@@ -2421,7 +2439,7 @@
         },
         "recipe": {
             "sha256": "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151116.933",
         "deps": [
@@ -2440,7 +2458,7 @@
         },
         "recipe": {
             "sha256": "06nfibw01ijv7nr0m142y80jbbpg9kk1dh19s5wq7i6fqf7g08xg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130131.1302",
         "deps": [
@@ -2458,7 +2476,7 @@
         },
         "recipe": {
             "sha256": "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151205.1425",
         "deps": []
@@ -2473,7 +2491,7 @@
         },
         "recipe": {
             "sha256": "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150913.908",
         "deps": [
@@ -2491,7 +2509,7 @@
         },
         "recipe": {
             "sha256": "1rzlsf08nmc3p3vhpwbiy8cgnnl2c10xrnsr2rlpv0g2kxkrd69r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151128.941",
         "deps": []
@@ -2506,7 +2524,7 @@
         },
         "recipe": {
             "sha256": "0gcr0xdi89nj3854v2z3nndfgazmcdzmd6wdndl0i4s7pdfl96fa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140906.642",
         "deps": [
@@ -2524,7 +2542,7 @@
         },
         "recipe": {
             "sha256": "1vfqv71j47fn53klz3jl8r8hscywd01kkl4w96a308sac3lhbrps",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150309.129",
         "deps": [
@@ -2542,7 +2560,7 @@
         },
         "recipe": {
             "sha256": "05jjw9z6hqln9yj8ya2xrmjnylp7psfdj9206n30m3lwnlwx399v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140614.335",
         "deps": [
@@ -2559,7 +2577,7 @@
         },
         "recipe": {
             "sha256": "1a52qm0jrcvvpb01blr5l7apaxqn4bvhkgha53cr48rdkmmq318g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150516.1538",
         "deps": []
@@ -2574,7 +2592,7 @@
         },
         "recipe": {
             "sha256": "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151114.959",
         "deps": [
@@ -2593,7 +2611,7 @@
         },
         "recipe": {
             "sha256": "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": []
@@ -2602,15 +2620,15 @@
         "fetch": {
             "tag": "fetchFromGitHub",
             "owner": "bbatsov",
-            "repo": "projectile",
-            "sha256": "01mwciy9bacx5vkxckp0hsxx0s00qss48kkcc2rhlypdcmmawvn7",
-            "rev": "05058b1c73799b07003ad0978f5ba9a231783be4"
+            "repo": "persp-projectile",
+            "sha256": "0b9hz253m6d58dwsjsk9d1fw0ql33m9wfvyx10ncsqbr0j0s98k5",
+            "rev": "83e03b1284ea36f37a24571abd6442a267408360"
         },
         "recipe": {
-            "sha256": "0bqq13rr1hc7rhmw37rbrwaz9flcv3hw3hx0k5b7y9zd3qndy2cj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150405.327",
+        "version": "20151220.630",
         "deps": [
             "cl-lib",
             "perspective",
@@ -2627,7 +2645,7 @@
         },
         "recipe": {
             "sha256": "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150613.417",
         "deps": []
@@ -2642,7 +2660,7 @@
         },
         "recipe": {
             "sha256": "0njslpgdcph3p3gamrbd6pc04szks07yv4ij3p1l7p5dc2p06rs6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141021.1322",
         "deps": []
@@ -2657,7 +2675,7 @@
         },
         "recipe": {
             "sha256": "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151116.1848",
         "deps": [
@@ -2674,7 +2692,7 @@
         },
         "recipe": {
             "sha256": "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.719",
         "deps": [
@@ -2686,14 +2704,14 @@
             "tag": "fetchFromGitHub",
             "owner": "kazu-yamamoto",
             "repo": "ghc-mod",
-            "sha256": "0s3d2h0fhsli2bq6q6kfaf8gng1wfff6rr1ms6smpg1sxd3k783n",
-            "rev": "2988749b844136148bdd35f239d3f4747813b821"
+            "sha256": "0ig6f0wfkcm1jfl3khsik0ggr3gypvvn8c3r3n1kgmy5s72r98cn",
+            "rev": "41b9c0bbf249d763f617dcdc052c49d5b7c98987"
         },
         "recipe": {
             "sha256": "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151211.1843",
+        "version": "20151220.455",
         "deps": [
             "haskell-mode"
         ]
@@ -2708,7 +2726,7 @@
         },
         "recipe": {
             "sha256": "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141023.337",
         "deps": []
@@ -2723,7 +2741,7 @@
         },
         "recipe": {
             "sha256": "011sc6f0ka7mmik8z0df8qk24mf6ygq22jy781f2ikhjh94gy83d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130414.221",
         "deps": [
@@ -2740,7 +2758,7 @@
         },
         "recipe": {
             "sha256": "0lgw1knqppdg046zqx4m7nbzvsasr89wa9i4594hf46w1094dabj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151118.221",
         "deps": []
@@ -2755,7 +2773,7 @@
         },
         "recipe": {
             "sha256": "0bn81yzijmnfg5xcnvcvxvqxz995iaafhgbfckgcal974s229kd2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151024.37",
         "deps": [
@@ -2772,7 +2790,7 @@
         },
         "recipe": {
             "sha256": "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141203.2359",
         "deps": [
@@ -2789,7 +2807,7 @@
         },
         "recipe": {
             "sha256": "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140111.1601",
         "deps": []
@@ -2804,7 +2822,7 @@
         },
         "recipe": {
             "sha256": "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150412.941",
         "deps": [
@@ -2819,7 +2837,7 @@
         },
         "recipe": {
             "sha256": "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120509.605",
         "deps": []
@@ -2834,7 +2852,7 @@
         },
         "recipe": {
             "sha256": "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150516.348",
         "deps": [
@@ -2851,7 +2869,7 @@
         },
         "recipe": {
             "sha256": "1hma8sphxk95m25s56adgyk7d4blsc02gq5a7vw1pawwvxm2qlz3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151117.31",
         "deps": []
@@ -2864,7 +2882,7 @@
         },
         "recipe": {
             "sha256": "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150727.1554",
         "deps": [
@@ -2882,8 +2900,8 @@
             "rev": "38"
         },
         "recipe": {
-            "sha256": "17ccj602cp0lrs30rcp45g7fqb7k1l1hr9h8z4gh7rqs0n7z1jad",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110926.1118",
         "deps": [
@@ -2900,7 +2918,7 @@
         },
         "recipe": {
             "sha256": "0h2zjfj9hy7bkpmmjjs0a4a06asbw0yww8mw9rk2xi1gc2aqq4hi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151209.415",
         "deps": [
@@ -2918,7 +2936,7 @@
         },
         "recipe": {
             "sha256": "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150930.1234",
         "deps": [
@@ -2935,7 +2953,7 @@
         },
         "recipe": {
             "sha256": "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20090621.832",
         "deps": []
@@ -2948,7 +2966,7 @@
         },
         "recipe": {
             "sha256": "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1602",
         "deps": []
@@ -2963,7 +2981,7 @@
         },
         "recipe": {
             "sha256": "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.2050",
         "deps": [
@@ -2981,7 +2999,7 @@
         },
         "recipe": {
             "sha256": "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151105.2106",
         "deps": []
@@ -2991,14 +3009,14 @@
             "tag": "fetchFromGitHub",
             "owner": "greghendershott",
             "repo": "racket-mode",
-            "sha256": "0yshyfgdvpys38iqi4jqxa40gvwhc79njp0gq25n036kzarwjch8",
-            "rev": "f5f7ffea9b0be0d792b81d1ec1e2c16271a35cdd"
+            "sha256": "0xjdf0zw8faf5ya7nsv8m6qiicwz268rb2y1z5ijknjhsjp2bwi6",
+            "rev": "ffb9904d4d9d69c69900151f96cb4d4a08657720"
         },
         "recipe": {
             "sha256": "04sr55zrgwyi48sj4ssm4rmm327yxs7hvjhxclnkhaaigrmrv7jb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151207.2152",
+        "version": "20151218.2014",
         "deps": [
             "emacs",
             "faceup",
@@ -3015,7 +3033,7 @@
         },
         "recipe": {
             "sha256": "1n43lwflxzzyskxgzg19rg3hiqqkf5l7vfgaydryf4sk8480x687",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150223.1834",
         "deps": [
@@ -3033,7 +3051,7 @@
         },
         "recipe": {
             "sha256": "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.301",
         "deps": [
@@ -3046,12 +3064,12 @@
             "tag": "fetchFromGitHub",
             "owner": "jwiegley",
             "repo": "use-package",
-            "sha256": "14v6wzqn2jhjdbr7nwqilxy9l79m1f2rdrz2c6c6pcla5yjpd1k0",
-            "rev": "77a77c8b03044f0279e00cadd6a6d1a7ae97b016"
+            "sha256": "1kng5yzm73gz67znifjhzrr2zbcc7cyb2f1j703hmf33zb9naqhp",
+            "rev": "1d7e6ff5b73761c3b7180530da8bc433338d0cec"
         },
         "recipe": {
             "sha256": "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151112.1639",
         "deps": [
@@ -3068,7 +3086,7 @@
         },
         "recipe": {
             "sha256": "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141219.120",
         "deps": []
@@ -3083,7 +3101,7 @@
         },
         "recipe": {
             "sha256": "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141225.930",
         "deps": [
@@ -3100,7 +3118,7 @@
         },
         "recipe": {
             "sha256": "09h0cjqjwhqychyrdv1hmiyak677vgf1b94392sdsq3ns70zyjk7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141109.1956",
         "deps": [
@@ -3117,7 +3135,7 @@
         },
         "recipe": {
             "sha256": "09siqsip6d2h3jrxbdbhylkqm42dx3d2dqlkkdw3a81c7ga9lpwm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20091203.1222",
         "deps": []
@@ -3132,7 +3150,7 @@
         },
         "recipe": {
             "sha256": "0riiim6qb6x9g5hz0k3qgdymgikynlb9l07mrbfmybkv4919p992",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.848",
         "deps": []
@@ -3147,7 +3165,7 @@
         },
         "recipe": {
             "sha256": "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.1959",
         "deps": []
@@ -3162,7 +3180,7 @@
         },
         "recipe": {
             "sha256": "1rgqiscbizalh78jwc53zbj599dd13a6vzdgf75vzllc1w7jsg6d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.1141",
         "deps": [
@@ -3180,7 +3198,7 @@
         },
         "recipe": {
             "sha256": "06p5s5agajbm9vg9xxpzv817xmjw2kmcahiw4iypn5yzwhv1aykl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131001.2318",
         "deps": []
@@ -3195,7 +3213,7 @@
         },
         "recipe": {
             "sha256": "080cvgl2cg08kyvmgg080zqb6k6bngga3m5lfwb2dpmi1bajywc1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141004.1752",
         "deps": [
@@ -3212,7 +3230,7 @@
         },
         "recipe": {
             "sha256": "0nafqgb4kf8jgrb7ijfcvigq8kf043ki89h61izda4hccm3c42pk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131215.719",
         "deps": []
@@ -3227,7 +3245,7 @@
         },
         "recipe": {
             "sha256": "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131229.2051",
         "deps": [
@@ -3244,7 +3262,7 @@
         },
         "recipe": {
             "sha256": "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150126.603",
         "deps": [
@@ -3262,7 +3280,7 @@
         },
         "recipe": {
             "sha256": "1ci82fj3layd95lqj2w40y87xps6bs7x05z8ai9m59k244g26m8v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150223.1015",
         "deps": [
@@ -3277,7 +3295,7 @@
         },
         "recipe": {
             "sha256": "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1508",
         "deps": [
@@ -3294,7 +3312,7 @@
         },
         "recipe": {
             "sha256": "10ji7xd9ipmy6c2qxljqdxgqf5sb8h7lwz43mr6ixbn7v1b7pp6w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131023.1213",
         "deps": []
@@ -3309,7 +3327,7 @@
         },
         "recipe": {
             "sha256": "164dhlsiflhpdymk3q5x0bv8gpbwfp34lnkhm2x90kdakfzqf91p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150324.1725",
         "deps": []
@@ -3324,7 +3342,7 @@
         },
         "recipe": {
             "sha256": "1kjzq02pddnkia637xz2mnjjyglyh6qzragnf7nnxbw9ayiim58i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140211.1426",
         "deps": []
@@ -3339,7 +3357,7 @@
         },
         "recipe": {
             "sha256": "0579sv77dyzishhcw4xxi444inwy4jgh9vmxwd856nd05j3cyc7z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150904.1334",
         "deps": [
@@ -3356,7 +3374,7 @@
         },
         "recipe": {
             "sha256": "1bk73zawl1922aq739r3rz30flxd6nq87k8ahzbix139g7gxf19j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150125.441",
         "deps": []
@@ -3371,7 +3389,7 @@
         },
         "recipe": {
             "sha256": "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131015.835",
         "deps": [
@@ -3389,7 +3407,7 @@
         },
         "recipe": {
             "sha256": "1ilsn657mpl7v8vkbzqf3gp0gmvy0dgynfsn8w4cb49qaiy337xc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140314.628",
         "deps": []
@@ -3404,7 +3422,7 @@
         },
         "recipe": {
             "sha256": "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150108.2319",
         "deps": [
@@ -3422,7 +3440,7 @@
         },
         "recipe": {
             "sha256": "0yvzq1z2nrldr8vhcvxqgzvh4gbrjjwfmprg59p4v5hlxvhxsb1y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150315.723",
         "deps": []
@@ -3437,7 +3455,7 @@
         },
         "recipe": {
             "sha256": "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151204.2012",
         "deps": [
@@ -3454,7 +3472,7 @@
         },
         "recipe": {
             "sha256": "1rv1ybmbjx7n3cavx21nzmvckw63q3jmjsfdr2pcgavrr2ck6lka",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140410.1522",
         "deps": []
@@ -3469,7 +3487,7 @@
         },
         "recipe": {
             "sha256": "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150114.1004",
         "deps": []
@@ -3484,7 +3502,7 @@
         },
         "recipe": {
             "sha256": "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150831.716",
         "deps": [
@@ -3502,7 +3520,7 @@
         },
         "recipe": {
             "sha256": "11h7kbkf38p2xycw8hvabpaacp72xdgy8c7kzcgjb2a8qlbs5ifm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150911.758",
         "deps": []
@@ -3517,7 +3535,7 @@
         },
         "recipe": {
             "sha256": "1z2y6933f05yv9y2aapmn876jnsydh642zqid3j88bb9kqi67x0h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.134",
         "deps": [
@@ -3536,7 +3554,7 @@
         },
         "recipe": {
             "sha256": "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150807.2148",
         "deps": []
@@ -3549,7 +3567,7 @@
         },
         "recipe": {
             "sha256": "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151107.1047",
         "deps": []
@@ -3562,7 +3580,7 @@
         },
         "recipe": {
             "sha256": "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.700",
         "deps": []
@@ -3577,7 +3595,7 @@
         },
         "recipe": {
             "sha256": "1kq2h0lb521z8q2xb9bsi37xzzdsa0hw4mm3qkzidi5j9fi3apf1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150121.1646",
         "deps": [
@@ -3594,7 +3612,7 @@
         },
         "recipe": {
             "sha256": "0q1bh316v737a0hm9afijk1spvg144cgrf45jm0bpd60zhiv7bb2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130513.251",
         "deps": [
@@ -3609,7 +3627,7 @@
         },
         "recipe": {
             "sha256": "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120608.1335",
         "deps": []
@@ -3624,7 +3642,7 @@
         },
         "recipe": {
             "sha256": "1ad8q81n0s13cwmm216wqx3s92195pda1amc4wxvpb3lq7dbd3yn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130509.1255",
         "deps": []
@@ -3639,7 +3657,7 @@
         },
         "recipe": {
             "sha256": "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150617.831",
         "deps": [
@@ -3657,7 +3675,7 @@
         },
         "recipe": {
             "sha256": "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140504.357",
         "deps": [
@@ -3674,7 +3692,7 @@
         },
         "recipe": {
             "sha256": "1gnvakp71l25r48bx1n2j33dq8q1lc7ff1j4fcnnvblhh3rsra96",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150108.1815",
         "deps": []
@@ -3689,7 +3707,7 @@
         },
         "recipe": {
             "sha256": "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.924",
         "deps": [
@@ -3708,7 +3726,7 @@
         },
         "recipe": {
             "sha256": "1la1nrfns9j6wii6lriwwsd44cx3ksyhh09h8lf9dai6wp67kjac",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150819.839",
         "deps": [
@@ -3728,7 +3746,7 @@
         },
         "recipe": {
             "sha256": "1rzvxnaqh8bm78qp0rhpqs971pc855qrq589r3s8z3gpqzmwlnmf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131014.1621",
         "deps": [
@@ -3746,7 +3764,7 @@
         },
         "recipe": {
             "sha256": "0q7mw1npxq24szhwswc93qz5h6magcxw63ymba7hwhif6my65zx7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130524.609",
         "deps": []
@@ -3761,7 +3779,7 @@
         },
         "recipe": {
             "sha256": "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150315.800",
         "deps": []
@@ -3776,7 +3794,7 @@
         },
         "recipe": {
             "sha256": "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150422.1039",
         "deps": []
@@ -3791,7 +3809,7 @@
         },
         "recipe": {
             "sha256": "02hz9k4ybpp4i8ik2av9rg240sjgicbf6w24zn67dmw4nc4lp9c5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150723.1304",
         "deps": [
@@ -3808,7 +3826,7 @@
         },
         "recipe": {
             "sha256": "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150826.616",
         "deps": [
@@ -3827,7 +3845,7 @@
         },
         "recipe": {
             "sha256": "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150207.717",
         "deps": []
@@ -3842,7 +3860,7 @@
         },
         "recipe": {
             "sha256": "19k0c7igqsqvib6hx0nssig4l5f959dlr4wijd1hp5h1hmcb5vv8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140109.2146",
         "deps": [
@@ -3859,7 +3877,7 @@
         },
         "recipe": {
             "sha256": "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150217.913",
         "deps": []
@@ -3874,7 +3892,7 @@
         },
         "recipe": {
             "sha256": "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.946",
         "deps": [
@@ -3893,7 +3911,7 @@
         },
         "recipe": {
             "sha256": "14jc98h4r9rb7pxfb60ps4ss8p0bm66wdl6n8z1357hk93h9kmfs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141120.825",
         "deps": [
@@ -3910,7 +3928,7 @@
         },
         "recipe": {
             "sha256": "0x4lssjkj3fk9fw603f0sggvcj25iw0zbzsm5c949lhl4a3wvc9c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150427.1132",
         "deps": []
@@ -3925,7 +3943,7 @@
         },
         "recipe": {
             "sha256": "0kpgizy0zxnlmyh0prwdll62ri2c1l4sb0yrkl7yw17cr4gxmkkz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151202.629",
         "deps": [
@@ -3942,7 +3960,7 @@
         },
         "recipe": {
             "sha256": "0l4xj5q06h5fk634d6v3idm0zniq8grz4rjm6qzi7b4jr9sc60gm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140409.1801",
         "deps": []
@@ -3952,14 +3970,14 @@
             "tag": "fetchFromGitHub",
             "owner": "abo-abo",
             "repo": "lispy",
-            "sha256": "134694ngr01nb8qihyclwc2cd93ipkwjbkmwdflsbi99gv9bkyxj",
-            "rev": "864a4efcc686601855823f0af750fa25f4dc2e8a"
+            "sha256": "0w5wwwffn3dhvdcr54jfh9l4kv99bkf0ck5ryjh165cjjy3y9z28",
+            "rev": "83a670d230d60112337d5b1c92bced20e3f43d1c"
         },
         "recipe": {
             "sha256": "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.555",
+        "version": "20151226.1224",
         "deps": [
             "ace-window",
             "emacs",
@@ -3977,7 +3995,7 @@
         },
         "recipe": {
             "sha256": "08zfqcgs7i2ram2qpy8vrzksx5722aahr66vdi4d9bcxm03s19fm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141228.1605",
         "deps": [
@@ -3994,7 +4012,7 @@
         },
         "recipe": {
             "sha256": "0hdn6zjnhzyka0lzdxqfzbj3lrj767ij406zha9zw8ibbkk7cmag",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151122.412",
         "deps": []
@@ -4009,7 +4027,7 @@
         },
         "recipe": {
             "sha256": "1dcxqnzmvddk61dzmfx8vjbzd8m44lscr3pjdp3r7211zhwfk40n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130526.1215",
         "deps": [
@@ -4027,7 +4045,7 @@
         },
         "recipe": {
             "sha256": "1z5m8ccx2k18gbzqvg0051mp2myy2qncf4xvv47k80f83pk2hw6r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150219.925",
         "deps": []
@@ -4040,7 +4058,7 @@
         },
         "recipe": {
             "sha256": "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1846",
         "deps": []
@@ -4055,7 +4073,7 @@
         },
         "recipe": {
             "sha256": "19kyzpkgfl0ipbcgnl8fbfbapnfdxr8w9i7prfkm6rjp6amxyqab",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150702.1706",
         "deps": [
@@ -4075,7 +4093,7 @@
         },
         "recipe": {
             "sha256": "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150523.1315",
         "deps": [
@@ -4092,7 +4110,7 @@
         },
         "recipe": {
             "sha256": "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150219.301",
         "deps": [
@@ -4109,7 +4127,7 @@
         },
         "recipe": {
             "sha256": "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150716.433",
         "deps": [
@@ -4127,7 +4145,7 @@
         },
         "recipe": {
             "sha256": "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150525.416",
         "deps": [
@@ -4149,11 +4167,28 @@
         },
         "recipe": {
             "sha256": "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -4162,7 +4197,7 @@
         },
         "recipe": {
             "sha256": "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1905",
         "deps": []
@@ -4177,7 +4212,7 @@
         },
         "recipe": {
             "sha256": "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100419.1245",
         "deps": []
@@ -4192,7 +4227,7 @@
         },
         "recipe": {
             "sha256": "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151212.1243",
         "deps": [
@@ -4213,7 +4248,7 @@
         },
         "recipe": {
             "sha256": "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.434",
         "deps": [
@@ -4229,7 +4264,7 @@
         },
         "recipe": {
             "sha256": "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20051013.1256",
         "deps": []
@@ -4244,7 +4279,7 @@
         },
         "recipe": {
             "sha256": "1z2kzbapgh55wwr5jp7v1wz5kpz4l7n3k94mkh3s068xag9xs6zz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140722.1621",
         "deps": [
@@ -4260,7 +4295,7 @@
         },
         "recipe": {
             "sha256": "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1911",
         "deps": []
@@ -4275,7 +4310,7 @@
         },
         "recipe": {
             "sha256": "0a4ksz2jkva4gvhprywjc1fzrbf95xdk8gn25nv1h1c1ckhr91qx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150819.1148",
         "deps": [
@@ -4293,7 +4328,7 @@
         },
         "recipe": {
             "sha256": "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.815",
         "deps": []
@@ -4308,7 +4343,7 @@
         },
         "recipe": {
             "sha256": "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151119.1114",
         "deps": [
@@ -4325,7 +4360,7 @@
         },
         "recipe": {
             "sha256": "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151016.1916",
         "deps": [
@@ -4345,7 +4380,7 @@
         },
         "recipe": {
             "sha256": "0ils4w8ry1inlfj4931ypibj3n60xq6ah74hig62y4vrs4d47gyx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131208.124",
         "deps": [
@@ -4364,7 +4399,7 @@
         },
         "recipe": {
             "sha256": "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130421.500",
         "deps": [
@@ -4377,14 +4412,14 @@
             "tag": "fetchFromGitHub",
             "owner": "jaor",
             "repo": "geiser",
-            "sha256": "0b5rs1w0gcci0b8047n0s2m02khjhs9qsp0yn0jwrg4i46jn0vll",
-            "rev": "d9f6fa2e7458905aa601805352d7a7d9e1037570"
+            "sha256": "1sr053v8vdc4v7prbbz8dbwk84hravpcc3zyfsifghmv999iwrz3",
+            "rev": "8e75455dfbd46355d777c26366e7ccfcb59ace20"
         },
         "recipe": {
             "sha256": "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151213.2122",
+        "version": "20151226.2114",
         "deps": []
     },
     "tup-mode": {
@@ -4397,7 +4432,7 @@
         },
         "recipe": {
             "sha256": "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140410.1114",
         "deps": []
@@ -4412,7 +4447,7 @@
         },
         "recipe": {
             "sha256": "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150625.1333",
         "deps": []
@@ -4425,7 +4460,7 @@
         },
         "recipe": {
             "sha256": "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150723.833",
         "deps": []
@@ -4440,7 +4475,7 @@
         },
         "recipe": {
             "sha256": "0vqb3s1fxkl1fxxspq89344s55sfcplz26z0pbh347l1681h3pci",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130719.1557",
         "deps": [
@@ -4457,7 +4492,7 @@
         },
         "recipe": {
             "sha256": "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151105.541",
         "deps": [
@@ -4474,7 +4509,7 @@
         },
         "recipe": {
             "sha256": "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151125.225",
         "deps": [
@@ -4491,7 +4526,7 @@
         },
         "recipe": {
             "sha256": "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.1347",
         "deps": [
@@ -4509,7 +4544,7 @@
         },
         "recipe": {
             "sha256": "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140906.1708",
         "deps": []
@@ -4524,7 +4559,7 @@
         },
         "recipe": {
             "sha256": "01ks160dfmgh05lx0lmyg020hba8nw49mj51dp1afcsmx4dkis2f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150820.338",
         "deps": [
@@ -4541,7 +4576,7 @@
         },
         "recipe": {
             "sha256": "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130908.1224",
         "deps": []
@@ -4556,7 +4591,7 @@
         },
         "recipe": {
             "sha256": "1n2njf007fmrmsb8zrgxbz1cpxmr5nsp8w41yxa934iqc7qygkjy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150730.1354",
         "deps": [
@@ -4573,7 +4608,7 @@
         },
         "recipe": {
             "sha256": "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150829.711",
         "deps": [
@@ -4590,7 +4625,7 @@
         },
         "recipe": {
             "sha256": "1w51xhiaxk50wlch262dxs2ybjvjj8qzx01xlgiimvggb8h5arlc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20091203.1223",
         "deps": []
@@ -4603,7 +4638,7 @@
         },
         "recipe": {
             "sha256": "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1902",
         "deps": []
@@ -4618,7 +4653,7 @@
         },
         "recipe": {
             "sha256": "0kvpz1r2si94rs1iajn1ffmx7a5bgyjnzri36ajdgd5gcgh41dhy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141106.1551",
         "deps": []
@@ -4633,7 +4668,7 @@
         },
         "recipe": {
             "sha256": "1dp9pxhggappb70m5hyp8sxlnh06y996adabq7x6qvm745mk6f0x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151127.215",
         "deps": []
@@ -4646,7 +4681,7 @@
         },
         "recipe": {
             "sha256": "108jhrdx67chbdd4h824072i2wrn90zdh2hw5vqd4a5svhhf28jj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151029.916",
         "deps": []
@@ -4661,7 +4696,7 @@
         },
         "recipe": {
             "sha256": "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150313.1405",
         "deps": [
@@ -4678,7 +4713,7 @@
         },
         "recipe": {
             "sha256": "0gi8lz2q0vis4nyziykq15jp3m3vykfwycbk6amhf1ybkn9k3ywj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.1011",
         "deps": [
@@ -4693,7 +4728,7 @@
         },
         "recipe": {
             "sha256": "1alfs7k5mydgvzsjmdifcizqgrqjrk2kbh3mabai7nlrwi47w9n2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131117.551",
         "deps": []
@@ -4708,7 +4743,7 @@
         },
         "recipe": {
             "sha256": "1whp9q26sgyf59wygbrvdf9gc94bn4dmhr2f2qivpajx550fjfbc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150402.2209",
         "deps": [
@@ -4725,7 +4760,7 @@
         },
         "recipe": {
             "sha256": "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130509.658",
         "deps": [
@@ -4744,7 +4779,7 @@
         },
         "recipe": {
             "sha256": "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150805.456",
         "deps": []
@@ -4759,7 +4794,7 @@
         },
         "recipe": {
             "sha256": "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150924.2205",
         "deps": []
@@ -4774,7 +4809,7 @@
         },
         "recipe": {
             "sha256": "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140823.939",
         "deps": [
@@ -4791,7 +4826,7 @@
         },
         "recipe": {
             "sha256": "06vzldyqlmfd11g8dqrqh5x244ikfa20qwpsmbgsiry3041k8iw5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.832",
         "deps": []
@@ -4804,7 +4839,7 @@
         },
         "recipe": {
             "sha256": "03x2fqhx4w0c7xd8x8zlnyzdwyay6r2yxf4jzgkcg87q7rqjk9nd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140201.1745",
         "deps": []
@@ -4819,7 +4854,7 @@
         },
         "recipe": {
             "sha256": "0dwr8iyq62ad5xkh7r4kpywpypdq1wljsdzwqbq9zdr79yfqx337",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140423.832",
         "deps": []
@@ -4834,7 +4869,7 @@
         },
         "recipe": {
             "sha256": "198q511hixvzc13b3ih89xs9g47rdvbiixn5baqakpmpx3a12hz4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100210.952",
         "deps": []
@@ -4849,7 +4884,7 @@
         },
         "recipe": {
             "sha256": "0rp33945xk5d986brganqnn55psmlkj6glbimxakhgv9a1r85sxz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120910.411",
         "deps": []
@@ -4864,7 +4899,7 @@
         },
         "recipe": {
             "sha256": "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150220.505",
         "deps": [
@@ -4881,7 +4916,7 @@
         },
         "recipe": {
             "sha256": "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150430.44",
         "deps": [
@@ -4898,7 +4933,7 @@
         },
         "recipe": {
             "sha256": "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141005.613",
         "deps": [
@@ -4917,7 +4952,7 @@
         },
         "recipe": {
             "sha256": "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150216.1542",
         "deps": []
@@ -4932,7 +4967,7 @@
         },
         "recipe": {
             "sha256": "1slcjk2avybr4v9s7gglizmaxbb3yqg6s6gdbg12m3vvj3b72lfi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150204.452",
         "deps": [
@@ -4950,7 +4985,7 @@
         },
         "recipe": {
             "sha256": "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151116.642",
         "deps": [
@@ -4966,14 +5001,14 @@
             "tag": "fetchFromGitHub",
             "owner": "xcwen",
             "repo": "ac-php",
-            "sha256": "1rpp6njgqpi7sq4iyh65glhnbfw414w7srz90whadhkz5pzawr7z",
-            "rev": "1f606698934a7d60d0d60f6f15240a2bf78c8b9f"
+            "sha256": "0gvb3bwp4nk8xxjhv17ss0f1pbdl20rhkah83x267ckksz534mh1",
+            "rev": "e574960b27000ed9b15b43bc15809d269e87d4fd"
         },
         "recipe": {
             "sha256": "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151209.2128",
+        "version": "20151224.2322",
         "deps": [
             "auto-complete",
             "company",
@@ -4992,14 +5027,14 @@
             "tag": "fetchFromGitHub",
             "owner": "masutaka",
             "repo": "emacs-helm-ghq",
-            "sha256": "0amdm0jcg5dxjfiid7q0llr2hffp02l0b0n5yhix8razvi7bhy2z",
-            "rev": "15621d1b2cd37c2ff0f73666c38acf7aae46bbc4"
+            "sha256": "0rlk9016rxj292kpxrnqgrm4xsjs4m4gk2fwh8z3fcihi013lxaw",
+            "rev": "2997646b2fb5421ab435b772dd2dbaeb92d70166"
         },
         "recipe": {
             "sha256": "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151115.512",
+        "version": "20151221.623",
         "deps": [
             "helm"
         ]
@@ -5013,7 +5048,7 @@
         },
         "recipe": {
             "sha256": "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151205.1359",
         "deps": []
@@ -5028,7 +5063,7 @@
         },
         "recipe": {
             "sha256": "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.1243",
         "deps": []
@@ -5043,7 +5078,7 @@
         },
         "recipe": {
             "sha256": "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151115.143",
         "deps": [
@@ -5061,7 +5096,7 @@
         },
         "recipe": {
             "sha256": "1ylnc3s4ixvnqn7g2p6nzz8x29ggqc703waci430f1rp1lsd3q09",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150202.1651",
         "deps": []
@@ -5076,7 +5111,7 @@
         },
         "recipe": {
             "sha256": "1f079q3ccrr4drk2hvn4xs4vbrd3hg87xqbk3r9mmjvkagd1v7rf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150124.2123",
         "deps": []
@@ -5086,14 +5121,14 @@
             "tag": "fetchFromGitHub",
             "owner": "syohex",
             "repo": "emacs-helm-gtags",
-            "sha256": "0gd158ymj0rpm3qmz17ky4lfhvw15cnq0xvhg6q1imjjay2md62q",
-            "rev": "9131a1439860198d51a9dfa6955c586da4bb60bd"
+            "sha256": "01l8d282jr191dak8zijqf5j12svp5rwnlqampnd2xdy39lw3800",
+            "rev": "28875c7b72798c357aa40d78a6a2d969b78e183a"
         },
         "recipe": {
             "sha256": "0snx0b8b4yc507q3i4fzvrd68xgzqxly8kn5cwp26ik6cv840y29",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151205.820",
+        "version": "20151222.919",
         "deps": [
             "cl-lib",
             "helm"
@@ -5104,14 +5139,14 @@
             "tag": "fetchFromGitHub",
             "owner": "tumashu",
             "repo": "chinese-pyim",
-            "sha256": "0sw9iajxy6lmpr8d2g6409b84psa1xr5pikrb3i5qbbwpvz6q3w4",
-            "rev": "6b80f86305dbd1c09b12017d9189356fb98df2c6"
+            "sha256": "0kh3zn23qkw4i36ca28yly3h20i47kvf04cqywmchmic9nd8kh13",
+            "rev": "98e10e1e70b0eab713e1d764a5078f92917396b1"
         },
         "recipe": {
             "sha256": "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151215.1812",
+        "version": "20151227.154",
         "deps": [
             "cl-lib",
             "pos-tip"
@@ -5127,7 +5162,7 @@
         },
         "recipe": {
             "sha256": "1fclad1dyngyg9ncfkcqfxybvy8482i2bd409cgxi9y4h1wc7ws7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140213.222",
         "deps": []
@@ -5142,7 +5177,7 @@
         },
         "recipe": {
             "sha256": "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.920",
         "deps": [
@@ -5161,7 +5196,7 @@
         },
         "recipe": {
             "sha256": "1sc8qngm40bwdym8k1dgbahg48i73c00zxd99kqqwm9fnd6nm7qx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.1238",
         "deps": [
@@ -5178,7 +5213,7 @@
         },
         "recipe": {
             "sha256": "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120920.1148",
         "deps": []
@@ -5193,7 +5228,7 @@
         },
         "recipe": {
             "sha256": "13qdnfslnik4f97lz9bxayyhgcp1knh5gaqy00ps863j3vpzjb9s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150113.2126",
         "deps": []
@@ -5203,14 +5238,14 @@
             "tag": "fetchFromGitHub",
             "owner": "dakrone",
             "repo": "emacs-java-imports",
-            "sha256": "0canb3yp29n4bb31852hg8fbmwi1rw8r02ngd5f60mfpdrz2jqm6",
-            "rev": "90d1b813a88b93bea8733be3babac3ec238b54d1"
+            "sha256": "1iy1y2lslh7agix7srkvbqcxhg9kgjbm9m44kgpim3kyjzgagw6i",
+            "rev": "9d39496f437e27dabe0873d4fc158a14bb25ed67"
         },
         "recipe": {
             "sha256": "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.1821",
+        "version": "20151224.2013",
         "deps": [
             "pcache",
             "s"
@@ -5226,7 +5261,7 @@
         },
         "recipe": {
             "sha256": "1pg7ir3y6yk92kfs5agbxapcxf7gy60m353rjv8g3kfkx5zyh3mv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151130.900",
         "deps": [
@@ -5246,7 +5281,7 @@
         },
         "recipe": {
             "sha256": "1mf884c6adx7rq5c2z5wrnjpb6znljy30mscxskwqiyfs8c62mii",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131013.1332",
         "deps": [
@@ -5259,12 +5294,12 @@
             "tag": "fetchFromGitHub",
             "owner": "cacology",
             "repo": "private-diary",
-            "sha256": "02l86flh3pyvd8va3dkckf4whr8lab1iybgdb9k6dqsc6j46dcfh",
-            "rev": "9d2589e46a51ce256ded0542b9826f520ccfcb1a"
+            "sha256": "1pxr5a9ik09k0f58lawhxiv179n5j8q24zhrs9vjk93yskl1ydwn",
+            "rev": "0c86fb6150ad8ed14f94def3504f5a68f4147283"
         },
         "recipe": {
             "sha256": "0dgnf375c00nlkp66kbkzsf469063l03b9miiplbhd63zshlv1i1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.1057",
         "deps": [
@@ -5281,7 +5316,7 @@
         },
         "recipe": {
             "sha256": "1v78rm44af3vgsml5f6kpwvnb4ks6n49br2fhjgh6nc7g3jmz97n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141008.728",
         "deps": [
@@ -5298,7 +5333,7 @@
         },
         "recipe": {
             "sha256": "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.1015",
         "deps": [
@@ -5315,7 +5350,7 @@
         },
         "recipe": {
             "sha256": "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150430.1955",
         "deps": [
@@ -5332,7 +5367,7 @@
         },
         "recipe": {
             "sha256": "1x7mk3dpk44fkzll6xmh2dw270cgb3a9qs3h8bmiq2dw0wrcwcd1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.102",
         "deps": [
@@ -5349,7 +5384,7 @@
         },
         "recipe": {
             "sha256": "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140605.1328",
         "deps": []
@@ -5364,7 +5399,7 @@
         },
         "recipe": {
             "sha256": "0fcsz9wmibqp6ci0pa5r4gzlrsyj5klajxpgfksa0nfj3dc94cvg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151209.936",
         "deps": []
@@ -5379,7 +5414,7 @@
         },
         "recipe": {
             "sha256": "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140729.1152",
         "deps": [
@@ -5398,7 +5433,7 @@
         },
         "recipe": {
             "sha256": "183lzhgjj480ca2939za3rlnsbfn24mgi501n66h5wim950v7vgd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151120.1655",
         "deps": [
@@ -5415,7 +5450,7 @@
         },
         "recipe": {
             "sha256": "1f2s2f64bmsx89a3crm4skhdi4pq9w18z9skxw3i3ydaj15s8jgl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151112.444",
         "deps": []
@@ -5430,7 +5465,7 @@
         },
         "recipe": {
             "sha256": "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141214.2203",
         "deps": [
@@ -5447,7 +5482,7 @@
         },
         "recipe": {
             "sha256": "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.1858",
         "deps": [
@@ -5464,7 +5499,7 @@
         },
         "recipe": {
             "sha256": "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141110.217",
         "deps": []
@@ -5479,7 +5514,7 @@
         },
         "recipe": {
             "sha256": "19y3n8wnbpgbpz4jxy2p7hjqxykg09arjp7s5v22yz7il3gn48l2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151103.447",
         "deps": [
@@ -5496,7 +5531,7 @@
         },
         "recipe": {
             "sha256": "1cshhd4bkgbkg0n6m8gz53z47z4nq0hcriz2qh3v7m4cqgkw1m9r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120829.752",
         "deps": []
@@ -5509,7 +5544,7 @@
         },
         "recipe": {
             "sha256": "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140813.319",
         "deps": []
@@ -5524,7 +5559,7 @@
         },
         "recipe": {
             "sha256": "097gimlzmyrsfnl76cbzyyi9dm0d2y3f9107672h56ncri35mh66",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141119.243",
         "deps": []
@@ -5539,7 +5574,7 @@
         },
         "recipe": {
             "sha256": "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141016.1856",
         "deps": []
@@ -5554,7 +5589,7 @@
         },
         "recipe": {
             "sha256": "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130731.1642",
         "deps": []
@@ -5569,7 +5604,7 @@
         },
         "recipe": {
             "sha256": "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150923.2149",
         "deps": [
@@ -5586,7 +5621,7 @@
         },
         "recipe": {
             "sha256": "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.1951",
         "deps": [
@@ -5598,14 +5633,14 @@
             "tag": "fetchFromGitHub",
             "owner": "rexim",
             "repo": "gruber-darker-theme",
-            "sha256": "12klcl22npffx363bsx3sbndkbnz564yi38pk6iscps8gccyxjkm",
-            "rev": "25d52be23017f5a79d5eba53e767eab9d751819e"
+            "sha256": "0l6gkhzg0dn4q223gljh1jh305aa9n8rbf9h5gg5d1aygs7cb3ha",
+            "rev": "60d8262d8e38103568bbe58e2ece1d9a970fc15a"
         },
         "recipe": {
             "sha256": "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151210.126",
+        "version": "20151223.252",
         "deps": []
     },
     "orgbox": {
@@ -5618,7 +5653,7 @@
         },
         "recipe": {
             "sha256": "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140528.2026",
         "deps": [
@@ -5636,7 +5671,7 @@
         },
         "recipe": {
             "sha256": "0wcg8ph3mk4zcmzqpvl2w6rfgvrfvhmgwb14y8agh9b7v5d9xwj3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140122.534",
         "deps": []
@@ -5651,7 +5686,7 @@
         },
         "recipe": {
             "sha256": "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150814.154",
         "deps": []
@@ -5666,7 +5701,7 @@
         },
         "recipe": {
             "sha256": "1761kgrflipxba8894cnx90ks7f3ba4nj6ci515zzxcx9s45mfyy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151027.1636",
         "deps": [
@@ -5684,7 +5719,7 @@
         },
         "recipe": {
             "sha256": "0ssib65wa20h8r6156f392l481vns5fcax6w70hcawmn84nficdh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151104.2325",
         "deps": [
@@ -5701,7 +5736,7 @@
         },
         "recipe": {
             "sha256": "1wjkh8xj5120v9fz1nrpkd6x4f22ni8h2lfkd82df7kjz6bzdfwg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141208.755",
         "deps": [
@@ -5719,7 +5754,7 @@
         },
         "recipe": {
             "sha256": "0aqxjm78k7i8c59w6mw9wsfw3rail1pg40ac1dbcjkm62fjbh5hy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150910.1600",
         "deps": [
@@ -5737,7 +5772,7 @@
         },
         "recipe": {
             "sha256": "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150317.44",
         "deps": [
@@ -5757,7 +5792,7 @@
         },
         "recipe": {
             "sha256": "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141010.1039",
         "deps": []
@@ -5772,7 +5807,7 @@
         },
         "recipe": {
             "sha256": "1rxn0ha2yhvyc195alg31nk1sjghnbha33xrqwc9z3j71w211frm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150111.623",
         "deps": [
@@ -5789,7 +5824,7 @@
         },
         "recipe": {
             "sha256": "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151207.714",
         "deps": []
@@ -5799,14 +5834,14 @@
             "tag": "fetchFromGitHub",
             "owner": "DarwinAwardWinner",
             "repo": "ido-ubiquitous",
-            "sha256": "1m9wyl4lm2sy6ax7wg4wh9nw5vq8z26z7kb9mq3p01z9v1vzyzil",
-            "rev": "3bf3c707753969b2c3b534bfe3d09dbd297dfaae"
+            "sha256": "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn",
+            "rev": "1a97a38f2d1a51371853e44da659caa6baf78cbe"
         },
         "recipe": {
             "sha256": "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151129.1726",
+        "version": "20151219.1036",
         "deps": [
             "cl-lib",
             "emacs"
@@ -5822,7 +5857,7 @@
         },
         "recipe": {
             "sha256": "0am73zch2fy1hfjwzk8kg0j3lgbcz3hzxjrdf0j0a9w0myp0mmjm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140105.1626",
         "deps": []
@@ -5837,7 +5872,7 @@
         },
         "recipe": {
             "sha256": "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150708.659",
         "deps": [
@@ -5856,7 +5891,7 @@
         },
         "recipe": {
             "sha256": "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140320.224",
         "deps": [
@@ -5873,7 +5908,7 @@
         },
         "recipe": {
             "sha256": "0mwhzkbzhpq4jws05p7qp0kbay8kcblb9xikznm0i8drpdyc617v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150219.1604",
         "deps": []
@@ -5888,7 +5923,7 @@
         },
         "recipe": {
             "sha256": "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140223.1132",
         "deps": []
@@ -5903,7 +5938,7 @@
         },
         "recipe": {
             "sha256": "0sqdqlpg4firswr742nrb6b8sz3bpijf6pbxvandq3ddpm0rx9ia",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151120.1841",
         "deps": [
@@ -5916,12 +5951,12 @@
             "tag": "fetchFromGitHub",
             "owner": "travisbhartwell",
             "repo": "nix-emacs",
-            "sha256": "0iq1j703kj3dy1di8m488kds8i6klpavwwb88ysn5pv2nwdi6i4w",
-            "rev": "2bd8a5fe792dd6a219934f5295d6116877e45f6c"
+            "sha256": "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3",
+            "rev": "6b1418611b49a6cf77380a76f7e6236bbb5df83a"
         },
         "recipe": {
             "sha256": "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151013.1809",
         "deps": [
@@ -5939,7 +5974,7 @@
         },
         "recipe": {
             "sha256": "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.38",
         "deps": [
@@ -5951,14 +5986,14 @@
         "fetch": {
             "tag": "fetchgit",
             "url": "git://fort.kickass.systems/personal/rrix/pub/matrix.el",
-            "sha256": "0516772e4aae604359bee659d101fb62b73cc9016cbbe0b749c77402954ec341",
-            "rev": "de09c69d2d5ca604839239fe49b10a2ed5ac2809"
+            "sha256": "28022465db474430300c3776165eb2cb7a243c476332da09d7558bc3051b2448",
+            "rev": "26e4696de28a12d9ac2d3af43bedc871f47f4dad"
         },
         "recipe": {
             "sha256": "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151201.1443",
+        "version": "20151219.1249",
         "deps": [
             "json",
             "request"
@@ -5974,7 +6009,7 @@
         },
         "recipe": {
             "sha256": "17aji2vcw6zfd823anzwj8pcgyxamxr87bnni085jvlz0vx6gh9c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151005.526",
         "deps": []
@@ -5984,14 +6019,14 @@
             "tag": "fetchFromGitHub",
             "owner": "masutaka",
             "repo": "emacs-helm-hatena-bookmark",
-            "sha256": "0254jcy6cb7m63lnkp5s97hyzr13xh1a1xykp96iirkgjfcg5xds",
-            "rev": "497d33632f195354eaa24670db0804c846b7261b"
+            "sha256": "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f",
+            "rev": "1ba352b858869a32323d4e6f9ca4b3eae055809e"
         },
         "recipe": {
             "sha256": "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151115.826",
+        "version": "20151221.620",
         "deps": [
             "helm"
         ]
@@ -6006,7 +6041,7 @@
         },
         "recipe": {
             "sha256": "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151001.1528",
         "deps": [
@@ -6021,14 +6056,14 @@
             "tag": "fetchFromGitHub",
             "owner": "paddymcall",
             "repo": "xquery-tool.el",
-            "sha256": "06mcz6ppr1cc5dfbxqbxhzwzmgpi8m3wbncckq5qi9xq5wvbah1d",
-            "rev": "af60aba324819ff6692f89f1c85aac59b820bf18"
+            "sha256": "00b8nndvgpa20vmdc9vcig65ij6pmd9q3wfmczj1qbkz2q00kn5a",
+            "rev": "3d43bf6d18ccf5553a5a80b80b99ad1fb8b9ccb2"
         },
         "recipe": {
             "sha256": "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.907",
+        "version": "20151221.450",
         "deps": []
     },
     "gruvbox-theme": {
@@ -6036,14 +6071,14 @@
             "tag": "fetchFromGitHub",
             "owner": "Greduan",
             "repo": "emacs-theme-gruvbox",
-            "sha256": "1i9qjv39w6kvk7r829gagp4sbc1w0hp0qgnqxya1jac56h6ylhky",
-            "rev": "7cc236f7e357d3e53914f46d98a29588d2e7de62"
+            "sha256": "04jknwkax9gdmzz0yq0m21grl9c43vr3abdam3g8zjh5sjx5gs14",
+            "rev": "6af232a46073235ccf81cf99f46ee600fea7ba3e"
         },
         "recipe": {
             "sha256": "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.934",
+        "version": "20151227.313",
         "deps": []
     },
     "java-snippets": {
@@ -6056,7 +6091,7 @@
         },
         "recipe": {
             "sha256": "0bsmp6sc3khdadkmwqy8khz8kzqijcsv70gimm2cs1kwnbyj6pfp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140728.36",
         "deps": [
@@ -6073,7 +6108,7 @@
         },
         "recipe": {
             "sha256": "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151004.915",
         "deps": [
@@ -6093,7 +6128,7 @@
         },
         "recipe": {
             "sha256": "0ad8kvrmd3gyb8wfghcl4r3kwzplk5gxlw3p23wsbx6c2xq6xr7g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150910.1044",
         "deps": []
@@ -6108,7 +6143,7 @@
         },
         "recipe": {
             "sha256": "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151218.554",
         "deps": [
@@ -6125,7 +6160,7 @@
         },
         "recipe": {
             "sha256": "17z9mc49x4092axs7lq6b6z7yrrhkl8bdx5f8gq6qy5lampgyzch",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140102.1423",
         "deps": []
@@ -6140,7 +6175,7 @@
         },
         "recipe": {
             "sha256": "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150525.1129",
         "deps": [
@@ -6157,7 +6192,7 @@
         },
         "recipe": {
             "sha256": "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150315.2043",
         "deps": [
@@ -6173,7 +6208,7 @@
         },
         "recipe": {
             "sha256": "1qzspirn1abqps0dn5z8w6ymffc6b02dyki5hr8v74wfs8fhzx05",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1552",
         "deps": [
@@ -6190,7 +6225,7 @@
         },
         "recipe": {
             "sha256": "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131230.419",
         "deps": []
@@ -6205,7 +6240,7 @@
         },
         "recipe": {
             "sha256": "0x4nq42nbh2qgbg111lgbknc7w7m7lxd14mp9s8dcrpwsaxz960m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140626.235",
         "deps": []
@@ -6220,7 +6255,7 @@
         },
         "recipe": {
             "sha256": "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151114.440",
         "deps": [
@@ -6240,7 +6275,7 @@
         },
         "recipe": {
             "sha256": "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20081011.1526",
         "deps": []
@@ -6253,7 +6288,7 @@
         },
         "recipe": {
             "sha256": "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20101129.2052",
         "deps": []
@@ -6268,7 +6303,7 @@
         },
         "recipe": {
             "sha256": "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.1316",
         "deps": [
@@ -6286,7 +6321,7 @@
         },
         "recipe": {
             "sha256": "0409v1wi10q48rrh8iib6dw9icmswfrpjx9x7xcma994z080d2fy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151005.2316",
         "deps": [
@@ -6299,14 +6334,14 @@
             "tag": "fetchFromGitHub",
             "owner": "zonuexe",
             "repo": "magic-filetype.el",
-            "sha256": "1q5bjk9dzq8my804kd6i185522mxdkwrh2lhc2nvjbj4idx7rgll",
-            "rev": "e9fbed35f389be24198b1a86b5c2440750732a6e"
+            "sha256": "1ycqhmi18yjniw6w258rhxcc70ngq51vjlafx0bcs1aw1px97z5s",
+            "rev": "bffe69c70565c534bcc245cfdc2781d85e4edb68"
         },
         "recipe": {
             "sha256": "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151029.1057",
+        "version": "20151224.715",
         "deps": [
             "emacs",
             "s"
@@ -6322,7 +6357,7 @@
         },
         "recipe": {
             "sha256": "0lppzk60vl3ps9fqnrh020awiy5w46gwlb6d91pr889x24ryphmm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131228.641",
         "deps": [
@@ -6339,7 +6374,7 @@
         },
         "recipe": {
             "sha256": "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150422.953",
         "deps": []
@@ -6349,14 +6384,14 @@
             "tag": "fetchFromGitHub",
             "owner": "cadadr",
             "repo": "paper-theme",
-            "sha256": "0mv8biyv3ydgy3hhr30p57348g93swdwnf0vmxnrbpjprk6a4w4i",
-            "rev": "5ddb180beac8a1890cafacdd41e8373ca1999182"
+            "sha256": "115j0zg3gfbgrl62h1sx7jaxsnd484sb1b14jqz185i12lrca506",
+            "rev": "37b1b16901231854b31b525f0796958c82aa8565"
         },
         "recipe": {
             "sha256": "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151025.1000",
+        "version": "20151225.732",
         "deps": [
             "emacs",
             "hexrgb"
@@ -6372,7 +6407,7 @@
         },
         "recipe": {
             "sha256": "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150723.947",
         "deps": []
@@ -6387,7 +6422,7 @@
         },
         "recipe": {
             "sha256": "13h6hy8y0as0xfc1cg8balw63as81fzar32q9h4zhnndl3hc1081",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130528.2227",
         "deps": [
@@ -6402,7 +6437,7 @@
         },
         "recipe": {
             "sha256": "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150708.2036",
         "deps": []
@@ -6417,7 +6452,7 @@
         },
         "recipe": {
             "sha256": "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140127.1246",
         "deps": [
@@ -6436,7 +6471,7 @@
         },
         "recipe": {
             "sha256": "184ip9pvv4zkfxnrzxbfajjadc9f4dz4psn33f9x3sfh7s1y4nw8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.1350",
         "deps": []
@@ -6451,7 +6486,7 @@
         },
         "recipe": {
             "sha256": "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150821.2344",
         "deps": [
@@ -6468,7 +6503,7 @@
         },
         "recipe": {
             "sha256": "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141128.407",
         "deps": []
@@ -6483,7 +6518,7 @@
         },
         "recipe": {
             "sha256": "0166y04gxrwnynm4jshm2kqk5jbvl5g5078dxvw18nicrgq3y4r8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150131.352",
         "deps": [
@@ -6500,7 +6535,7 @@
         },
         "recipe": {
             "sha256": "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.528",
         "deps": [
@@ -6518,7 +6553,7 @@
         },
         "recipe": {
             "sha256": "0dhrsz24hn0sdf22wpmzbkn66g4540vdkl03pc27kv21gwa9ixxv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140107.1004",
         "deps": []
@@ -6533,7 +6568,7 @@
         },
         "recipe": {
             "sha256": "0b0cl2xj5w1r71zrjhnqhrzsnz1296jv21qx5adzslra6lk55q2r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151031.2227",
         "deps": [
@@ -6552,7 +6587,7 @@
         },
         "recipe": {
             "sha256": "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150115.1301",
         "deps": [
@@ -6572,7 +6607,7 @@
         },
         "recipe": {
             "sha256": "00wr3wk41sbpamxbjkqlby49g8y5z9n79p51sg7ginban4qy91gf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.1137",
         "deps": [
@@ -6590,7 +6625,7 @@
         },
         "recipe": {
             "sha256": "17x8vvfhx739hcj9j1nh6j4r6zqnwa5zq9zpi9b6lxc8979k3m4w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131223.700",
         "deps": [
@@ -6607,7 +6642,7 @@
         },
         "recipe": {
             "sha256": "19p39l4nwgxm52yimy4j6l43845cpk8g5qdrldlwfxd7dvay09ay",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120223.1608",
         "deps": []
@@ -6622,7 +6657,7 @@
         },
         "recipe": {
             "sha256": "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130409.1249",
         "deps": [
@@ -6639,7 +6674,7 @@
         },
         "recipe": {
             "sha256": "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150601.206",
         "deps": []
@@ -6654,7 +6689,7 @@
         },
         "recipe": {
             "sha256": "1vzg3wsqyfb9rsfxrpz8k2gazjlz2nwnf4gnn1dypsjspjnzcb8r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140208.914",
         "deps": []
@@ -6669,7 +6704,7 @@
         },
         "recipe": {
             "sha256": "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131219.2239",
         "deps": []
@@ -6684,7 +6719,7 @@
         },
         "recipe": {
             "sha256": "04fmhravd3ld4n1n820wlnr1jvmk7c7cdazd15gazixrlz6fm4fk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150823.1357",
         "deps": []
@@ -6699,7 +6734,7 @@
         },
         "recipe": {
             "sha256": "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131127.206",
         "deps": [
@@ -6714,7 +6749,7 @@
         },
         "recipe": {
             "sha256": "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150403.1121",
         "deps": []
@@ -6729,7 +6764,7 @@
         },
         "recipe": {
             "sha256": "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150920.653",
         "deps": [
@@ -6748,7 +6783,7 @@
         },
         "recipe": {
             "sha256": "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151129.833",
         "deps": [
@@ -6760,12 +6795,12 @@
             "tag": "fetchFromGitHub",
             "owner": "dimitri",
             "repo": "el-get",
-            "sha256": "0ppcja9mhjm0ymln72nigilkl0jj9mwxclw3v5djdcfq0xp1mc77",
-            "rev": "56d72507c1af03d1c719dcac62a0c365857cc10e"
+            "sha256": "07c7rik31zxqck3wprdgww41pr1f08knj169bxrn59ayla7h8yy5",
+            "rev": "ec946c9b6df2565bed80ee4e940502d804d1ef10"
         },
         "recipe": {
             "sha256": "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151117.1015",
         "deps": []
@@ -6780,7 +6815,7 @@
         },
         "recipe": {
             "sha256": "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120829.710",
         "deps": [
@@ -6797,7 +6832,7 @@
         },
         "recipe": {
             "sha256": "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141121.1230",
         "deps": []
@@ -6810,7 +6845,7 @@
         },
         "recipe": {
             "sha256": "1gzr3z4nyzip299z08mignhigxr7drak7rv9z6gmdjrika9a29lx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1550",
         "deps": [
@@ -6825,7 +6860,7 @@
         },
         "recipe": {
             "sha256": "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150402.1829",
         "deps": []
@@ -6840,7 +6875,7 @@
         },
         "recipe": {
             "sha256": "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150328.118",
         "deps": []
@@ -6855,7 +6890,7 @@
         },
         "recipe": {
             "sha256": "007lv3698a88wxan7kplz2117azxxpzzgshin9c1aabg059hszlj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130329.1748",
         "deps": [
@@ -6872,7 +6907,7 @@
         },
         "recipe": {
             "sha256": "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.1813",
         "deps": [
@@ -6889,7 +6924,7 @@
         },
         "recipe": {
             "sha256": "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140816.1148",
         "deps": []
@@ -6904,7 +6939,7 @@
         },
         "recipe": {
             "sha256": "1jl9sk372j4162av9kfcbqp0cc5wpm86nkqg8rskfgmsi4ncp4ph",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150501.2226",
         "deps": [
@@ -6926,7 +6961,7 @@
         },
         "recipe": {
             "sha256": "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151019.1035",
         "deps": [
@@ -6943,7 +6978,7 @@
         },
         "recipe": {
             "sha256": "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140728.1736",
         "deps": []
@@ -6956,7 +6991,7 @@
         },
         "recipe": {
             "sha256": "0n9hc22rp18dxx33l2l1xla78m5zjybgh3mmsp91fbdiq92b446s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150116.2302",
         "deps": []
@@ -6969,7 +7004,7 @@
         },
         "recipe": {
             "sha256": "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130407.1320",
         "deps": []
@@ -6984,7 +7019,7 @@
         },
         "recipe": {
             "sha256": "183qczyb6c8zmdgmsjsj4hddmvnzzq4c7syslm861xcyxia94icy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.405",
         "deps": []
@@ -6998,7 +7033,7 @@
         },
         "recipe": {
             "sha256": "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.1120",
         "deps": [
@@ -7016,7 +7051,7 @@
         },
         "recipe": {
             "sha256": "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151105.334",
         "deps": [
@@ -7033,7 +7068,7 @@
         },
         "recipe": {
             "sha256": "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150523.1003",
         "deps": []
@@ -7048,7 +7083,7 @@
         },
         "recipe": {
             "sha256": "0ch0hamvw4gsqs2pap0h6w4cj6n73jqa75if0ymh73hk5i3acm8g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121208.558",
         "deps": []
@@ -7063,7 +7098,7 @@
         },
         "recipe": {
             "sha256": "1skvd29347hwapgdqznbzwfcp2nf077qkdzknxc8ylmqa32yf5w1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.1433",
         "deps": [
@@ -7081,7 +7116,7 @@
         },
         "recipe": {
             "sha256": "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151009.329",
         "deps": [
@@ -7099,7 +7134,7 @@
         },
         "recipe": {
             "sha256": "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151115.1116",
         "deps": [
@@ -7117,7 +7152,7 @@
         },
         "recipe": {
             "sha256": "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140830.1721",
         "deps": [
@@ -7134,7 +7169,7 @@
         },
         "recipe": {
             "sha256": "1a3fplfipk1nv3py1sy0p2adf3w1h4api01h2j5rjlq2jw06kyr0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121017.57",
         "deps": []
@@ -7144,12 +7179,12 @@
             "tag": "fetchFromGitHub",
             "owner": "clojure-emacs",
             "repo": "clj-refactor.el",
-            "sha256": "1xvhypskaap9rlvza34ad8bry1g3zr53wf8a3zbxj024lbw37ay2",
-            "rev": "3b11a7d8cfa23ec4887ccc093574c239f57900d7"
+            "sha256": "1wp4pbvj2llc72ypznq5dg9fisaa90g78kqjc29xczz30hkj3dji",
+            "rev": "76508499cbd1c69751a7d1437f703c4b2734023b"
         },
         "recipe": {
             "sha256": "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.400",
         "deps": [
@@ -7175,7 +7210,7 @@
         },
         "recipe": {
             "sha256": "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150922.905",
         "deps": []
@@ -7190,7 +7225,7 @@
         },
         "recipe": {
             "sha256": "11z64wy8mnnrjmgfs2sjbv3mh136aki8r5f89myx861nfx18hc3k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151018.407",
         "deps": [
@@ -7208,7 +7243,7 @@
         },
         "recipe": {
             "sha256": "1yfj6mmxc165in1i85ccanssch6bg19ib1fcm7sa4i4hv0mgwaid",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141108.2315",
         "deps": [
@@ -7226,7 +7261,7 @@
         },
         "recipe": {
             "sha256": "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.1311",
         "deps": [
@@ -7245,7 +7280,7 @@
         },
         "recipe": {
             "sha256": "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.1012",
         "deps": [
@@ -7264,7 +7299,7 @@
         },
         "recipe": {
             "sha256": "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140625.650",
         "deps": []
@@ -7279,7 +7314,7 @@
         },
         "recipe": {
             "sha256": "1zg9xx7mj8334m2v2zqqfkr5vkj4dzqbj8y13qk6xhzb7qkppyqd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151027.1651",
         "deps": [
@@ -7296,7 +7331,7 @@
         },
         "recipe": {
             "sha256": "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151102.943",
         "deps": []
@@ -7305,15 +7340,15 @@
         "fetch": {
             "tag": "fetchFromGitHub",
             "owner": "abingham",
-            "repo": "traad",
-            "sha256": "06pvsa6m8h9j6mrq10dm6zj5jqibcm1xf3s1wkh7l6sr6hziz8rz",
-            "rev": "022cda646ec9b7102c73899e6305bfdfc0402ba5"
+            "repo": "emacs-traad",
+            "sha256": "0sr159v18x7xp2rqq2lr4ir15ksc6xyh96whipxzbi2qnvx3j3xg",
+            "rev": "5affdb2278228566007d189ca950a15d1c7e509e"
         },
         "recipe": {
-            "sha256": "1ca965pjglbbi56m1s0hl8zxhbkaxa6ms51vvidzldvmzp8n7mw5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "08gxh5c01xfbbj9g4992jah494rw3d3bbs8j79r3mpqxllkp2znf",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150106.815",
+        "version": "20151226.134",
         "deps": [
             "deferred",
             "popup",
@@ -7332,7 +7367,7 @@
         },
         "recipe": {
             "sha256": "12jx47picdpw668q75qsp9gncrnxnlk1slhzvxsk5pvkdwh26h66",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150731.1046",
         "deps": []
@@ -7347,7 +7382,7 @@
         },
         "recipe": {
             "sha256": "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140620.1609",
         "deps": []
@@ -7362,7 +7397,7 @@
         },
         "recipe": {
             "sha256": "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130711.1239",
         "deps": [
@@ -7379,7 +7414,7 @@
         },
         "recipe": {
             "sha256": "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140107.422",
         "deps": [
@@ -7394,7 +7429,7 @@
         },
         "recipe": {
             "sha256": "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121115.443",
         "deps": []
@@ -7409,7 +7444,7 @@
         },
         "recipe": {
             "sha256": "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.15",
         "deps": [
@@ -7423,14 +7458,14 @@
             "tag": "fetchFromGitHub",
             "owner": "defunkt",
             "repo": "coffee-mode",
-            "sha256": "1axp9hixp4vgaqjd3ii9xwb32jhb964zclmpg3zpsl4rp8b9bdz5",
-            "rev": "d19075264dc1f662e2282ca42ce70be0eae61b2a"
+            "sha256": "03f8dvajaz6bf3mzfpgcvl0mc79jadlk7419whawcfgzlp9lq676",
+            "rev": "1b938ba9100aa67a0e0ce22c258033bbad50a45d"
         },
         "recipe": {
             "sha256": "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151210.828",
+        "version": "20151227.753",
         "deps": [
             "cl-lib",
             "emacs"
@@ -7444,7 +7479,7 @@
         },
         "recipe": {
             "sha256": "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110722.1051",
         "deps": []
@@ -7454,14 +7489,14 @@
             "tag": "fetchFromGitHub",
             "owner": "Fuco1",
             "repo": "smartparens",
-            "sha256": "1zs6jxl7a9hwap78w81s2h62jicikn1lyj0yxiiz0gll428p3rnj",
-            "rev": "951c2e2b78901232da1feaf8f402a699d6193bf3"
+            "sha256": "0bmv079l8sak9afnjkf71f180i72l5cch49ckahxrdwwwhglh9a9",
+            "rev": "aa35628d4ad8cf4bcc2f9654f6fbf261327c75ae"
         },
         "recipe": {
             "sha256": "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151213.1707",
+        "version": "20151226.1756",
         "deps": [
             "cl-lib",
             "dash"
@@ -7477,7 +7512,7 @@
         },
         "recipe": {
             "sha256": "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151110.1029",
         "deps": [
@@ -7496,7 +7531,7 @@
         },
         "recipe": {
             "sha256": "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140512.900",
         "deps": []
@@ -7511,7 +7546,7 @@
         },
         "recipe": {
             "sha256": "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151218.126",
         "deps": [
@@ -7529,7 +7564,7 @@
         },
         "recipe": {
             "sha256": "137qqfnla3hjm6qcnzpsgrw173px0k5dwq9apns5cdryxx3ahcvv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141028.218",
         "deps": []
@@ -7539,14 +7574,14 @@
             "tag": "fetchFromGitHub",
             "owner": "cqql",
             "repo": "dictcc.el",
-            "sha256": "0jv4r9l8n7k2m85f4nnj6igsav4hmaq41gi1mp662mgmgfpaf0wl",
-            "rev": "5cc898de535536380e1031b67421bd2a00cdd689"
+            "sha256": "0b8yg03h5arfl5rlzlg2a6q7nhx452mdyngizjzxlvkmrqnlra4v",
+            "rev": "1fd76499cf5d2045e8594aec3c0b62168802f887"
         },
         "recipe": {
             "sha256": "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150731.455",
+        "version": "20151221.557",
         "deps": [
             "cl-lib",
             "dash",
@@ -7565,7 +7600,7 @@
         },
         "recipe": {
             "sha256": "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151011.1226",
         "deps": [
@@ -7583,7 +7618,7 @@
         },
         "recipe": {
             "sha256": "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151105.441",
         "deps": [
@@ -7600,7 +7635,7 @@
         },
         "recipe": {
             "sha256": "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150101.455",
         "deps": []
@@ -7615,7 +7650,7 @@
         },
         "recipe": {
             "sha256": "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151209.1015",
         "deps": []
@@ -7628,7 +7663,7 @@
         },
         "recipe": {
             "sha256": "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150220.720",
         "deps": []
@@ -7643,7 +7678,7 @@
         },
         "recipe": {
             "sha256": "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151114.101",
         "deps": []
@@ -7658,7 +7693,7 @@
         },
         "recipe": {
             "sha256": "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130506.8",
         "deps": [
@@ -7677,7 +7712,7 @@
         },
         "recipe": {
             "sha256": "13llsyyvy0xc9s51cqqc1rz13m3qdqh8jw07gwywfbixlma59z8l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150924.847",
         "deps": []
@@ -7692,7 +7727,7 @@
         },
         "recipe": {
             "sha256": "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150601.542",
         "deps": []
@@ -7707,7 +7742,7 @@
         },
         "recipe": {
             "sha256": "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150601.1209",
         "deps": []
@@ -7722,7 +7757,7 @@
         },
         "recipe": {
             "sha256": "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150416.1458",
         "deps": []
@@ -7737,7 +7772,7 @@
         },
         "recipe": {
             "sha256": "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150824.1800",
         "deps": []
@@ -7752,7 +7787,7 @@
         },
         "recipe": {
             "sha256": "1n13xcc3ny9j9h1h4vslpjl6k9mqksr73kgmqrmkq301p8zps94q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.118",
         "deps": [
@@ -7769,7 +7804,7 @@
         },
         "recipe": {
             "sha256": "0i5j9bnrncxar8hpy3d0566d0y5s4ywakskf27d3kxfyrwqi4l4f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131208.1114",
         "deps": [
@@ -7782,14 +7817,14 @@
             "tag": "fetchFromGitHub",
             "owner": "syohex",
             "repo": "emacs-git-gutter",
-            "sha256": "1721h4i185wj9nxkb19cnbwk5fwsajaqr54qq9xb669mm4pjn3ra",
-            "rev": "febe69d909beb407d07dfc1b273ae7b7719fdd7c"
+            "sha256": "1pjvy4r1wrvqsqlxssrkw5c5qn57icgsz7p7fh6qkj9dfpszg8ad",
+            "rev": "cb2b341162447bc04b6f561dbb2e5add9a24c134"
         },
         "recipe": {
             "sha256": "12yjl9hsd72dwzl42hdcmjfdbxyi356jcq0kz8k7jvcsn57z4p2k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151210.203",
+        "version": "20151226.2202",
         "deps": [
             "cl-lib",
             "emacs"
@@ -7805,7 +7840,7 @@
         },
         "recipe": {
             "sha256": "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151218.604",
         "deps": [
@@ -7820,7 +7855,7 @@
         },
         "recipe": {
             "sha256": "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20091012.1230",
         "deps": []
@@ -7835,7 +7870,7 @@
         },
         "recipe": {
             "sha256": "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150313.1012",
         "deps": [
@@ -7852,7 +7887,7 @@
         },
         "recipe": {
             "sha256": "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150708.141",
         "deps": []
@@ -7867,7 +7902,7 @@
         },
         "recipe": {
             "sha256": "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.728",
         "deps": [
@@ -7890,7 +7925,7 @@
         },
         "recipe": {
             "sha256": "1gckzcwpg4am1ryjy08aic98mbafb64wkfmnm98d64kiwbpaacly",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150506.2052",
         "deps": []
@@ -7905,7 +7940,7 @@
         },
         "recipe": {
             "sha256": "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151113.1300",
         "deps": [
@@ -7923,7 +7958,7 @@
         },
         "recipe": {
             "sha256": "0wvci1v8pblfbdslfzpi46c149y8pi49kza9jf33jzhj357lp5qa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150911.432",
         "deps": []
@@ -7938,7 +7973,7 @@
         },
         "recipe": {
             "sha256": "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151212.1023",
         "deps": []
@@ -7953,7 +7988,7 @@
         },
         "recipe": {
             "sha256": "0svyz8fy4k9ba6gpdymf4cf8zjjpgm71y48vlybxbv507xjm17qf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150119.2033",
         "deps": []
@@ -7963,14 +7998,14 @@
             "tag": "fetchFromGitHub",
             "owner": "vapniks",
             "repo": "bbdb-ext",
-            "sha256": "09fdw5byqcjpnh3qjngp171695y6zpkgl2hyvrxha1mpcx7v1lr4",
-            "rev": "ae5ad8f0de8c1f11739310909d963b8fc6c368dc"
+            "sha256": "1ydf89mmp3zjfqdymnrwg18wclyf7psarz9f2k82pl58h0khh71g",
+            "rev": "fee97b1b3faa83edaea00fbc5ad3cbca5e791a55"
         },
         "recipe": {
             "sha256": "0fnxcvzdyh0602rdfz3lz3vmvza4s0syz1vn2fgsn2lg3afqq7li",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20130513.1352",
+        "version": "20151220.1413",
         "deps": [
             "bbdb"
         ]
@@ -7985,7 +8020,7 @@
         },
         "recipe": {
             "sha256": "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.1513",
         "deps": [
@@ -8000,7 +8035,7 @@
         },
         "recipe": {
             "sha256": "0aqwkymq5f0qfgs1hmcg1jb1rd0vcnlqwiyjrjjkfff2xlbpagqf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141021.1338",
         "deps": []
@@ -8015,7 +8050,7 @@
         },
         "recipe": {
             "sha256": "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150909.2039",
         "deps": []
@@ -8030,7 +8065,7 @@
         },
         "recipe": {
             "sha256": "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140118.957",
         "deps": [
@@ -8047,7 +8082,7 @@
         },
         "recipe": {
             "sha256": "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140818.255",
         "deps": []
@@ -8062,7 +8097,7 @@
         },
         "recipe": {
             "sha256": "0iz63b62x5jrz7c23i850634k4bk73kg1h4wj1ravx3wlgvzs8y8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150917.1802",
         "deps": [
@@ -8079,7 +8114,7 @@
         },
         "recipe": {
             "sha256": "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141204.1541",
         "deps": []
@@ -8093,7 +8128,7 @@
         },
         "recipe": {
             "sha256": "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151018.2103",
         "deps": []
@@ -8108,7 +8143,7 @@
         },
         "recipe": {
             "sha256": "042ybplkqjb30qf5cpbw5d91j1rdc71b789v277h036bri7hgxz6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150417.1026",
         "deps": []
@@ -8123,7 +8158,7 @@
         },
         "recipe": {
             "sha256": "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151119.1658",
         "deps": [
@@ -8140,7 +8175,7 @@
         },
         "recipe": {
             "sha256": "1bsff8fnq5z0f6cwg6wprz8qi3ivsqxpxx6v6fxfammn74qqyvb5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130301.148",
         "deps": []
@@ -8154,7 +8189,7 @@
         },
         "recipe": {
             "sha256": "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150804.1700",
         "deps": [
@@ -8172,7 +8207,7 @@
         },
         "recipe": {
             "sha256": "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150404.951",
         "deps": []
@@ -8186,8 +8221,8 @@
             "rev": "2b99fc4d372b017483b7596c4577bf5f15479772"
         },
         "recipe": {
-            "sha256": "0padz12mb6zv3jlprvnj9s5vyp2hx68cqb5v3z974zfg5ws9sy4c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.1224",
         "deps": [
@@ -8205,7 +8240,7 @@
         },
         "recipe": {
             "sha256": "09p4w51d5szhi81a6a3l0r4zd4ixkrkzxldr938bcmj0qmj62iyk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150607.945",
         "deps": [
@@ -8222,7 +8257,7 @@
         },
         "recipe": {
             "sha256": "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151016.1420",
         "deps": []
@@ -8237,7 +8272,7 @@
         },
         "recipe": {
             "sha256": "0vvvxl6a4ac27igwmsgzpf0whf9h2pjl9d89fd9fizad6gi8x1fs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140909.38",
         "deps": [
@@ -8252,7 +8287,7 @@
         },
         "recipe": {
             "sha256": "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140807.1550",
         "deps": []
@@ -8267,7 +8302,7 @@
         },
         "recipe": {
             "sha256": "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150730.1408",
         "deps": [
@@ -8285,7 +8320,7 @@
         },
         "recipe": {
             "sha256": "1iq2x1w8lqjjiwjja7r3qki6drvydnk171k9fj9g6rk7wslknz8x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151128.438",
         "deps": []
@@ -8300,7 +8335,7 @@
         },
         "recipe": {
             "sha256": "0mchh9y3pqwamry6105qrv1bp1qg1g0jmz7rzc5svz9giynypwf9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150522.2119",
         "deps": []
@@ -8315,7 +8350,7 @@
         },
         "recipe": {
             "sha256": "1jc6iqa4hna3277hx13scfcqzkr43yv6gndbxv7qf4ydi01ysd0m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151110.338",
         "deps": [
@@ -8332,7 +8367,7 @@
         },
         "recipe": {
             "sha256": "0bfsw55vjhx88jpy6npnzfwinvggivbvkk7fa3iwzq19005fkag2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150812.1141",
         "deps": []
@@ -8347,7 +8382,7 @@
         },
         "recipe": {
             "sha256": "02ldd92fv1k28nygl34i8gv0b0i1v5qd7nl1l17cf5f3akdwc6iq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151202.406",
         "deps": []
@@ -8362,7 +8397,7 @@
         },
         "recipe": {
             "sha256": "1wx5zg4kimd29vqipbzm4vjphn0mldri12g6b18kc290nhgj22ar",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151127.17",
         "deps": []
@@ -8377,7 +8412,7 @@
         },
         "recipe": {
             "sha256": "0llwqwwxrf7qdkpdb03ij0iinll0vc9qr557zyr3bn5zb4fad1sq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141231.1407",
         "deps": [
@@ -8396,7 +8431,7 @@
         },
         "recipe": {
             "sha256": "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150115.1623",
         "deps": [
@@ -8415,7 +8450,7 @@
         },
         "recipe": {
             "sha256": "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130321.2314",
         "deps": []
@@ -8430,7 +8465,7 @@
         },
         "recipe": {
             "sha256": "1i6a4jqjy9amlhdbj5d26wzagndfgszha09vs5qf4760vjl7kn4b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150213.2142",
         "deps": [
@@ -8448,7 +8483,7 @@
         },
         "recipe": {
             "sha256": "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150826.1732",
         "deps": [
@@ -8469,7 +8504,7 @@
         },
         "recipe": {
             "sha256": "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150102.912",
         "deps": []
@@ -8484,7 +8519,7 @@
         },
         "recipe": {
             "sha256": "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.534",
         "deps": [
@@ -8502,7 +8537,7 @@
         },
         "recipe": {
             "sha256": "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151006.1646",
         "deps": [
@@ -8519,7 +8554,7 @@
         },
         "recipe": {
             "sha256": "11mab7799kxs3w47srmds5prmwh6ldxzial9kqbqy33vybpkprmd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150417.612",
         "deps": []
@@ -8529,14 +8564,14 @@
             "tag": "fetchFromGitLab",
             "owner": "python-mode-devs",
             "repo": "python-mode",
-            "sha256": "1204804m31kfsb0vlfm6ndvxs16maqpghw96s8wmvyg16s8vnczj",
-            "rev": "c6dd413218221a0b7c85d12b6733229fac8f7788"
+            "sha256": "1x1nf3xsv4wzahqjzaavjrh1zjvf67h6kwyz6fx6ijycyx52bcwr",
+            "rev": "2ead7e73280f42ee8f18368e093b49ae839a643d"
         },
         "recipe": {
             "sha256": "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151219.555",
+        "version": "20151226.1231",
         "deps": []
     },
     "ob-sml": {
@@ -8549,7 +8584,7 @@
         },
         "recipe": {
             "sha256": "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130829.1343",
         "deps": [
@@ -8566,7 +8601,7 @@
         },
         "recipe": {
             "sha256": "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.1227",
         "deps": [
@@ -8585,7 +8620,7 @@
         },
         "recipe": {
             "sha256": "0c0zs07lspwczbcba56fai0rshjzx9zd3jqxgj9nwjf9xlcr8m3j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150119.1441",
         "deps": []
@@ -8600,7 +8635,7 @@
         },
         "recipe": {
             "sha256": "1m941q7ql3yb71s71783nvz822bwhn1krmin18fvh0fbsbbnck2a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150725.909",
         "deps": []
@@ -8615,7 +8650,7 @@
         },
         "recipe": {
             "sha256": "1qs9fw104kidbr5zbxc1q71yy033nq3wxh98vvzk4z4fppnd29sw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131229.1011",
         "deps": [
@@ -8632,7 +8667,7 @@
         },
         "recipe": {
             "sha256": "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150811.806",
         "deps": [
@@ -8650,7 +8685,7 @@
         },
         "recipe": {
             "sha256": "08lk8h2dk5s8k93j5vmxdlgg453pif8wbcx2w3xkjlh43dw1vdfq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.1727",
         "deps": []
@@ -8665,7 +8700,7 @@
         },
         "recipe": {
             "sha256": "1b709cplxip48a6qjdnzcn5qcgsy0jq1m05d7vc8p5ywgr1f9a00",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.102",
         "deps": [
@@ -8680,7 +8715,7 @@
         },
         "recipe": {
             "sha256": "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150228.1213",
         "deps": []
@@ -8695,7 +8730,7 @@
         },
         "recipe": {
             "sha256": "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140815.1813",
         "deps": [
@@ -8711,7 +8746,7 @@
         },
         "recipe": {
             "sha256": "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1820",
         "deps": []
@@ -8721,11 +8756,11 @@
             "tag": "fetchsvn",
             "url": "http://svn.ruby-lang.org/repos/ruby/trunk/misc/",
             "sha256": "0gl8wcnm7pidvd8zy3w5lzxqj0qxs9d932350ncgnmxwfsfzkdk7",
-            "rev": "53195"
+            "rev": "53351"
         },
         "recipe": {
             "sha256": "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150424.952",
         "deps": []
@@ -8740,7 +8775,7 @@
         },
         "recipe": {
             "sha256": "0lyd3gz1sflp93xb7xbvk1gh69w468ync1p144avyh2pybl40q4a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141127.447",
         "deps": []
@@ -8755,7 +8790,7 @@
         },
         "recipe": {
             "sha256": "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130823.2254",
         "deps": []
@@ -8769,7 +8804,7 @@
         },
         "recipe": {
             "sha256": "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110911.504",
         "deps": []
@@ -8784,7 +8819,7 @@
         },
         "recipe": {
             "sha256": "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150409.1934",
         "deps": [
@@ -8801,7 +8836,7 @@
         },
         "recipe": {
             "sha256": "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150410.1110",
         "deps": []
@@ -8816,7 +8851,7 @@
         },
         "recipe": {
             "sha256": "1gld2fkssrjh4smpp54017549d6aw3n1zisp5s4kkb6cmszwj5gm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.1619",
         "deps": [
@@ -8833,7 +8868,7 @@
         },
         "recipe": {
             "sha256": "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150519.1524",
         "deps": []
@@ -8848,7 +8883,7 @@
         },
         "recipe": {
             "sha256": "1jfw669xi2983jj3hiw5lyhc0rc0318qrmqx03f7m4ylg70dgxip",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131020.1354",
         "deps": [
@@ -8861,14 +8896,14 @@
             "tag": "fetchFromGitHub",
             "owner": "auto-complete",
             "repo": "popup-el",
-            "sha256": "18yhvcnp669xrwgxdjm1vrnv7f6lgg1i42vpkxnmj0fy8bzndqf1",
-            "rev": "68b71de41baa22be9c12b13d1efbf619a29ceadc"
+            "sha256": "19sbdxs6l66nflfb4kmx4lb6z0shwpfq79b5h9hhi0xr70xacd4b",
+            "rev": "004d58c47f6406b6555cf112f8a6eed6114cb63b"
         },
         "recipe": {
             "sha256": "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151125.742",
+        "version": "20151222.1539",
         "deps": [
             "cl-lib"
         ]
@@ -8883,7 +8918,7 @@
         },
         "recipe": {
             "sha256": "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.527",
         "deps": [
@@ -8900,7 +8935,7 @@
         },
         "recipe": {
             "sha256": "1gqzmm712npj36qfi506zgl0ycd6k7l5m46c7zz2z2lb6jpssw10",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150419.649",
         "deps": [
@@ -8917,7 +8952,7 @@
         },
         "recipe": {
             "sha256": "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150423.722",
         "deps": [
@@ -8935,7 +8970,7 @@
         },
         "recipe": {
             "sha256": "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151106.1206",
         "deps": [
@@ -8953,7 +8988,7 @@
         },
         "recipe": {
             "sha256": "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121104.1300",
         "deps": [
@@ -8970,7 +9005,7 @@
         },
         "recipe": {
             "sha256": "0i6qpk6v4pmpk3zswygdy0dd7rxy8kl7qn8a1xanpi4aqg7wlbmd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151012.804",
         "deps": []
@@ -8985,7 +9020,7 @@
         },
         "recipe": {
             "sha256": "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150708.912",
         "deps": []
@@ -9000,11 +9035,29 @@
         },
         "recipe": {
             "sha256": "0f226l67bqqc6m8wb97m7lkxvwrfbw74b1riasirca1anzjl8jfx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -9015,7 +9068,7 @@
         },
         "recipe": {
             "sha256": "06fy4aiflsynnybbrahfcmg0swxrfnwn48gr8ly3sqfpc037h2f3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151029.450",
         "deps": [
@@ -9032,7 +9085,7 @@
         },
         "recipe": {
             "sha256": "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150220.1713",
         "deps": []
@@ -9047,7 +9100,7 @@
         },
         "recipe": {
             "sha256": "1wsfnmmbzzyggzip66vr38yyzy27blxp91wx97bafj7jpg5cyhzw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140413.1625",
         "deps": []
@@ -9062,7 +9115,7 @@
         },
         "recipe": {
             "sha256": "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151205.816",
         "deps": []
@@ -9075,7 +9128,7 @@
         },
         "recipe": {
             "sha256": "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.659",
         "deps": []
@@ -9090,7 +9143,7 @@
         },
         "recipe": {
             "sha256": "0sn5a644zm165li44yffcpcai8bhl3yfvqcljghlwaa0w45sc9im",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150716.824",
         "deps": []
@@ -9105,7 +9158,7 @@
         },
         "recipe": {
             "sha256": "0f5qwv4f8gn5nxsqn57bbb3y0w5whjvhv3pls88d5n68lkd1k4si",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140730.447",
         "deps": []
@@ -9120,7 +9173,7 @@
         },
         "recipe": {
             "sha256": "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151009.2256",
         "deps": [
@@ -9140,7 +9193,7 @@
         },
         "recipe": {
             "sha256": "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141230.738",
         "deps": []
@@ -9155,7 +9208,7 @@
         },
         "recipe": {
             "sha256": "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151110.2143",
         "deps": []
@@ -9170,7 +9223,7 @@
         },
         "recipe": {
             "sha256": "0n9d23sfcmkjfqlm80vrgf856wy08ak4n4rk0z7vadq07yj46zxh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140619.1102",
         "deps": []
@@ -9185,7 +9238,7 @@
         },
         "recipe": {
             "sha256": "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.1145",
         "deps": [
@@ -9197,6 +9250,21 @@
             "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",
@@ -9206,7 +9274,7 @@
         },
         "recipe": {
             "sha256": "15njmanpj3qb8ic3k4sbrngqnsg85lvlj32dmii3y9bpgvis3k6f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110112.1907",
         "deps": []
@@ -9221,7 +9289,7 @@
         },
         "recipe": {
             "sha256": "0r693056wykg4bs7inbfzfniyawmb91igk6kjjpq3njk0v84y1sj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150707.1044",
         "deps": [
@@ -9238,7 +9306,7 @@
         },
         "recipe": {
             "sha256": "17wghm797np4hlidf3wwb47w4klwc6qyk6ry1z05psl3nykws1g7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130423.1048",
         "deps": [
@@ -9255,7 +9323,7 @@
         },
         "recipe": {
             "sha256": "1gp523w11f0aa8mbrb8z6ykqmy6ihvnfs00ff906gdmjx5kk16sr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120406.1551",
         "deps": []
@@ -9270,7 +9338,7 @@
         },
         "recipe": {
             "sha256": "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130907.332",
         "deps": []
@@ -9285,7 +9353,7 @@
         },
         "recipe": {
             "sha256": "0za35sdwwav81wpk4jjqh56icaswwxxyg3bqqp0qiz24llb5ln1w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150105.1636",
         "deps": []
@@ -9300,7 +9368,7 @@
         },
         "recipe": {
             "sha256": "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121001.2245",
         "deps": []
@@ -9310,12 +9378,12 @@
             "tag": "fetchFromGitHub",
             "owner": "HKey",
             "repo": "keyset",
-            "sha256": "1i17hm00ba7kf23cgb15hmxn0dgwmf00a5awqn5p76kfzf1ashpy",
-            "rev": "727661420ce4b2c67c2dc6188d2822c22761904a"
+            "sha256": "1kkp3frsk644djmdwxq3l1m88690gch3g8pijlzv566xrwkd903j",
+            "rev": "0a186c3316fda5baa72ae1fdf50c31e00761cc21"
         },
         "recipe": {
             "sha256": "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150219.2330",
         "deps": [
@@ -9328,12 +9396,12 @@
             "tag": "fetchFromGitHub",
             "owner": "editorconfig",
             "repo": "editorconfig-emacs",
-            "sha256": "0af6r0qn6gy3ww5cf3cvvbwyqpvx5xv08gxkjsj92z9h2x5rfz7f",
-            "rev": "301d67b26098d048ff7235c0878252e80becc7e0"
+            "sha256": "04sflhamh5b9gxllfhcqdim02x6cb9xid39al2lisb8z4xywch68",
+            "rev": "5132b7a9441af76196ba3e62d73a0bb415853e4f"
         },
         "recipe": {
             "sha256": "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.1035",
         "deps": [
@@ -9350,7 +9418,7 @@
         },
         "recipe": {
             "sha256": "0fg313mx9jz92lf9lr5apvma9ixfz02dvyzw1phsgzawi7hai264",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131031.1832",
         "deps": [
@@ -9367,7 +9435,7 @@
         },
         "recipe": {
             "sha256": "13giasg8lh5968plva449ki9nc3478a63700f8c0yghnwjb77asw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130609.443",
         "deps": [
@@ -9382,7 +9450,7 @@
         },
         "recipe": {
             "sha256": "0vgxqyzl7jw2j96rmjw75b5lmjwrvzajrdvfyabss4xmv96dy2r3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150519.1147",
         "deps": []
@@ -9397,7 +9465,7 @@
         },
         "recipe": {
             "sha256": "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140729.603",
         "deps": [
@@ -9415,7 +9483,7 @@
         },
         "recipe": {
             "sha256": "0fwn6w7s61c08z0d8z3awclqrhszia9is30gm2kx4hwr9dhhwh63",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151128.305",
         "deps": [
@@ -9432,7 +9500,7 @@
         },
         "recipe": {
             "sha256": "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140927.29",
         "deps": []
@@ -9445,7 +9513,7 @@
         },
         "recipe": {
             "sha256": "1v6dsph18rqfbvda2c25mqgdwap2a4zrg6qqq57n205zprpcwxc0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150509.1607",
         "deps": [
@@ -9462,7 +9530,7 @@
         },
         "recipe": {
             "sha256": "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150208.2015",
         "deps": []
@@ -9475,7 +9543,7 @@
         },
         "recipe": {
             "sha256": "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.627",
         "deps": []
@@ -9490,7 +9558,7 @@
         },
         "recipe": {
             "sha256": "1l7jw8sx2llbzp3sg5755qdhhyq8jdaggxzzn7icjxxrmj1ji6ii",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130126.1823",
         "deps": []
@@ -9505,7 +9573,7 @@
         },
         "recipe": {
             "sha256": "05pzh99zfl8n3p6lxdd9abr52m24hqcb105458i1cy0ra840bf4d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150325.918",
         "deps": [
@@ -9522,7 +9590,7 @@
         },
         "recipe": {
             "sha256": "10cxajyws5rwk62i4vk26c1ih0dq490kcfx7gijw38q3b5r1l8nr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150621.623",
         "deps": [
@@ -9539,7 +9607,7 @@
         },
         "recipe": {
             "sha256": "0xygk80mh05qssrbfj4h6k50pg557dyj6kzc2pdlmnr5r4gnzdn3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150119.1554",
         "deps": []
@@ -9554,7 +9622,7 @@
         },
         "recipe": {
             "sha256": "0w91qx955z67w2yh8kf86b58bb3b6s6490mmbky8467knf2q83qz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140707.720",
         "deps": [
@@ -9572,7 +9640,7 @@
         },
         "recipe": {
             "sha256": "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141012.217",
         "deps": []
@@ -9587,7 +9655,7 @@
         },
         "recipe": {
             "sha256": "1cq5rz2w79bj185va7y13x7bciihrpsvyxwk6msmcxb4g86s9phv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151021.334",
         "deps": [
@@ -9604,7 +9672,7 @@
         },
         "recipe": {
             "sha256": "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.853",
         "deps": [
@@ -9623,7 +9691,7 @@
         },
         "recipe": {
             "sha256": "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151022.1950",
         "deps": [
@@ -9636,14 +9704,14 @@
             "tag": "fetchFromGitHub",
             "owner": "chrisbarrett",
             "repo": "skeletor.el",
-            "sha256": "1f2yrm7kac98gfwbzlszcimnmp9cjv4k0aj8yidh7r0jn1xv45f8",
-            "rev": "253b89e199d0251e3eeb6b268fe60a3337fdf5bb"
+            "sha256": "0kbgxjfdf88h7hfds1kbdxx84wvkvy773r98ym1fzfm54m2kddvq",
+            "rev": "8dffccd773d6c8e73ea3d9c1de689634cbf427d4"
         },
         "recipe": {
             "sha256": "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151212.10",
+        "version": "20151220.2254",
         "deps": [
             "cl-lib",
             "dash",
@@ -9663,7 +9731,7 @@
         },
         "recipe": {
             "sha256": "1axwrvbc3xl1ixhh72bii3hhbi9d96y6i1my1rpvwqyd6f7wb2cf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150502.1528",
         "deps": []
@@ -9673,14 +9741,14 @@
             "tag": "fetchFromGitHub",
             "owner": "abo-abo",
             "repo": "swiper",
-            "sha256": "021rl53d7qmrkg0l3z19khfznj60bf45907dz1ypgbk6blakbk8q",
-            "rev": "8306be11c84a23e0ab3bcdd36cab1e5c16df8fbe"
+            "sha256": "1262k48ky88m3jgdryyxm9dqzsd2lc17vcra93lp3yrr6iqn55dl",
+            "rev": "d74fab4a5b98910bd09956d3cb9b3376d6287840"
         },
         "recipe": {
             "sha256": "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151207.519",
+        "version": "20151227.301",
         "deps": [
             "emacs",
             "swiper"
@@ -9696,13 +9764,32 @@
         },
         "recipe": {
             "sha256": "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -9713,7 +9800,7 @@
         },
         "recipe": {
             "sha256": "10gsbg880jbvxs4291vi2ww30ird2f313lbgcb11lswivmhrmd1r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140929.1318",
         "deps": []
@@ -9728,7 +9815,7 @@
         },
         "recipe": {
             "sha256": "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150106.744",
         "deps": []
@@ -9743,7 +9830,7 @@
         },
         "recipe": {
             "sha256": "1c8vdc58i0k7vvanwhckfc31226d3rb5xq77lh9ydgnd4i97gq2w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151009.1531",
         "deps": [
@@ -9760,7 +9847,7 @@
         },
         "recipe": {
             "sha256": "0938b29cqapid9v9q4w2jwh8kdb0p70qwzy9xm2nxaairm7436d6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150729.2110",
         "deps": []
@@ -9775,7 +9862,7 @@
         },
         "recipe": {
             "sha256": "1z42kcwcyinjay65mv042ijh4xfaaiyri368g0sjw0fflsg0ikcr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141227.1530",
         "deps": [
@@ -9793,7 +9880,7 @@
         },
         "recipe": {
             "sha256": "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150817.1210",
         "deps": [
@@ -9812,7 +9899,7 @@
         },
         "recipe": {
             "sha256": "11ss5x9sxgxp1wx2r1m0vsp5z5qm8m4ww20ybr6bqjw0a1gax561",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131110.741",
         "deps": [
@@ -9831,7 +9918,7 @@
         },
         "recipe": {
             "sha256": "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150814.236",
         "deps": [
@@ -9849,7 +9936,7 @@
         },
         "recipe": {
             "sha256": "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120928.1545",
         "deps": []
@@ -9864,7 +9951,7 @@
         },
         "recipe": {
             "sha256": "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151130.605",
         "deps": [
@@ -9882,7 +9969,7 @@
         },
         "recipe": {
             "sha256": "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140205.2151",
         "deps": []
@@ -9897,7 +9984,7 @@
         },
         "recipe": {
             "sha256": "0kyhmw25cn10b4jv2yx7bvp8zkwcswiidpk4amyaisw25820gkv1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150719.842",
         "deps": [
@@ -9913,7 +10000,7 @@
         },
         "recipe": {
             "sha256": "08sl7i7cy22nd1jijc5l7lp75k9z83gfr8q41n72l0vxrpdasc9w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150908.1438",
         "deps": []
@@ -9928,7 +10015,7 @@
         },
         "recipe": {
             "sha256": "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": []
@@ -9942,9 +10029,9 @@
         },
         "recipe": {
             "sha256": "0myv7sns9ajyr7fzn6kd8a64pfapjdksgby5ilh9mr99imm8dcfv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151209.1748",
+        "version": "20140513.1941",
         "deps": [
             "stem",
             "w3m"
@@ -9960,7 +10047,7 @@
         },
         "recipe": {
             "sha256": "0khiddpsywpv9qvynpfdmybd80lbrhm68j3py6ranxlv7p79j9dx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150719.1431",
         "deps": [
@@ -9977,7 +10064,7 @@
         },
         "recipe": {
             "sha256": "16fv0hpwcjw1771zlbgznph0fix9fbm6yqj2rcz1f9l26iih6apz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.1640",
         "deps": [
@@ -9994,7 +10081,7 @@
         },
         "recipe": {
             "sha256": "1yp3p0dzhmqrd0krqii3x79k4zc3p59148cijhk6my4n1xqnhs69",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141115.143",
         "deps": []
@@ -10009,7 +10096,7 @@
         },
         "recipe": {
             "sha256": "03qa79ip0gqinj1kk898lcvixk98hf6gknz0yc2fnqcrm642k2vs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150220.747",
         "deps": []
@@ -10024,7 +10111,7 @@
         },
         "recipe": {
             "sha256": "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141120.149",
         "deps": []
@@ -10039,7 +10126,7 @@
         },
         "recipe": {
             "sha256": "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140626.1616",
         "deps": [
@@ -10056,7 +10143,7 @@
         },
         "recipe": {
             "sha256": "127bzpm1cz103f1pb860yqrh7mr0rdaivrm9p6ssd01kchl9nskp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150628.1842",
         "deps": []
@@ -10071,7 +10158,7 @@
         },
         "recipe": {
             "sha256": "08yw04wmbgbbr60i638m0rspfwn3cp47ky5ssgjcgcmmdgg9yfvy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.54",
         "deps": []
@@ -10086,7 +10173,7 @@
         },
         "recipe": {
             "sha256": "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150721.1854",
         "deps": [
@@ -10105,7 +10192,7 @@
         },
         "recipe": {
             "sha256": "07wcnh3jmp2gi9xhd3d8i2n0pr2g9kav497nnz94i85awhzf8fi4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130620.1446",
         "deps": [
@@ -10120,7 +10207,7 @@
         },
         "recipe": {
             "sha256": "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20081128.906",
         "deps": []
@@ -10135,7 +10222,7 @@
         },
         "recipe": {
             "sha256": "0pzark1db9k2pavd5sn89a28gd9j5jlkx3wkhwfzln3y5c1wnvdk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140902.1602",
         "deps": [
@@ -10152,7 +10239,7 @@
         },
         "recipe": {
             "sha256": "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141203.1224",
         "deps": [
@@ -10169,7 +10256,7 @@
         },
         "recipe": {
             "sha256": "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.1636",
         "deps": []
@@ -10184,7 +10271,7 @@
         },
         "recipe": {
             "sha256": "11jdj8kd401q0y8bbyyn72f27f51bckqid10dnh64z8w7hv59cw6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140310.1100",
         "deps": [
@@ -10201,7 +10288,7 @@
         },
         "recipe": {
             "sha256": "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151212.2333",
         "deps": []
@@ -10216,7 +10303,7 @@
         },
         "recipe": {
             "sha256": "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.1257",
         "deps": []
@@ -10231,7 +10318,7 @@
         },
         "recipe": {
             "sha256": "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150105.705",
         "deps": []
@@ -10246,7 +10333,7 @@
         },
         "recipe": {
             "sha256": "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151127.821",
         "deps": []
@@ -10261,7 +10348,7 @@
         },
         "recipe": {
             "sha256": "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140604.1147",
         "deps": [
@@ -10279,7 +10366,7 @@
         },
         "recipe": {
             "sha256": "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130720.533",
         "deps": [
@@ -10296,7 +10383,7 @@
         },
         "recipe": {
             "sha256": "1ibcsky6la3l7gawpgx814w1acjf73b68i6wbb4p6saxhwg6adik",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121129.1452",
         "deps": []
@@ -10309,7 +10396,7 @@
         },
         "recipe": {
             "sha256": "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1534",
         "deps": [
@@ -10326,7 +10413,7 @@
         },
         "recipe": {
             "sha256": "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150405.1808",
         "deps": [
@@ -10344,7 +10431,7 @@
         },
         "recipe": {
             "sha256": "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150608.1923",
         "deps": [
@@ -10361,7 +10448,7 @@
         },
         "recipe": {
             "sha256": "1dkn9qa3dv2im11lm19wfh5jwwwp42sv7jc0p6qg35rhzwdpfg03",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131014.129",
         "deps": [
@@ -10379,7 +10466,7 @@
         },
         "recipe": {
             "sha256": "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130219.419",
         "deps": []
@@ -10394,7 +10481,7 @@
         },
         "recipe": {
             "sha256": "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130520.1155",
         "deps": []
@@ -10409,7 +10496,7 @@
         },
         "recipe": {
             "sha256": "1a65b680741cx4cyyizyl2c3bss36x3j2m9sh9hjc87xrzarg0s3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150528.1536",
         "deps": [
@@ -10427,7 +10514,7 @@
         },
         "recipe": {
             "sha256": "07nfgp6jlrb9wxqy835j79i4g88714zndidkda84z16qn2y901a9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151005.2107",
         "deps": []
@@ -10442,7 +10529,7 @@
         },
         "recipe": {
             "sha256": "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140302.613",
         "deps": [
@@ -10461,7 +10548,7 @@
         },
         "recipe": {
             "sha256": "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.1314",
         "deps": [
@@ -10483,7 +10570,7 @@
         },
         "recipe": {
             "sha256": "0mrf7p420rmjm8ydwc5blpxr6299pdg3sy3jwz2zz0420gkp0ihl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20080502.1152",
         "deps": []
@@ -10498,7 +10585,7 @@
         },
         "recipe": {
             "sha256": "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150628.2133",
         "deps": [
@@ -10518,7 +10605,7 @@
         },
         "recipe": {
             "sha256": "02fv25d76rvxqzxs48j4lkrifdhqayyb1in05ryyz2pk9x5hbax9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131122.1527",
         "deps": []
@@ -10531,7 +10618,7 @@
         },
         "recipe": {
             "sha256": "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130605.1239",
         "deps": []
@@ -10546,7 +10633,7 @@
         },
         "recipe": {
             "sha256": "1avpik06cmi4h6v6039c64b4zw1r1nsg3nrryl254gl881pysfxg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.139",
         "deps": []
@@ -10561,7 +10648,7 @@
         },
         "recipe": {
             "sha256": "1b3n8h39m85inxsqvzwgb9fqnqn2sgib91hrisn1gpgfyjydzkr7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140816.1208",
         "deps": [
@@ -10578,7 +10665,7 @@
         },
         "recipe": {
             "sha256": "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150516.355",
         "deps": []
@@ -10593,7 +10680,7 @@
         },
         "recipe": {
             "sha256": "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150531.807",
         "deps": [
@@ -10611,7 +10698,7 @@
         },
         "recipe": {
             "sha256": "1rgg7j34ka0nj1yjl688asim07bbz4aavh67kly6dzzwndr0nw8c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130923.1317",
         "deps": []
@@ -10626,7 +10713,7 @@
         },
         "recipe": {
             "sha256": "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150301.513",
         "deps": [
@@ -10640,12 +10727,12 @@
             "tag": "fetchFromGitHub",
             "owner": "dgtized",
             "repo": "occur-context-resize.el",
-            "sha256": "1y67mfkmzjdwnah6knc1v9rxcvnzi3dxw9f5gaz4layy7ir61b8f",
-            "rev": "e64898124528244134bd125aaa39e396406b01e8"
+            "sha256": "161lsgpzlrfzsn3pzcwhwj46ns088frjm0dps9jbc4bzqbpsd293",
+            "rev": "78263b8907569695773e9acaa375ce0cb3245f10"
         },
         "recipe": {
             "sha256": "0sp5v4rwqgqdj26gdkrmjvkmbp4g6jq4lrn2c3zm8s2gq0s3l6ri",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140826.1449",
         "deps": []
@@ -10660,7 +10747,7 @@
         },
         "recipe": {
             "sha256": "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.1418",
         "deps": []
@@ -10675,7 +10762,7 @@
         },
         "recipe": {
             "sha256": "1k8cbiayajbzwkm0s0kyin0qpq9yhymidz0srs4hbvsnb6hvp234",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150403.1804",
         "deps": []
@@ -10690,7 +10777,7 @@
         },
         "recipe": {
             "sha256": "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.308",
         "deps": [
@@ -10707,7 +10794,7 @@
         },
         "recipe": {
             "sha256": "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150217.632",
         "deps": []
@@ -10717,14 +10804,14 @@
             "tag": "fetchFromGitHub",
             "owner": "josteink",
             "repo": "csharp-mode",
-            "sha256": "1xnfn7ag9xm1980h8hssac9n3ng6rf7ffqb67vjbjw14gb7vxd0l",
-            "rev": "a553430c3f55b12db3af3da14dd0a1b45e3277fb"
+            "sha256": "1bp4bsghvmar6kvwiarxz4fnh0bikkyjnw30x796d1hi7jdk3ll9",
+            "rev": "b11fcda620aed46fbd4e702ee565448af26a1b25"
         },
         "recipe": {
             "sha256": "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.21",
+        "version": "20151226.1524",
         "deps": []
     },
     "evil-avy": {
@@ -10737,7 +10824,7 @@
         },
         "recipe": {
             "sha256": "1hc96dd78yxgr8cs9sk9y1i5h1qnyk110vlb3wnlxv1hwn92qvrd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150908.248",
         "deps": [
@@ -10757,7 +10844,7 @@
         },
         "recipe": {
             "sha256": "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151128.2032",
         "deps": [
@@ -10776,7 +10863,7 @@
         },
         "recipe": {
             "sha256": "0r7pc2ypd1ydqrnvcqmsg69rm047by7k0zhm563538ra82597wnm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140802.642",
         "deps": [
@@ -10793,7 +10880,7 @@
         },
         "recipe": {
             "sha256": "1zi266cm5hpfhnnnzbsm4s1w0lsy4sj5z8d020y0cg57yn2v62dv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.706",
         "deps": [
@@ -10810,7 +10897,7 @@
         },
         "recipe": {
             "sha256": "1i3kafj3m7iij5mr0vhg45zdnkl9pg9ndrq0b0i3k3mw7d5siq7w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150621.2242",
         "deps": [
@@ -10827,7 +10914,7 @@
         },
         "recipe": {
             "sha256": "0lq7fvqc0isv49lcm7ql6prc3hpcj5cx4kf8f4gcnfv5k8159cq9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151118.1727",
         "deps": [
@@ -10844,7 +10931,7 @@
         },
         "recipe": {
             "sha256": "1glpcwcyndyn683q9mg99hr0h3l8pz7rrhbnfak01v826d5cnk9g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150121.1957",
         "deps": [
@@ -10861,7 +10948,7 @@
         },
         "recipe": {
             "sha256": "0pyg90izdrb9mvpbz9nx21mp8m3svqjnz1jr8i7wqgfjxsxdklxj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150812.258",
         "deps": []
@@ -10876,7 +10963,7 @@
         },
         "recipe": {
             "sha256": "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131203.2225",
         "deps": []
@@ -10891,7 +10978,7 @@
         },
         "recipe": {
             "sha256": "172qnprmfliic3rszzg3g7q015i3dchd23skrbdikg0kxj5c57lf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140709.2004",
         "deps": []
@@ -10906,7 +10993,7 @@
         },
         "recipe": {
             "sha256": "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130302.536",
         "deps": [
@@ -10924,7 +11011,7 @@
         },
         "recipe": {
             "sha256": "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.735",
         "deps": [
@@ -10942,7 +11029,7 @@
         },
         "recipe": {
             "sha256": "1i5lxpf3wmqnqj9mzgcn4gp1gjxp737awrzl1dml5wnarbbj4fs9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140306.850",
         "deps": []
@@ -10957,7 +11044,7 @@
         },
         "recipe": {
             "sha256": "1sqi0a2dsqgmabkrncxiyrhibyryyy25d11b15ybhlngd05wqbx2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130913.124",
         "deps": [
@@ -10974,7 +11061,7 @@
         },
         "recipe": {
             "sha256": "1xmi1gjgayd5xbm3xx721xv57ns3x56r8ps94zpwyf2znpdchqfy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20101118.1524",
         "deps": []
@@ -10989,7 +11076,7 @@
         },
         "recipe": {
             "sha256": "0giix1rv2jrmdxyg990w90ivl8bvgbbvah6nkpj7gb6vbnm15ldz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150602.2322",
         "deps": [
@@ -11008,7 +11095,7 @@
         },
         "recipe": {
             "sha256": "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150723.935",
         "deps": [
@@ -11025,7 +11112,7 @@
         },
         "recipe": {
             "sha256": "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151204.617",
         "deps": [
@@ -11046,7 +11133,7 @@
         },
         "recipe": {
             "sha256": "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150906.847",
         "deps": [
@@ -11064,7 +11151,7 @@
         },
         "recipe": {
             "sha256": "0zdr29793gg229r47yjb3plagxc9pszqyy4sx81ffp3rpdf0nlbh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120304.1222",
         "deps": []
@@ -11079,7 +11166,7 @@
         },
         "recipe": {
             "sha256": "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.1954",
         "deps": []
@@ -11094,7 +11181,7 @@
         },
         "recipe": {
             "sha256": "0j95g7fps28xhlrikkg61xgpbpf52xb56swmns2qdib6x1xzd6rh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151025.130",
         "deps": [
@@ -11111,7 +11198,7 @@
         },
         "recipe": {
             "sha256": "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140304.1859",
         "deps": []
@@ -11126,7 +11213,7 @@
         },
         "recipe": {
             "sha256": "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151025.2000",
         "deps": []
@@ -11141,7 +11228,7 @@
         },
         "recipe": {
             "sha256": "00ghp677qgb5clxhdjarfl8ab3mbp6v7yfsldm9bn0s14lyaq5pm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151112.1427",
         "deps": []
@@ -11156,7 +11243,7 @@
         },
         "recipe": {
             "sha256": "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140720.546",
         "deps": [
@@ -11173,7 +11260,7 @@
         },
         "recipe": {
             "sha256": "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121026.1618",
         "deps": []
@@ -11188,7 +11275,7 @@
         },
         "recipe": {
             "sha256": "12y9pg1g4i1ghnjvgfdpa6p84h4bcqrr23y9bazwl9n6aj20cmxk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140218.2004",
         "deps": []
@@ -11198,14 +11285,14 @@
             "tag": "fetchFromGitHub",
             "owner": "fniessen",
             "repo": "emacs-leuven-theme",
-            "sha256": "18nyb8bb16br2qpif33gz51sqzl3afh9mavzxrcqi40bgmfzpj0n",
-            "rev": "aeea1054e55a4b9f8318bc95cf97c51b04387fa0"
+            "sha256": "1kbvpf3wvma6r2gxd0zmz1j6clgr3xfsvsrbh900j5k5f1w8r8jx",
+            "rev": "94d12f81c5103e01b57f125581c5337ef883433c"
         },
         "recipe": {
             "sha256": "0pm5majr9cmj6g4zr7vb55ypk9fmfbvxx78mgmgignknbasq9g9a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151105.952",
+        "version": "20151218.1750",
         "deps": []
     },
     "snippet": {
@@ -11218,7 +11305,7 @@
         },
         "recipe": {
             "sha256": "1lgpw69k5a82y70j7nximdj0bl5nzr4jhjr5fkx1cvz8hhvgdz6j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130210.1715",
         "deps": []
@@ -11233,7 +11320,7 @@
         },
         "recipe": {
             "sha256": "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151217.744",
         "deps": [
@@ -11245,12 +11332,12 @@
             "tag": "fetchFromGitHub",
             "owner": "OCamlPro",
             "repo": "ocp-indent",
-            "sha256": "0r44bh9nd2f6r9vz4xzv6mri91lc4276znaj29l974q0f7i3b3ad",
-            "rev": "2d79c735ddff135ba29309af9f9e8a976a94e312"
+            "sha256": "0ydmjgxzdxbrzfz3zal1m3hnlxanldx8japapafpa9k8fm02rgnr",
+            "rev": "930f05acdf3ca6783e48a4729761996d27c8c009"
         },
         "recipe": {
             "sha256": "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.332",
         "deps": []
@@ -11265,7 +11352,7 @@
         },
         "recipe": {
             "sha256": "13xjnawir9i83j2abxxkl12gz3wapgbk56cps3qyfgql02bfk2rw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120910.351",
         "deps": []
@@ -11280,7 +11367,7 @@
         },
         "recipe": {
             "sha256": "043gwz583pa1wv84fl634p1v86lcsldsw7qkjbm6y678q5mms0m6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130619.1704",
         "deps": []
@@ -11295,7 +11382,7 @@
         },
         "recipe": {
             "sha256": "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151027.236",
         "deps": [
@@ -11311,7 +11398,7 @@
         },
         "recipe": {
             "sha256": "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140306.845",
         "deps": []
@@ -11325,7 +11412,7 @@
         },
         "recipe": {
             "sha256": "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151026.1433",
         "deps": []
@@ -11340,7 +11427,7 @@
         },
         "recipe": {
             "sha256": "1r1yisjnqxl9llpf91rwqp4q47jc4qp32xnkl8wzsgr0r2qf5yk2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150505.1350",
         "deps": [
@@ -11357,7 +11444,7 @@
         },
         "recipe": {
             "sha256": "1lcwslkki9s15xr2dmh2iic4ax8ia0j20hjnjmkv612wv04b806v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150218.1229",
         "deps": [
@@ -11374,7 +11461,7 @@
         },
         "recipe": {
             "sha256": "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141223.1414",
         "deps": [
@@ -11393,7 +11480,7 @@
         },
         "recipe": {
             "sha256": "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.914",
         "deps": [
@@ -11412,7 +11499,7 @@
         },
         "recipe": {
             "sha256": "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151031.2126",
         "deps": [
@@ -11430,7 +11517,7 @@
         },
         "recipe": {
             "sha256": "1p0ydbrff9197sann3s0d7hpav7r9g461w4llncafmy31w7m1dn6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150106.839",
         "deps": []
@@ -11445,7 +11532,7 @@
         },
         "recipe": {
             "sha256": "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150920.1324",
         "deps": [
@@ -11462,7 +11549,7 @@
         },
         "recipe": {
             "sha256": "1mvw7w23yfbfmhzj6wimslbryb0gppryw24ac0wh4fzl9rdcma4r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141128.43",
         "deps": [
@@ -11480,7 +11567,7 @@
         },
         "recipe": {
             "sha256": "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130207.1509",
         "deps": []
@@ -11493,7 +11580,7 @@
         },
         "recipe": {
             "sha256": "0cf5zgkxagvka5v6scgyxqx4mz1n7lxbynn3gl2a4s9s64jycsy6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131210.1222",
         "deps": []
@@ -11508,7 +11595,7 @@
         },
         "recipe": {
             "sha256": "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151107.2036",
         "deps": [
@@ -11526,7 +11613,7 @@
         },
         "recipe": {
             "sha256": "0s0m2lj40php7bc2i3fy9ikd5rmx4v7zbxfkp9vadmlc5s7w25gf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150923.1023",
         "deps": [
@@ -11545,7 +11632,7 @@
         },
         "recipe": {
             "sha256": "0sry4zvr8xmzyygf2m5dms52srkd1apj3i7a3aj23qa8jvndx8vr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120912.24",
         "deps": []
@@ -11560,7 +11647,7 @@
         },
         "recipe": {
             "sha256": "0vswjcs24f3mdyw6ai7p21ab8pdn327lr2d6css0a5nrg539cn2g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140513.1316",
         "deps": []
@@ -11573,7 +11660,7 @@
         },
         "recipe": {
             "sha256": "0xsf3w5h4g7wigrv5kbys7lf9lfv2cab5ch320p74l3l3r2lj9wz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100119.1548",
         "deps": []
@@ -11588,7 +11675,7 @@
         },
         "recipe": {
             "sha256": "0hfrzwjlgynk3mydrpmic9mckak37r22fdglrfas6zdihgrg152f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140412.812",
         "deps": [
@@ -11606,7 +11693,7 @@
         },
         "recipe": {
             "sha256": "11zhg3y9fb5mq67fwsnjrql9mnwkp3hwib7fpllb3yyf2yywc8zp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151120.1645",
         "deps": [
@@ -11624,7 +11711,7 @@
         },
         "recipe": {
             "sha256": "1rqvnv5nxlsyvsa5my1wpfm82sw21s7kfbg80vrjmxh0mwlyv4p9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140831.721",
         "deps": [
@@ -11642,7 +11729,7 @@
         },
         "recipe": {
             "sha256": "17adfmrhfks5f45ddr6ygjq870ac50vfzc5872ycv414zg0w4sa9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150820.908",
         "deps": []
@@ -11657,7 +11744,7 @@
         },
         "recipe": {
             "sha256": "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151108.622",
         "deps": [
@@ -11672,7 +11759,7 @@
         },
         "recipe": {
             "sha256": "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140808.1635",
         "deps": []
@@ -11687,7 +11774,7 @@
         },
         "recipe": {
             "sha256": "16vsf2cig9qjbh9s58zb5byjmyghxbsxpzpm5hyyrv251jap1jjn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120128.1501",
         "deps": []
@@ -11702,7 +11789,7 @@
         },
         "recipe": {
             "sha256": "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150219.18",
         "deps": [
@@ -11720,7 +11807,7 @@
         },
         "recipe": {
             "sha256": "10khhc6q0zjzrhsv4fgfdbs7qcwi1bgkwq4yqzidqcdndsailyh0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131117.414",
         "deps": []
@@ -11735,7 +11822,7 @@
         },
         "recipe": {
             "sha256": "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140805.1338",
         "deps": [
@@ -11752,7 +11839,7 @@
         },
         "recipe": {
             "sha256": "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150126.606",
         "deps": [
@@ -11769,7 +11856,7 @@
         },
         "recipe": {
             "sha256": "0182irlvk6nn71zk4j8xjgcqp4bxi7a2dbj44frrssy6018cd410",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151104.1252",
         "deps": [
@@ -11786,7 +11873,7 @@
         },
         "recipe": {
             "sha256": "0gyj48h5wgjawqq3j4hgk5a8d23nffmhd1q53kg7b9vfsda51hbw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131203.1437",
         "deps": []
@@ -11796,13 +11883,13 @@
             "tag": "fetchsvn",
             "url": "http://svn.ruby-lang.org/repos/ruby/trunk/misc/",
             "sha256": "0gl8wcnm7pidvd8zy3w5lzxqj0qxs9d932350ncgnmxwfsfzkdk7",
-            "rev": "53195"
+            "rev": "53351"
         },
         "recipe": {
             "sha256": "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150306.1959",
+        "version": "20091002.545",
         "deps": [
             "emacs",
             "ruby-mode"
@@ -11816,7 +11903,7 @@
         },
         "recipe": {
             "sha256": "0ybycprs5di9niai4hbmfq4xdacfgrzf1mwq1aj1hi53phl8l4di",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130131.120",
         "deps": []
@@ -11831,7 +11918,7 @@
         },
         "recipe": {
             "sha256": "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151204.619",
         "deps": [
@@ -11851,7 +11938,7 @@
         },
         "recipe": {
             "sha256": "05aja5xycb3kpmxyi234l50h98f5m1fil6ll4f2xkpxwv31ba5rb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151010.1229",
         "deps": []
@@ -11866,7 +11953,7 @@
         },
         "recipe": {
             "sha256": "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140217.1512",
         "deps": [
@@ -11887,7 +11974,7 @@
         },
         "recipe": {
             "sha256": "1ihkxd15kx5m5xb9yxwz8wqbmyk9iaskry9szzdz1j4gjlczb6hy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150128.1151",
         "deps": []
@@ -11902,7 +11989,7 @@
         },
         "recipe": {
             "sha256": "0926z3lxkmpxalpq7hj355cjzbgpdiw7z4s8xdrpa1pi818d35zf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150327.1218",
         "deps": [
@@ -11921,7 +12008,7 @@
         },
         "recipe": {
             "sha256": "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150607.1201",
         "deps": [
@@ -11938,7 +12025,7 @@
         },
         "recipe": {
             "sha256": "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150920.1013",
         "deps": []
@@ -11953,7 +12040,7 @@
         },
         "recipe": {
             "sha256": "1bx8l8wjxrkv949c73dp93knbn1iwnblcm8iw822mq2mgbgwsa7f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140902.1227",
         "deps": []
@@ -11966,7 +12053,7 @@
         },
         "recipe": {
             "sha256": "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20111222.1156",
         "deps": []
@@ -11981,7 +12068,7 @@
         },
         "recipe": {
             "sha256": "1v9zk7ycc8k1qk1cfs2y1knygl686msmlilqy5a7mh0w0z9f3a2i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130831.1155",
         "deps": [
@@ -11999,7 +12086,7 @@
         },
         "recipe": {
             "sha256": "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140814.1648",
         "deps": []
@@ -12014,7 +12101,7 @@
         },
         "recipe": {
             "sha256": "18kklfdlcg982pdrslh0xqa42h28f91bdm7q2zn890d6dcivp6bk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130731.1021",
         "deps": []
@@ -12029,7 +12116,7 @@
         },
         "recipe": {
             "sha256": "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130929.147",
         "deps": [
@@ -12045,7 +12132,7 @@
         },
         "recipe": {
             "sha256": "0vdd2cksiqbnxplqbpb16bcmp137fj3p9a7pa0622wx8vd5p0rkr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130130.1550",
         "deps": []
@@ -12060,7 +12147,7 @@
         },
         "recipe": {
             "sha256": "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150217.1149",
         "deps": [
@@ -12078,7 +12165,7 @@
         },
         "recipe": {
             "sha256": "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151118.851",
         "deps": [
@@ -12095,7 +12182,7 @@
         },
         "recipe": {
             "sha256": "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140810.234",
         "deps": []
@@ -12110,7 +12197,7 @@
         },
         "recipe": {
             "sha256": "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150905.438",
         "deps": []
@@ -12125,7 +12212,7 @@
         },
         "recipe": {
             "sha256": "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151031.2240",
         "deps": [
@@ -12142,7 +12229,7 @@
         },
         "recipe": {
             "sha256": "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150302.1048",
         "deps": []
@@ -12157,7 +12244,7 @@
         },
         "recipe": {
             "sha256": "1laz2ggqydnyr7b36ggb7sphlib79dhp7nszw42wssmv212v94cy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150430.1642",
         "deps": []
@@ -12172,7 +12259,7 @@
         },
         "recipe": {
             "sha256": "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141219.1829",
         "deps": []
@@ -12187,7 +12274,7 @@
         },
         "recipe": {
             "sha256": "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151125.1409",
         "deps": []
@@ -12201,7 +12288,7 @@
         },
         "recipe": {
             "sha256": "12y8qxxs04qzy09m734qg0857g4612qdswx2bh9jk7dp886fpd7p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130816.1554",
         "deps": []
@@ -12216,7 +12303,7 @@
         },
         "recipe": {
             "sha256": "0sx9cgyk56npjd6z78y9cldbvjl5ipl7k1nc1sylg1iggkbwxnqx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.1842",
         "deps": [
@@ -12233,7 +12320,7 @@
         },
         "recipe": {
             "sha256": "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150709.140",
         "deps": [
@@ -12250,7 +12337,7 @@
         },
         "recipe": {
             "sha256": "0llrvg6mhcsj5aascsndhbv99122zj32agxk1w6s8xn8ksk2i90b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140806.1125",
         "deps": [
@@ -12265,7 +12352,7 @@
         },
         "recipe": {
             "sha256": "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150630.1632",
         "deps": [
@@ -12282,7 +12369,7 @@
         },
         "recipe": {
             "sha256": "06ra50afjqac9ck1s9gaxy0sqxcb612wzd28s4q4imicqpgfxzjw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121113.700",
         "deps": []
@@ -12297,7 +12384,7 @@
         },
         "recipe": {
             "sha256": "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.49",
         "deps": [
@@ -12318,7 +12405,7 @@
         },
         "recipe": {
             "sha256": "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151118.109",
         "deps": [
@@ -12338,7 +12425,7 @@
         },
         "recipe": {
             "sha256": "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141207.1352",
         "deps": []
@@ -12353,7 +12440,7 @@
         },
         "recipe": {
             "sha256": "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151022.751",
         "deps": [
@@ -12370,7 +12457,7 @@
         },
         "recipe": {
             "sha256": "0hi09dj00h6g5r84jxglwkgbijhfxknx4mq5gcl5jzjis5affk8l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131117.455",
         "deps": [
@@ -12389,7 +12476,7 @@
         },
         "recipe": {
             "sha256": "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150505.932",
         "deps": [
@@ -12406,7 +12493,7 @@
         },
         "recipe": {
             "sha256": "12r01dyk55bs01jk0ab9f24lfvm63h8kvix223pii5y9890dr6ys",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150806.113",
         "deps": []
@@ -12421,7 +12508,7 @@
         },
         "recipe": {
             "sha256": "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140811.1609",
         "deps": [
@@ -12438,7 +12525,7 @@
         },
         "recipe": {
             "sha256": "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.35",
         "deps": []
@@ -12453,7 +12540,7 @@
         },
         "recipe": {
             "sha256": "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140717.2229",
         "deps": []
@@ -12468,7 +12555,7 @@
         },
         "recipe": {
             "sha256": "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151217.1029",
         "deps": [
@@ -12485,7 +12572,7 @@
         },
         "recipe": {
             "sha256": "06xjg1q8b2fwfhfmdkb76bw2id8pgqc61fmwlgri5746jgdmd7nf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151119.2145",
         "deps": [
@@ -12500,7 +12587,7 @@
         },
         "recipe": {
             "sha256": "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1833",
         "deps": []
@@ -12515,7 +12602,7 @@
         },
         "recipe": {
             "sha256": "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150223.754",
         "deps": []
@@ -12530,7 +12617,7 @@
         },
         "recipe": {
             "sha256": "1qymk5ypv6ljk8x49z4jcifz7c2dqcg5181f4hqh67g1byvj2277",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150708.937",
         "deps": []
@@ -12545,7 +12632,7 @@
         },
         "recipe": {
             "sha256": "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.1433",
         "deps": []
@@ -12560,7 +12647,7 @@
         },
         "recipe": {
             "sha256": "0437qd7q9i32pmhxaz3vi2dnfpj4nddmzgnqpwsgl28slhjw2hv8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131023.1351",
         "deps": [
@@ -12578,7 +12665,7 @@
         },
         "recipe": {
             "sha256": "14ijb8q4s846984h102h72ij713v5bj3k2vfdvr94gw1f0iya2yg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140216.1046",
         "deps": [
@@ -12595,7 +12682,7 @@
         },
         "recipe": {
             "sha256": "0hbqdrw6x25b331qhbg3yaaa45c2b896wknsjm0a1kg142klq229",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150506.2327",
         "deps": []
@@ -12610,7 +12697,7 @@
         },
         "recipe": {
             "sha256": "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150623.655",
         "deps": [
@@ -12630,7 +12717,7 @@
         },
         "recipe": {
             "sha256": "0hr5a3s0ij4hvn424v885z7pcs62yqm9mamw5b096hgjxgjf6ylm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130920.1259",
         "deps": []
@@ -12645,7 +12732,7 @@
         },
         "recipe": {
             "sha256": "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150811.1908",
         "deps": [
@@ -12664,7 +12751,7 @@
         },
         "recipe": {
             "sha256": "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141123.1516",
         "deps": []
@@ -12679,7 +12766,7 @@
         },
         "recipe": {
             "sha256": "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130228.408",
         "deps": []
@@ -12694,7 +12781,7 @@
         },
         "recipe": {
             "sha256": "0v3njygqkcrwjkf7jrqmza6bwk2jp3956cx1qvf9ph7dfxsq7rn3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150706.24",
         "deps": [
@@ -12706,14 +12793,14 @@
             "tag": "fetchFromGitHub",
             "owner": "nlamirault",
             "repo": "sift.el",
-            "sha256": "0v4glcpxp812554dggimv6srccwg7031iys4j7c0b97cm279jyhi",
-            "rev": "a757745492124e5a021a4cc7e62d5349c21213c6"
+            "sha256": "0mlwv66528927gf9x8jx9ifqbj1bhid21lrcm5gjym92lvpvps4p",
+            "rev": "99218553b5979b3431f188906cf3f50265ad72a0"
         },
         "recipe": {
             "sha256": "13y6nmc317hljch3x8f80jg5sb57imm7w9kdn7ybw59g55zxzz8q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151114.1123",
+        "version": "20151223.140",
         "deps": []
     },
     "moz": {
@@ -12726,7 +12813,7 @@
         },
         "recipe": {
             "sha256": "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150805.1206",
         "deps": []
@@ -12741,7 +12828,7 @@
         },
         "recipe": {
             "sha256": "0rib50hja33qk8dmw5i62gaxhx7mscj2y0n25jmnds7k88ms8z19",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.615",
         "deps": [
@@ -12758,7 +12845,7 @@
         },
         "recipe": {
             "sha256": "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151001.1528",
         "deps": [
@@ -12777,7 +12864,7 @@
         },
         "recipe": {
             "sha256": "1305f1yg1mamyw3bkzrk5q3q58ihs8f5k9vjknsww5xvrzz3r1si",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141117.714",
         "deps": [
@@ -12794,7 +12881,7 @@
         },
         "recipe": {
             "sha256": "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150122.1432",
         "deps": []
@@ -12808,7 +12895,7 @@
         },
         "recipe": {
             "sha256": "01igm3cb0lncmcyy72mjf93byh42k2hvscqhg8r7iljbxm58460z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141210.627",
         "deps": []
@@ -12823,7 +12910,7 @@
         },
         "recipe": {
             "sha256": "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151104.2320",
         "deps": [
@@ -12843,7 +12930,7 @@
         },
         "recipe": {
             "sha256": "1f0iyvwq1kq3zfxx2v596cmah7jfk2a04g2rjllbgxxnzwms29z3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140905.1906",
         "deps": [
@@ -12860,7 +12947,7 @@
         },
         "recipe": {
             "sha256": "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.1415",
         "deps": [
@@ -12877,7 +12964,7 @@
         },
         "recipe": {
             "sha256": "1krn7zn2y8p51m8dxai5nbrwbdviz6zrjzz0kykya9cqz4n9dhln",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120118.2334",
         "deps": []
@@ -12892,7 +12979,7 @@
         },
         "recipe": {
             "sha256": "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150629.435",
         "deps": []
@@ -12907,7 +12994,7 @@
         },
         "recipe": {
             "sha256": "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141112.1915",
         "deps": []
@@ -12922,7 +13009,7 @@
         },
         "recipe": {
             "sha256": "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140731.726",
         "deps": [
@@ -12941,7 +13028,7 @@
         },
         "recipe": {
             "sha256": "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151217.2010",
         "deps": []
@@ -12956,7 +13043,7 @@
         },
         "recipe": {
             "sha256": "1jywn8wlqzc2mfylp0kbpzxv3kwzak3vxdbjabiawqv1m4bfpk5g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120904.1542",
         "deps": []
@@ -12970,8 +13057,8 @@
             "rev": "f39a36351e1e6f1105c9e32970e7502b77b0dbcd"
         },
         "recipe": {
-            "sha256": "1nqvlyklcqmdw2p7zf53jwrnz7nd7hl09nm20fbgw2dn0h1z9q30",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130607.129",
         "deps": [
@@ -12988,7 +13075,7 @@
         },
         "recipe": {
             "sha256": "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150603.647",
         "deps": []
@@ -13003,7 +13090,7 @@
         },
         "recipe": {
             "sha256": "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151025.1116",
         "deps": [
@@ -13021,7 +13108,7 @@
         },
         "recipe": {
             "sha256": "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140816.1244",
         "deps": []
@@ -13036,7 +13123,7 @@
         },
         "recipe": {
             "sha256": "1ax2w5yxscycjz90g4jdbhd64g9sipzxpfjs7gq3na77s5dcjzsq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150312.849",
         "deps": []
@@ -13051,7 +13138,7 @@
         },
         "recipe": {
             "sha256": "0h03aqgijrmisbgqga42zlb5yz4x3jn9jgr29rq8canyhayr3rk4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.1415",
         "deps": []
@@ -13066,7 +13153,7 @@
         },
         "recipe": {
             "sha256": "0qqismh6g2fvi45q2q52lq0n9nrh95wgamlsy5j4rx4syfgzxbrk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150501.1316",
         "deps": []
@@ -13076,12 +13163,12 @@
             "tag": "fetchFromGitHub",
             "owner": "yukihr",
             "repo": "emacs-pow",
-            "sha256": "1qizc9vh7lazs66s80avbf4whyrcinav07lpzva27yqb1gkmwap2",
-            "rev": "86f8c1cdea08a875adf9f68995647ffc4fe5b140"
+            "sha256": "1jzqav2lchr0ggckjq9rwlxwryi7m7xnmn8471zgiamd1h04ddqf",
+            "rev": "7c0b39a07069d8b0f6b21adf3b4e462944641ad9"
         },
         "recipe": {
             "sha256": "05wc4ylp0xjqbzrm046lcsv4aw2a6s2rfv1ra38bfr0dai6qrsrn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140420.306",
         "deps": [
@@ -13099,7 +13186,7 @@
         },
         "recipe": {
             "sha256": "1whajbwmz1v01dirv795bhvs27vq9dh0qmj10dk2xia7vhn42mgh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150804.1221",
         "deps": [
@@ -13117,7 +13204,7 @@
         },
         "recipe": {
             "sha256": "09xh41ayaha07fi5crk3c6pn17gwm3samsf6h71ldkywvz74kipv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131004.1844",
         "deps": []
@@ -13132,7 +13219,7 @@
         },
         "recipe": {
             "sha256": "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150916.2057",
         "deps": [
@@ -13150,7 +13237,7 @@
         },
         "recipe": {
             "sha256": "1y2qywldf8b8b0km1lcf74p0w6rd8gr86qcj7ikwhhbvd19dfglm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150702.816",
         "deps": [
@@ -13168,7 +13255,7 @@
         },
         "recipe": {
             "sha256": "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151027.1636",
         "deps": [
@@ -13188,7 +13275,7 @@
         },
         "recipe": {
             "sha256": "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140703.352",
         "deps": []
@@ -13201,7 +13288,7 @@
         },
         "recipe": {
             "sha256": "08zxzvj60v23b7d5q0hvgffm1jxq7lc5y9w22m6nv2fp29yadyiy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120426.2023",
         "deps": []
@@ -13216,7 +13303,7 @@
         },
         "recipe": {
             "sha256": "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151205.2330",
         "deps": [
@@ -13233,7 +13320,7 @@
         },
         "recipe": {
             "sha256": "0d36yradh37359fjk59s54hxkbh4qcc17sblj2ylcdyw7181iwfn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.508",
         "deps": []
@@ -13248,7 +13335,7 @@
         },
         "recipe": {
             "sha256": "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.55",
         "deps": [
@@ -13261,16 +13348,16 @@
     "scala-mode2": {
         "fetch": {
             "tag": "fetchFromGitHub",
-            "owner": "hvesalai",
-            "repo": "scala-mode2",
-            "sha256": "1xyfxwrp2hlj49412ypl1mi5pxx6z4aw1hhzkgcwd3bfyyqdrg1k",
-            "rev": "360b5ba27aeca69e72109515b6c40b2f7972cc8f"
+            "owner": "ensime",
+            "repo": "emacs-scala-mode",
+            "sha256": "015p93isbpxgqiq6l0jmvsyxjqajjjclfnn76p7xz5p73hzlvfx7",
+            "rev": "c20d6e6df028f055e69066aa75d571e520ff0670"
         },
         "recipe": {
-            "sha256": "1m8przbs4vmcss7bp496vdziy1xxzh4waj36yny7l79ld9rhk6cl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150618.150",
+        "version": "20151226.1248",
         "deps": []
     },
     "show-marks": {
@@ -13283,7 +13370,7 @@
         },
         "recipe": {
             "sha256": "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130805.949",
         "deps": [
@@ -13300,7 +13387,7 @@
         },
         "recipe": {
             "sha256": "1aadzaf73clhyny2qiryg6z84k34yx3ghy6pyl0px9qhqc1ak271",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140926.639",
         "deps": []
@@ -13315,7 +13402,7 @@
         },
         "recipe": {
             "sha256": "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150807.1056",
         "deps": [
@@ -13331,7 +13418,7 @@
         },
         "recipe": {
             "sha256": "1kbyl69vwhp1wdivr3ijmj7mghdnjaw7adk8az7bwyzjvpq73171",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131010.154",
         "deps": [
@@ -13348,7 +13435,7 @@
         },
         "recipe": {
             "sha256": "0jcddk9ppgcizyyciabj3sgk1pmingl97knf9nmr0mi89h7n2g5y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150928.1133",
         "deps": []
@@ -13363,7 +13450,7 @@
         },
         "recipe": {
             "sha256": "0vawa9qwvv6z1i7vzhkjdl1l9r1yham48yn5y8w8g1xyhxxp6rs5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150909.1034",
         "deps": [
@@ -13382,7 +13469,7 @@
         },
         "recipe": {
             "sha256": "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130725.2119",
         "deps": []
@@ -13397,7 +13484,7 @@
         },
         "recipe": {
             "sha256": "0amdxdfc8i99zjrw4iqmxzb47h0airs60fwmc32bc8b0ds66c3kd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130707.859",
         "deps": []
@@ -13412,7 +13499,7 @@
         },
         "recipe": {
             "sha256": "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140802.1120",
         "deps": []
@@ -13427,7 +13514,7 @@
         },
         "recipe": {
             "sha256": "17s0wdwgh2dcpww6h3qszc9dcs7ki00xkyisvsfn4xqajrmmp75b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150512.1549",
         "deps": [
@@ -13444,7 +13531,7 @@
         },
         "recipe": {
             "sha256": "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150425.1506",
         "deps": [
@@ -13456,12 +13543,12 @@
             "tag": "fetchFromGitHub",
             "owner": "algernon",
             "repo": "tdd-status-mode-line",
-            "sha256": "01r34h3srli5bglss0zxnblpfbgzd45cvh3bg16i8dyyph9wgqyn",
-            "rev": "cf51cf2e85f190d27424277697c5e3a344d9ef2b"
+            "sha256": "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5",
+            "rev": "4c082e62f4915b573338a97efcc6854d132323dc"
         },
         "recipe": {
             "sha256": "0z1q1aw14xq72nfx7mmvz7pr2x4960l45z02jva35zxzvb1mvsgq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131123.1116",
         "deps": []
@@ -13476,13 +13563,28 @@
         },
         "recipe": {
             "sha256": "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -13493,7 +13595,7 @@
         },
         "recipe": {
             "sha256": "02pb7762khxpah4q6xg8r7dmlv1kwyzinffi7pcaps6ycj29q2fr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130326.1750",
         "deps": []
@@ -13506,7 +13608,7 @@
         },
         "recipe": {
             "sha256": "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150815.938",
         "deps": []
@@ -13521,7 +13623,7 @@
         },
         "recipe": {
             "sha256": "189f2l4za1j9ds0bhxrzyp7da9p6svh5dx2vnzf4vql7qhjk3gf0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131228.1955",
         "deps": []
@@ -13531,14 +13633,14 @@
             "tag": "fetchFromGitHub",
             "owner": "d11wtq",
             "repo": "grizzl",
-            "sha256": "1y2vn7xxzphg1d1isvimygzndybb6z4cfhpbrciswv983lixwcpx",
-            "rev": "93c72e18a0146ee1f43adb28423475094d5e9f4c"
+            "sha256": "1v5xh0hana9wqc73g0yrzk5ip9zxbqg9xi8k7972nzj3fnma77bh",
+            "rev": "38b819b8f132962e24eb6a2cff33d571e848776d"
         },
         "recipe": {
             "sha256": "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150712.30",
+        "version": "20151223.1358",
         "deps": [
             "cl-lib",
             "emacs"
@@ -13554,7 +13656,7 @@
         },
         "recipe": {
             "sha256": "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150615.1225",
         "deps": []
@@ -13569,7 +13671,7 @@
         },
         "recipe": {
             "sha256": "104jisc2bckzrajxlvj1cfx1drnjj7jhqjblvm89ry32xdnjxmqb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151108.2308",
         "deps": [
@@ -13586,7 +13688,7 @@
         },
         "recipe": {
             "sha256": "1pin1x6g68y75pa3vz2i9h5pmhjamh5rd5ladb1z3flcavsls64j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120403.1315",
         "deps": []
@@ -13601,7 +13703,7 @@
         },
         "recipe": {
             "sha256": "0lmlhx34nwvn636y2wvw3sprhhh6q3mdg7dzgpjj7ybibvhp1lzk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140616.1333",
         "deps": [
@@ -13616,7 +13718,7 @@
         },
         "recipe": {
             "sha256": "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1907",
         "deps": []
@@ -13631,7 +13733,7 @@
         },
         "recipe": {
             "sha256": "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150806.645",
         "deps": []
@@ -13646,7 +13748,7 @@
         },
         "recipe": {
             "sha256": "11ky69icsnxwsinv2j3f4c0764wm6i9g9mlvwsdrd6w1lchq1dg9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140215.1447",
         "deps": [
@@ -13664,7 +13766,7 @@
         },
         "recipe": {
             "sha256": "1ssl126wihaf8m2f6ms0l5ai6pz5wn348a09k6l0h3jfww032g1q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141207.607",
         "deps": []
@@ -13679,7 +13781,7 @@
         },
         "recipe": {
             "sha256": "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140505.855",
         "deps": []
@@ -13694,7 +13796,7 @@
         },
         "recipe": {
             "sha256": "0c9c5kmixvhk9il8hsxzf2k14fggb9b9mw59g8q3hgpn5g7kgpkv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151120.2006",
         "deps": [
@@ -13706,11 +13808,11 @@
             "tag": "fetchsvn",
             "url": "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el",
             "sha256": "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz",
-            "rev": "143722"
+            "rev": "143923"
         },
         "recipe": {
             "sha256": "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150717.239",
         "deps": [
@@ -13729,7 +13831,7 @@
         },
         "recipe": {
             "sha256": "0gmvc4rrqkn0cx8fk1sxk6phfbpf8dcba3k6i24k3idcx8rxsw3x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140617.1258",
         "deps": []
@@ -13744,7 +13846,7 @@
         },
         "recipe": {
             "sha256": "03i2ilphf3fdjag7m9z5gi23n6ik36qn42mzc22432m4y3c7iksh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150308.718",
         "deps": []
@@ -13759,7 +13861,7 @@
         },
         "recipe": {
             "sha256": "1r01v453bpyh561j8ja36609hy60gc30arvmz4z3c1cybhv8sk1i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150718.1509",
         "deps": []
@@ -13774,7 +13876,7 @@
         },
         "recipe": {
             "sha256": "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140606.743",
         "deps": [
@@ -13791,7 +13893,7 @@
         },
         "recipe": {
             "sha256": "1dipxwaar7rghmz7s733v035vrbijcg1dla9f7cld1gkgiq9iq36",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150630.1021",
         "deps": []
@@ -13806,7 +13908,7 @@
         },
         "recipe": {
             "sha256": "09hf3jmacsk4hl0rxk35cza8vjl0xfmv19dagb8h8fli97fb65hh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131216.428",
         "deps": []
@@ -13819,7 +13921,7 @@
         },
         "recipe": {
             "sha256": "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151204.1851",
         "deps": []
@@ -13834,7 +13936,7 @@
         },
         "recipe": {
             "sha256": "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.1922",
         "deps": []
@@ -13849,7 +13951,7 @@
         },
         "recipe": {
             "sha256": "0yjlwsiahb7n4q3522d68xrdb8caad9gpnglz5php245yqy3n5vx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141126.431",
         "deps": [
@@ -13867,7 +13969,7 @@
         },
         "recipe": {
             "sha256": "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150717.7",
         "deps": []
@@ -13882,7 +13984,7 @@
         },
         "recipe": {
             "sha256": "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140609.956",
         "deps": []
@@ -13897,7 +13999,7 @@
         },
         "recipe": {
             "sha256": "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100930.943",
         "deps": []
@@ -13912,7 +14014,7 @@
         },
         "recipe": {
             "sha256": "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131001.1034",
         "deps": []
@@ -13927,7 +14029,7 @@
         },
         "recipe": {
             "sha256": "13337ymf8vlbk8c4jpj6paqi06xdmk39yf72s40kmfrbvgmi8qy1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150304.803",
         "deps": []
@@ -13942,7 +14044,7 @@
         },
         "recipe": {
             "sha256": "073yw3ivkl093xxppn5vqyh69jhfc97al505mnyn34fwdj5v8fji",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150908.909",
         "deps": [
@@ -13959,7 +14061,7 @@
         },
         "recipe": {
             "sha256": "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140419.16",
         "deps": [
@@ -13976,7 +14078,7 @@
         },
         "recipe": {
             "sha256": "00nirxawsngvlx7bmf5hqg2wk0l1v5pi09r6phzd0q8gyq3kmbbn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131117.1639",
         "deps": [
@@ -13996,7 +14098,7 @@
         },
         "recipe": {
             "sha256": "0h2ww2vqmarghf4zg0wbwn0wgndmkcjy696mc885rwavck2dav4p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.622",
         "deps": [
@@ -14008,14 +14110,14 @@
             "tag": "fetchFromGitHub",
             "owner": "skeeto",
             "repo": "elfeed",
-            "sha256": "1z0i4cb09xq37y77zdans29lsqwk2asc9ix6cca9bf8rdwiq665b",
-            "rev": "8a38a4c81496d40d3b7c45a6df5e41258a52843c"
+            "sha256": "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j",
+            "rev": "9fd3cf8833e26bf41f52a7e2149734858d2eeb96"
         },
         "recipe": {
             "sha256": "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151215.1138",
+        "version": "20151222.1322",
         "deps": [
             "emacs"
         ]
@@ -14030,7 +14132,7 @@
         },
         "recipe": {
             "sha256": "0qfvdz13ncqn7qaz03lwabzsnk62z6wqzlxlvdqv5xyllcy9m6ln",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150113.2309",
         "deps": [
@@ -14049,7 +14151,7 @@
         },
         "recipe": {
             "sha256": "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.2229",
         "deps": [
@@ -14066,7 +14168,7 @@
         },
         "recipe": {
             "sha256": "04x92qcvx428l2cvm2nk9px7r8i159k0ra0haq2sjncjr1ajhg9m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130201.1338",
         "deps": [
@@ -14084,7 +14186,7 @@
         },
         "recipe": {
             "sha256": "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130412.430",
         "deps": []
@@ -14098,7 +14200,7 @@
         },
         "recipe": {
             "sha256": "15pym76iwqb1dqkbmkgc1yar450g2xinfl89fyss2ifyi4am1nxp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130207.1402",
         "deps": []
@@ -14113,7 +14215,7 @@
         },
         "recipe": {
             "sha256": "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151105.1635",
         "deps": [
@@ -14130,7 +14232,7 @@
         },
         "recipe": {
             "sha256": "0af1djypd8n0n1fq10sl8mrdg27354kg9g87d6xz4q5phvi48cqv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151014.1718",
         "deps": [
@@ -14148,7 +14250,7 @@
         },
         "recipe": {
             "sha256": "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141004.1603",
         "deps": []
@@ -14163,7 +14265,7 @@
         },
         "recipe": {
             "sha256": "0ih5dhnqy3c9nlfz9m2zwy4q4jaam09ykbdqhsxx2hnwjk7p35bw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150506.1639",
         "deps": []
@@ -14178,7 +14280,7 @@
         },
         "recipe": {
             "sha256": "1gmqb7j5fb3q3krgx7arrln5nvyg9vcpph6wlxj6py679wfa3lwr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150213.1436",
         "deps": []
@@ -14193,7 +14295,7 @@
         },
         "recipe": {
             "sha256": "012pm38d9v8qmg83vrsp39y6y30il0956rlrcmb5m5nzla84z2c3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151106.704",
         "deps": [
@@ -14210,7 +14312,7 @@
         },
         "recipe": {
             "sha256": "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151106.2223",
         "deps": [
@@ -14226,7 +14328,7 @@
         },
         "recipe": {
             "sha256": "1hvvy1kp8wrb1qasm42fslgdkg095g4jxgzbnwpa4vp5cq270qbm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100330.543",
         "deps": []
@@ -14241,7 +14343,7 @@
         },
         "recipe": {
             "sha256": "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141128.1905",
         "deps": [
@@ -14260,7 +14362,7 @@
         },
         "recipe": {
             "sha256": "129sapsmvcqqqgcr9xlmxwszsxvsb4nj9g2fxsl4y6r383840jbr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100124.428",
         "deps": []
@@ -14275,7 +14377,7 @@
         },
         "recipe": {
             "sha256": "0jdf3556kmv55jh85ljqh2gdx0jl2b8zgvpz9a4kf53xifk3lqz5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130216.704",
         "deps": []
@@ -14290,7 +14392,7 @@
         },
         "recipe": {
             "sha256": "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151115.2245",
         "deps": []
@@ -14305,7 +14407,7 @@
         },
         "recipe": {
             "sha256": "1z080jywqj99xiwbvfclr6gjkc6spr3dqjb9kq1g4971vx4w8n9g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141207.948",
         "deps": []
@@ -14320,7 +14422,7 @@
         },
         "recipe": {
             "sha256": "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140506.1818",
         "deps": []
@@ -14335,7 +14437,7 @@
         },
         "recipe": {
             "sha256": "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140217.1818",
         "deps": [
@@ -14352,7 +14454,7 @@
         },
         "recipe": {
             "sha256": "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140606.751",
         "deps": []
@@ -14367,7 +14469,7 @@
         },
         "recipe": {
             "sha256": "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150114.415",
         "deps": []
@@ -14382,7 +14484,7 @@
         },
         "recipe": {
             "sha256": "1cz53plk5bax5azm13y7xz530qcfh0scm0cgrkrgwja2wwlxirnw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151103.2107",
         "deps": []
@@ -14397,7 +14499,7 @@
         },
         "recipe": {
             "sha256": "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.2155",
         "deps": [
@@ -14414,7 +14516,7 @@
         },
         "recipe": {
             "sha256": "03vxr5f5m4s6k6rm0976w8h3s4c3b5mrdqgmkd281hmyh9q3cslq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151103.1025",
         "deps": [
@@ -14433,7 +14535,7 @@
         },
         "recipe": {
             "sha256": "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151031.2117",
         "deps": [
@@ -14446,14 +14548,14 @@
             "tag": "fetchFromGitHub",
             "owner": "buzztaiki",
             "repo": "lice-el",
-            "sha256": "0df5v401w9n2d64gxxgb34mb4dm2nxc8jx1cj9ir23cx9dqmxjrq",
-            "rev": "4e34674e188afc29e8f9c1efa84ae16e486dd43c"
+            "sha256": "11c3vmxyddx7zm8fpxmzhq2xygyijbszinfiwllgb4l738bxwljb",
+            "rev": "d8572d997f54f4022f245dcf7c38fef6919a474a"
         },
         "recipe": {
             "sha256": "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151130.2223",
+        "version": "20151225.1222",
         "deps": []
     },
     "mark-tools": {
@@ -14466,7 +14568,7 @@
         },
         "recipe": {
             "sha256": "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130614.525",
         "deps": []
@@ -14481,7 +14583,7 @@
         },
         "recipe": {
             "sha256": "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150712.1630",
         "deps": []
@@ -14496,7 +14598,7 @@
         },
         "recipe": {
             "sha256": "01l7mx8g1m5qnwz973hzrgds4gywm56jgl4hcdxqvpi1n56md3x6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150517.2256",
         "deps": [
@@ -14514,7 +14616,7 @@
         },
         "recipe": {
             "sha256": "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151007.2025",
         "deps": []
@@ -14529,7 +14631,7 @@
         },
         "recipe": {
             "sha256": "0nnbl272hldcmhyj47r463yvj7b06rjdkpkl5xk0gw9ikyja7w0z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131110.515",
         "deps": [
@@ -14546,7 +14648,7 @@
         },
         "recipe": {
             "sha256": "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20090428.1431",
         "deps": []
@@ -14561,7 +14663,7 @@
         },
         "recipe": {
             "sha256": "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150110.54",
         "deps": []
@@ -14576,7 +14678,7 @@
         },
         "recipe": {
             "sha256": "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141213.1205",
         "deps": [
@@ -14593,7 +14695,7 @@
         },
         "recipe": {
             "sha256": "0iswisb08dqz7jc5ra4wcdhbmglildgyrb547dm5362xmvm9ifmy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151124.28",
         "deps": [
@@ -14611,7 +14713,7 @@
         },
         "recipe": {
             "sha256": "0b63sbgwp99ff94dxrqqp2p99j268fjkkzx0g42g726hv80d4fxb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150102.1521",
         "deps": [
@@ -14624,6 +14726,21 @@
             "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",
@@ -14634,7 +14751,7 @@
         },
         "recipe": {
             "sha256": "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150815.1034",
         "deps": []
@@ -14649,7 +14766,7 @@
         },
         "recipe": {
             "sha256": "0lczlrpd5jy2vhy9jl3rjcdyiwr136spqm8k2rj8m9s8wpn0v75i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150613.549",
         "deps": [
@@ -14662,14 +14779,14 @@
             "tag": "fetchFromGitHub",
             "owner": "auto-complete",
             "repo": "auto-complete",
-            "sha256": "1dp7gmrykln29axs1l180abi5ycnn3fzkg7qrlvsnrlkzl43zrji",
-            "rev": "67df105a4210b114e01ec08368b8b6b07f28de77"
+            "sha256": "1kaamih2589y2bc67wjkb5xh1rgxxyw1zkr58dvpfyhagjg3czzd",
+            "rev": "422e1a24b2e75bac25cf224191e306a645794e10"
         },
         "recipe": {
             "sha256": "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151211.427",
+        "version": "20151227.554",
         "deps": [
             "cl-lib",
             "popup"
@@ -14685,7 +14802,7 @@
         },
         "recipe": {
             "sha256": "1wdww25pjla7c8zf04mvgia1ws8cal9rb7z8g3vn2s3gp68py12n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151103.1242",
         "deps": []
@@ -14700,7 +14817,7 @@
         },
         "recipe": {
             "sha256": "1wcbnfzxailv18spxyv4a0nwlqh9l7yf5vxg0qcjcp5ajd2w12kn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151122.57",
         "deps": [
@@ -14717,7 +14834,7 @@
         },
         "recipe": {
             "sha256": "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151104.1114",
         "deps": [
@@ -14734,7 +14851,7 @@
         },
         "recipe": {
             "sha256": "1l1hp2dggjlc287qkfyj21w9lri4agh91g5x707qqq8nicdlv3xm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130812.1139",
         "deps": [
@@ -14752,7 +14869,7 @@
         },
         "recipe": {
             "sha256": "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150902.758",
         "deps": []
@@ -14767,7 +14884,7 @@
         },
         "recipe": {
             "sha256": "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151107.1608",
         "deps": [
@@ -14786,7 +14903,7 @@
         },
         "recipe": {
             "sha256": "0nwinnnhy72h1ihjlnjl8k8z3yf4nl2z7hfv085gwiacr6nn2rby",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.1207",
         "deps": [
@@ -14803,7 +14920,7 @@
         },
         "recipe": {
             "sha256": "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.941",
         "deps": [
@@ -14821,7 +14938,7 @@
         },
         "recipe": {
             "sha256": "1ad3kr73v75vjrc09mdvb7a3ws834k5y5xha3v0ldah38cl1pmjz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140120.1740",
         "deps": []
@@ -14836,7 +14953,7 @@
         },
         "recipe": {
             "sha256": "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140101.910",
         "deps": [
@@ -14852,7 +14969,7 @@
         },
         "recipe": {
             "sha256": "00vxfd4ki5pqf9n9vbmn1441vn2y14bdr1v05h46hswf13b4hzrn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20101223.420",
         "deps": []
@@ -14865,7 +14982,7 @@
         },
         "recipe": {
             "sha256": "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1608",
         "deps": []
@@ -14875,12 +14992,12 @@
             "tag": "fetchFromGitHub",
             "owner": "openscad",
             "repo": "openscad",
-            "sha256": "0z1nf0hdm5q3b65y5jsg5f7qmzk2ilw24i3yg4r8dyygk5c40mr6",
-            "rev": "f0a935d8c6b9994da05986313e3c4b7ab05b44be"
+            "sha256": "1na5ab12y5zr93pinnl9x7cgz139wvxgwpjys7akbpm3car86g5n",
+            "rev": "dff10cc9af40ff5c8ac1dd46deace5971409b31b"
         },
         "recipe": {
             "sha256": "04b4y9jks8sslgmkx54fds8fba9xv54z0cfab52dy99v1301ms3k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150330.2229",
         "deps": []
@@ -14890,12 +15007,12 @@
             "tag": "fetchFromGitHub",
             "owner": "skk-dev",
             "repo": "ddskk",
-            "sha256": "11qr5ami93rwgvc3pf9370rsxbnawdllsrizm1v53xsi98yfp812",
-            "rev": "83f1acd557d1b5561f6bc5a3abae7ab9ab4ea440"
+            "sha256": "0yrjrrm0rkrvr34jwxbl5bm8ahr7w5xh76k859qwgi2cbz6vr7q0",
+            "rev": "47980e6c4f9979ff0b2d656befa5366c57e4527b"
         },
         "recipe": {
             "sha256": "0fckhmz4svcg059v4acbn13yf3ijs09fxmq1axc1b9bm3xxig2cq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151205.743",
         "deps": []
@@ -14910,7 +15027,7 @@
         },
         "recipe": {
             "sha256": "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150312.603",
         "deps": []
@@ -14925,7 +15042,7 @@
         },
         "recipe": {
             "sha256": "0716rhs5dam6p8ym83vy19svl6jr49lcfgb29mm3cqi9jcch3ckh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140119.2144",
         "deps": [
@@ -14942,7 +15059,7 @@
         },
         "recipe": {
             "sha256": "13g5fi06hvx0x2wn1d1d8rkfq5n6wbk9g5bhx2b5sar2yw0akmwm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150605.2239",
         "deps": []
@@ -14957,7 +15074,7 @@
         },
         "recipe": {
             "sha256": "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131012.1601",
         "deps": []
@@ -14967,12 +15084,12 @@
             "tag": "fetchFromGitHub",
             "owner": "kivy",
             "repo": "kivy",
-            "sha256": "0mk5z0kxacjdcd64vq8ryg0bdb2230141kfxka7dphjl4q7wdfhi",
-            "rev": "2d1b4664d2e733a46db3cfeb1f2c052fa86e7cf5"
+            "sha256": "1py7wzbbmmz5924n23jlss403yliljd608yhcxvf50i41svvsdrw",
+            "rev": "dfc535142a1ffa75ac3b7685b5c2168d99b1ba28"
         },
         "recipe": {
             "sha256": "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140524.757",
         "deps": []
@@ -14987,7 +15104,7 @@
         },
         "recipe": {
             "sha256": "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150218.318",
         "deps": [
@@ -15008,7 +15125,7 @@
         },
         "recipe": {
             "sha256": "13mk7mg2xk7v65r1rs6rmvi4g5nvm8jqg3p9nhk62d46i7dzp61i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.259",
         "deps": [
@@ -15025,7 +15142,7 @@
         },
         "recipe": {
             "sha256": "1qh7kwr65spbbnzvq744gkksx50x04zs0nwn5ly60swc05d05lcg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140902.1149",
         "deps": []
@@ -15040,7 +15157,7 @@
         },
         "recipe": {
             "sha256": "0w0z5x2fbnalv404av3mapfkqbfgyk81a1mzvngll8x0pirbyi10",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130920.1142",
         "deps": []
@@ -15054,8 +15171,8 @@
             "rev": "21d6192389a04024f7a41ced9d0911a9cce6f4e8"
         },
         "recipe": {
-            "sha256": "1na5vk01q8bmglwmb37676313mmc5n28c4sip23kpxypkp6wvn3g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151013.357",
         "deps": []
@@ -15070,7 +15187,7 @@
         },
         "recipe": {
             "sha256": "10yvvyzqr06jvijmzis9clb1slzp2mn80yclis8wvrmg4p8djljk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150810.1209",
         "deps": []
@@ -15083,7 +15200,7 @@
         },
         "recipe": {
             "sha256": "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150425.1301",
         "deps": []
@@ -15098,7 +15215,7 @@
         },
         "recipe": {
             "sha256": "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150309.2252",
         "deps": [
@@ -15115,7 +15232,7 @@
         },
         "recipe": {
             "sha256": "0sch9x899mzwdacg55w5j583k2r4vn71ish7gqpghd7cj13ii66h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151128.139",
         "deps": []
@@ -15130,7 +15247,7 @@
         },
         "recipe": {
             "sha256": "11jscpbclxlq2xqy2nsfa4y575bp8h0kpkp8cfjqb05lm5ybcp89",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140116.1516",
         "deps": []
@@ -15143,7 +15260,7 @@
         },
         "recipe": {
             "sha256": "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1610",
         "deps": []
@@ -15158,7 +15275,7 @@
         },
         "recipe": {
             "sha256": "0c1l7ml9b1zipk5fhmhirrh070h0qwwiagdk84i04yvdmmcjw2nf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.253",
         "deps": []
@@ -15173,7 +15290,7 @@
         },
         "recipe": {
             "sha256": "08z8qg9x6vjpybbhxa8x46qnp3951miz1264fivg776y76cg3ck6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20091203.1223",
         "deps": []
@@ -15188,7 +15305,7 @@
         },
         "recipe": {
             "sha256": "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151006.319",
         "deps": [
@@ -15207,7 +15324,7 @@
         },
         "recipe": {
             "sha256": "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": []
@@ -15222,7 +15339,7 @@
         },
         "recipe": {
             "sha256": "18hwdnwmkf640vcyx8d66i424wwazbzjq3k0w0xjmwsn2mpyhm9w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151003.300",
         "deps": []
@@ -15237,7 +15354,7 @@
         },
         "recipe": {
             "sha256": "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151205.1009",
         "deps": [
@@ -15252,7 +15369,7 @@
         },
         "recipe": {
             "sha256": "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130906.18",
         "deps": []
@@ -15267,7 +15384,7 @@
         },
         "recipe": {
             "sha256": "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140513.1039",
         "deps": [
@@ -15285,7 +15402,7 @@
         },
         "recipe": {
             "sha256": "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140520.403",
         "deps": []
@@ -15300,7 +15417,7 @@
         },
         "recipe": {
             "sha256": "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150906.1203",
         "deps": []
@@ -15310,14 +15427,14 @@
             "tag": "fetchFromGitHub",
             "owner": "Andersbakken",
             "repo": "rtags",
-            "sha256": "0pdjbjg81xy41ybrmc2aznb2gv3pic5a0l0gn2yg2hzdbrgfyswn",
-            "rev": "c68e490fea320c62da44a06fe216fb073f1ebf89"
+            "sha256": "0lvajqcw4mfw33wpb6m43k0c0f74s8m33lw5i730qvkrh0in8gf0",
+            "rev": "8f032d75a7a7d6b8019913b5f2b5703181a15d19"
         },
         "recipe": {
             "sha256": "16jvbr4nm48p3dj9wmysjaxyz4ajcay19risqrs9fzrifkr21c9p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151215.147",
+        "version": "20151221.1501",
         "deps": []
     },
     "totd": {
@@ -15330,7 +15447,7 @@
         },
         "recipe": {
             "sha256": "1bp07xl9yh9x6bi6cn8wz11x90jhv1rhxaig540iydjn5b0ny9m0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150519.940",
         "deps": [
@@ -15348,7 +15465,7 @@
         },
         "recipe": {
             "sha256": "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.1504",
         "deps": [
@@ -15367,7 +15484,7 @@
         },
         "recipe": {
             "sha256": "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150220.637",
         "deps": [
@@ -15386,7 +15503,7 @@
         },
         "recipe": {
             "sha256": "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151116.322",
         "deps": [
@@ -15404,7 +15521,7 @@
         },
         "recipe": {
             "sha256": "1blb6mbyqvmdvwp477p1ggs3n6rzi9sdfvi0v1wfzmd7k749b10c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.758",
         "deps": [
@@ -15419,7 +15536,7 @@
         },
         "recipe": {
             "sha256": "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.826",
         "deps": []
@@ -15434,7 +15551,7 @@
         },
         "recipe": {
             "sha256": "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150825.638",
         "deps": [
@@ -15454,7 +15571,7 @@
         },
         "recipe": {
             "sha256": "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150116.1000",
         "deps": [
@@ -15471,7 +15588,7 @@
         },
         "recipe": {
             "sha256": "182p56wiycrm2cjzmlqabksyshpk7nga68jf80vjjmaavp5xqsq8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120111.400",
         "deps": []
@@ -15486,7 +15603,7 @@
         },
         "recipe": {
             "sha256": "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150503.1914",
         "deps": [
@@ -15504,7 +15621,7 @@
         },
         "recipe": {
             "sha256": "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151207.1603",
         "deps": []
@@ -15519,7 +15636,7 @@
         },
         "recipe": {
             "sha256": "03rxn2dh0xj89kl24jd19q7kmrn1hnr2cdl3519bpng298kxwni6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131228.107",
         "deps": []
@@ -15534,7 +15651,7 @@
         },
         "recipe": {
             "sha256": "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140919.1117",
         "deps": [
@@ -15554,7 +15671,7 @@
         },
         "recipe": {
             "sha256": "1ng4rgm8f745fajqnbjhi2rshvn6icwdpbh5dzpzhim1w9kb3bhh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140930.1223",
         "deps": [
@@ -15571,7 +15688,7 @@
         },
         "recipe": {
             "sha256": "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150320.217",
         "deps": []
@@ -15584,7 +15701,7 @@
         },
         "recipe": {
             "sha256": "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150418.1028",
         "deps": []
@@ -15599,7 +15716,7 @@
         },
         "recipe": {
             "sha256": "024zz9l43y1kk2hm8l96h1ahril23cj35f0x72jrcfjysid7wpry",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150509.1618",
         "deps": [
@@ -15616,7 +15733,7 @@
         },
         "recipe": {
             "sha256": "1vgl0wqf7gc2nbiqjn0rkrdlnxfm3wrgspx5b3cixv2n8rqx8kyi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150819.1148",
         "deps": [
@@ -15633,7 +15750,7 @@
         },
         "recipe": {
             "sha256": "1m3xjgmkqg8aj536wcg2f2hf4y6whscbsh7z7448hl4b5qjwii4n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130220.1250",
         "deps": []
@@ -15648,7 +15765,7 @@
         },
         "recipe": {
             "sha256": "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140612.737",
         "deps": [
@@ -15668,7 +15785,7 @@
         },
         "recipe": {
             "sha256": "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": [
@@ -15689,7 +15806,7 @@
         },
         "recipe": {
             "sha256": "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151027.717",
         "deps": []
@@ -15704,7 +15821,7 @@
         },
         "recipe": {
             "sha256": "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130126.1818",
         "deps": []
@@ -15719,7 +15836,7 @@
         },
         "recipe": {
             "sha256": "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.523",
         "deps": [
@@ -15740,7 +15857,7 @@
         },
         "recipe": {
             "sha256": "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120520.932",
         "deps": []
@@ -15755,7 +15872,7 @@
         },
         "recipe": {
             "sha256": "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150103.50",
         "deps": [
@@ -15772,7 +15889,7 @@
         },
         "recipe": {
             "sha256": "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151019.822",
         "deps": [
@@ -15789,7 +15906,7 @@
         },
         "recipe": {
             "sha256": "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150514.1610",
         "deps": [
@@ -15806,7 +15923,7 @@
         },
         "recipe": {
             "sha256": "04b6m0njr7yrbcbpkhqz4hmqpfacmyca3lw75dyw3vpjpsj2g0iv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150621.2133",
         "deps": [
@@ -15823,7 +15940,7 @@
         },
         "recipe": {
             "sha256": "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141102.926",
         "deps": [
@@ -15840,7 +15957,7 @@
         },
         "recipe": {
             "sha256": "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.1453",
         "deps": [
@@ -15853,14 +15970,14 @@
             "tag": "fetchFromGitHub",
             "owner": "dgtized",
             "repo": "github-clone.el",
-            "sha256": "1w1w3rmfj7bj721v0f3bg8hjadipa1z8yf62xpn3ypfr0wa6hnhy",
-            "rev": "36202b802f6d0e4a9da63e5d93d99b6171407e4a"
+            "sha256": "1aiy1jwrzyy3v0ra4a107dbsdf8c92yyvv87q5pf471vsf61fqmb",
+            "rev": "96070145cdcbbfbbfbfa69e6992b8663fef5c9d1"
         },
         "recipe": {
             "sha256": "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.230",
+        "version": "20151225.1842",
         "deps": [
             "emacs",
             "gh",
@@ -15877,7 +15994,7 @@
         },
         "recipe": {
             "sha256": "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150916.1415",
         "deps": []
@@ -15892,7 +16009,7 @@
         },
         "recipe": {
             "sha256": "02109r956nc1dmqh4v082vkr9wdixh03xhl7icwkzl7ipr5453s6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141212.717",
         "deps": [
@@ -15909,7 +16026,7 @@
         },
         "recipe": {
             "sha256": "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141005.1431",
         "deps": []
@@ -15924,7 +16041,7 @@
         },
         "recipe": {
             "sha256": "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151007.1857",
         "deps": []
@@ -15939,7 +16056,7 @@
         },
         "recipe": {
             "sha256": "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150915.1452",
         "deps": [
@@ -15952,14 +16069,14 @@
             "tag": "fetchFromGitHub",
             "owner": "jwiegley",
             "repo": "use-package",
-            "sha256": "14v6wzqn2jhjdbr7nwqilxy9l79m1f2rdrz2c6c6pcla5yjpd1k0",
-            "rev": "77a77c8b03044f0279e00cadd6a6d1a7ae97b016"
+            "sha256": "1kng5yzm73gz67znifjhzrr2zbcc7cyb2f1j703hmf33zb9naqhp",
+            "rev": "1d7e6ff5b73761c3b7180530da8bc433338d0cec"
         },
         "recipe": {
             "sha256": "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150321.413",
+        "version": "20151220.1639",
         "deps": []
     },
     "urlenc": {
@@ -15972,7 +16089,7 @@
         },
         "recipe": {
             "sha256": "0n6shh95m11162zsnf62zy1ljswdjznjilxx2dbqyqdrn7qr2dgh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140116.856",
         "deps": []
@@ -15987,7 +16104,7 @@
         },
         "recipe": {
             "sha256": "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140221.1754",
         "deps": [
@@ -16006,7 +16123,7 @@
         },
         "recipe": {
             "sha256": "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.1517",
         "deps": [
@@ -16024,7 +16141,7 @@
         },
         "recipe": {
             "sha256": "1xpp7vbld3jgcr249m5h7il919kfg7d5ap3zs64i27axzdhv26zk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150330.303",
         "deps": []
@@ -16039,7 +16156,7 @@
         },
         "recipe": {
             "sha256": "0m4h24mmhp680wfhb90im228mrcyxapzyi4kla8xdmss83gc0c32",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150327.1216",
         "deps": [
@@ -16058,7 +16175,7 @@
         },
         "recipe": {
             "sha256": "0fgkcvppkq6pba1giddkfxp9z4c8v2cid9nb8a190b3g85wcwycr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150312.1444",
         "deps": []
@@ -16073,7 +16190,7 @@
         },
         "recipe": {
             "sha256": "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150728.618",
         "deps": [
@@ -16091,7 +16208,7 @@
         },
         "recipe": {
             "sha256": "1dny5qjzl9gaj90ihzbhliwk0n0x7jz333hzf6gaw7wsjmx91wlh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.606",
         "deps": [
@@ -16108,7 +16225,7 @@
         },
         "recipe": {
             "sha256": "1p4l75lahmbjcx74ca5jcyc04828vlcahk7gzv5lr7z9mhvq6fbh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150515.947",
         "deps": []
@@ -16123,7 +16240,7 @@
         },
         "recipe": {
             "sha256": "174rfbm7yzkznkfjmh9bdnm5fgqv9bjwm85h39317pv1g8c3mgv0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151110.542",
         "deps": []
@@ -16138,7 +16255,7 @@
         },
         "recipe": {
             "sha256": "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141103.1541",
         "deps": []
@@ -16153,7 +16270,7 @@
         },
         "recipe": {
             "sha256": "19g4s9dnipg9aa360mp0affmnslm6h7byg595rnaz6rz25a3qdpx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150312.814",
         "deps": [
@@ -16170,7 +16287,7 @@
         },
         "recipe": {
             "sha256": "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140208.1037",
         "deps": []
@@ -16185,7 +16302,7 @@
         },
         "recipe": {
             "sha256": "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140415.358",
         "deps": [
@@ -16202,7 +16319,7 @@
         },
         "recipe": {
             "sha256": "1pxnyj81py3ygadmyfrqndb0jkk6xlbf0rg3857hsy3ccblzm7ki",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150308.1312",
         "deps": []
@@ -16217,7 +16334,7 @@
         },
         "recipe": {
             "sha256": "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150316.2028",
         "deps": []
@@ -16230,7 +16347,7 @@
         },
         "recipe": {
             "sha256": "0a5mymnkwjvpra8iffxjwa5fq3kq4vc8fw7pr7gmrwq8ml7il5zl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151001.834",
         "deps": []
@@ -16245,7 +16362,7 @@
         },
         "recipe": {
             "sha256": "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150528.1428",
         "deps": [
@@ -16263,7 +16380,7 @@
         },
         "recipe": {
             "sha256": "0zq9f2xhgap3ihnrlsrsaxaz0nx014k0820bfsq7lckwcnm0mng1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120819.1914",
         "deps": [
@@ -16281,7 +16398,7 @@
         },
         "recipe": {
             "sha256": "0vw09qk56l792706vvp465f40shf678mcmdh7iw8wsjix4401bzi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151115.1317",
         "deps": [
@@ -16298,7 +16415,7 @@
         },
         "recipe": {
             "sha256": "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": []
@@ -16306,14 +16423,14 @@
     "sbt-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
-            "owner": "hvesalai",
-            "repo": "sbt-mode",
+            "owner": "ensime",
+            "repo": "emacs-sbt-mode",
             "sha256": "1l6l90lhqk56l20dhy19snn0fz4di03j714d2v07yl19q64gfk6c",
             "rev": "209a396babd0a302cbb5a32f16525aabb409528b"
         },
         "recipe": {
-            "sha256": "0a2ynbxgjgbm2nvrgss59xc98kmryf9bmd3qg7qxacyancyi2gxh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151014.242",
         "deps": [
@@ -16330,7 +16447,7 @@
         },
         "recipe": {
             "sha256": "0zixgdhc228y6yqr044cbyls0pihzacqsgvybhhar916p4h8izgv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151016.2259",
         "deps": [
@@ -16348,7 +16465,7 @@
         },
         "recipe": {
             "sha256": "1hvhhbmyx12wsf2n1hd0hg5cy05zyspd82xxcdh04g4s9r3ikqj5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150812.502",
         "deps": [
@@ -16365,7 +16482,7 @@
         },
         "recipe": {
             "sha256": "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150530.422",
         "deps": []
@@ -16380,7 +16497,7 @@
         },
         "recipe": {
             "sha256": "0763ad65dmpl2l5lw91mlppfdvrjg6ym45brhi8sdwwri1xnyv9z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.342",
         "deps": [
@@ -16399,7 +16516,7 @@
         },
         "recipe": {
             "sha256": "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140317.536",
         "deps": [
@@ -16414,7 +16531,7 @@
         },
         "recipe": {
             "sha256": "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1834",
         "deps": []
@@ -16429,7 +16546,7 @@
         },
         "recipe": {
             "sha256": "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140103.1539",
         "deps": [
@@ -16446,7 +16563,7 @@
         },
         "recipe": {
             "sha256": "1l5b9hww2vmqnjlsd6lbjpz9walck82ngang1amfnk4xn6d0gdhi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151021.647",
         "deps": [
@@ -16463,7 +16580,7 @@
         },
         "recipe": {
             "sha256": "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151026.1742",
         "deps": []
@@ -16478,7 +16595,7 @@
         },
         "recipe": {
             "sha256": "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150927.224",
         "deps": []
@@ -16493,7 +16610,7 @@
         },
         "recipe": {
             "sha256": "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151202.601",
         "deps": [
@@ -16514,7 +16631,7 @@
         },
         "recipe": {
             "sha256": "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140315.1129",
         "deps": [
@@ -16527,14 +16644,14 @@
             "tag": "fetchFromGitHub",
             "owner": "skk-dev",
             "repo": "ddskk",
-            "sha256": "11qr5ami93rwgvc3pf9370rsxbnawdllsrizm1v53xsi98yfp812",
-            "rev": "83f1acd557d1b5561f6bc5a3abae7ab9ab4ea440"
+            "sha256": "0yrjrrm0rkrvr34jwxbl5bm8ahr7w5xh76k859qwgi2cbz6vr7q0",
+            "rev": "47980e6c4f9979ff0b2d656befa5366c57e4527b"
         },
         "recipe": {
             "sha256": "1wj3z6ldlkaj99xqh7a497in1syn7shf2w1ffcn6aiskxjrzmpiq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151213.552",
+        "version": "20151226.42",
         "deps": [
             "ccc",
             "cdb"
@@ -16548,7 +16665,7 @@
         },
         "recipe": {
             "sha256": "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.657",
         "deps": []
@@ -16558,14 +16675,14 @@
             "tag": "fetchFromGitHub",
             "owner": "takaxp",
             "repo": "org-tree-slide",
-            "sha256": "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45",
-            "rev": "dccd80418a4444df5e8301695ff0d0dfe86a3c21"
+            "sha256": "19id53sjv0r0xnm3l8d694s27dxlmdfm9dal57zlf60s5lg8hykq",
+            "rev": "3a2d3733baa81484ac53bee9a8d0f9dafa54881c"
         },
         "recipe": {
             "sha256": "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151017.253",
+        "version": "20151223.147",
         "deps": []
     },
     "org-transform-tree-table": {
@@ -16578,7 +16695,7 @@
         },
         "recipe": {
             "sha256": "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150110.833",
         "deps": [
@@ -16596,7 +16713,7 @@
         },
         "recipe": {
             "sha256": "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150105.925",
         "deps": [
@@ -16612,7 +16729,7 @@
         },
         "recipe": {
             "sha256": "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150619.1003",
         "deps": []
@@ -16627,7 +16744,7 @@
         },
         "recipe": {
             "sha256": "092swxkkisvj2y18ynal8dn7wcfi7h4y6n0dlzqq28bfflarbwik",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151023.106",
         "deps": [
@@ -16639,14 +16756,14 @@
             "tag": "fetchFromGitHub",
             "owner": "howardabrams",
             "repo": "demo-it",
-            "sha256": "0ws46aq5nl6ayhfrg9lm12i53v99a7pbfwb65rn9xsy4176k7zqb",
-            "rev": "3953fab63b4ef4eb18272596ccb66dcace60528c"
+            "sha256": "051i2ywmy0qs6cqq6qxyjpgy28k7pxr9wfjpm48r871hmb61xaai",
+            "rev": "1b41e85d34960278f21139b02e4d85eecb07c4b0"
         },
         "recipe": {
             "sha256": "063v115xy9mcga4qv16v538k12rn9maz92khzwa35wx56bwz4gg7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151020.1429",
+        "version": "20151221.2343",
         "deps": []
     },
     "helm-package": {
@@ -16659,7 +16776,7 @@
         },
         "recipe": {
             "sha256": "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.248",
         "deps": [
@@ -16677,7 +16794,7 @@
         },
         "recipe": {
             "sha256": "1mw94210i57wrqfyif6rh689xbwbpv1qp6bgc0j7z6g4xypvd52p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150909.1336",
         "deps": [
@@ -16695,7 +16812,7 @@
         },
         "recipe": {
             "sha256": "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150828.1916",
         "deps": []
@@ -16710,7 +16827,7 @@
         },
         "recipe": {
             "sha256": "1l7c6zq3ga2k1488qb0hgxlk08p3vrcf0sx116c1f8z8nf4c8ny5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150417.1755",
         "deps": []
@@ -16725,7 +16842,7 @@
         },
         "recipe": {
             "sha256": "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150703.1117",
         "deps": []
@@ -16735,15 +16852,17 @@
             "tag": "fetchFromGitHub",
             "owner": "nflath",
             "repo": "man-commands",
-            "sha256": "0w3d01q46clg3kz1zy963sih0dsi3ryl4p8zrgpd1frpf8lpg5fv",
-            "rev": "0a5091bf1d27eb2c220c90b8e20cffd0784a2211"
+            "sha256": "1lfq4hsq2n33l58ja5kzy6bwk9jxbcdsg6y8gqlk71lcslzqldrk",
+            "rev": "f4ba0c3790855d7544dff92d470d212f24de1d9d"
         },
         "recipe": {
             "sha256": "1yl7y0k24gydldfs406v1n523q46m9x6in6pgljgjnjravc67wnq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20130627.1853",
-        "deps": []
+        "version": "20151221.1621",
+        "deps": [
+            "cl-lib"
+        ]
     },
     "helm-git": {
         "fetch": {
@@ -16755,7 +16874,7 @@
         },
         "recipe": {
             "sha256": "1ib73p7cmkw96csxxpkqwn6m60k1xrd46z6vyp29gj85cs4fpsb8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120630.1603",
         "deps": []
@@ -16770,7 +16889,7 @@
         },
         "recipe": {
             "sha256": "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150817.214",
         "deps": [
@@ -16787,7 +16906,7 @@
         },
         "recipe": {
             "sha256": "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120727.926",
         "deps": []
@@ -16802,7 +16921,7 @@
         },
         "recipe": {
             "sha256": "1r9qbvgssc2zdwgwmmwv5kapvmg1y3px7268gkiakkfanw3kqk6j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150603.1210",
         "deps": [
@@ -16819,7 +16938,7 @@
         },
         "recipe": {
             "sha256": "09ycjllfpdgqaf5iis5bkkhal1vxvl3qkxrn2759p67s97c49f3x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131015.1058",
         "deps": [
@@ -16835,7 +16954,7 @@
         },
         "recipe": {
             "sha256": "1h2pm37y9kz62id0rm0zzgh1hpkhd9gvq95kjd29w0awsp9b6ca4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140816.733",
         "deps": []
@@ -16850,7 +16969,7 @@
         },
         "recipe": {
             "sha256": "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140916.1322",
         "deps": [
@@ -16867,7 +16986,7 @@
         },
         "recipe": {
             "sha256": "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141101.120",
         "deps": []
@@ -16881,7 +17000,7 @@
         },
         "recipe": {
             "sha256": "0vrjxprpk854989wcp4wjb07jhhxqi25p6c758gz264z3xa8g9cr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140509.722",
         "deps": []
@@ -16896,7 +17015,7 @@
         },
         "recipe": {
             "sha256": "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151117.436",
         "deps": []
@@ -16911,7 +17030,7 @@
         },
         "recipe": {
             "sha256": "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131231.830",
         "deps": [
@@ -16927,7 +17046,7 @@
         },
         "recipe": {
             "sha256": "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140130.2016",
         "deps": []
@@ -16942,7 +17061,7 @@
         },
         "recipe": {
             "sha256": "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150905.239",
         "deps": [
@@ -16955,14 +17074,14 @@
             "tag": "fetchFromGitHub",
             "owner": "josteink",
             "repo": "wsd-mode",
-            "sha256": "1jqm4ysakdnb8lp3kj1d4cr0krnwvm7b5i70sfkx8ps0f9k7dhjb",
-            "rev": "a5b012607793a5edc9d54b30e04f4a324144e930"
+            "sha256": "134ysscql74v1ix3wnpgrcbmayq6d264m0m975g41hcz8f876j03",
+            "rev": "d54c22f6f9a774ef2b1595ab52947403af2ff994"
         },
         "recipe": {
-            "sha256": "0lgs33lm85j9y2c5nw6dl8v6avghyjdavbk6yzh1cya2d9v5f4q0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150913.1230",
+        "version": "20151224.850",
         "deps": []
     },
     "rubocop": {
@@ -16975,7 +17094,7 @@
         },
         "recipe": {
             "sha256": "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.2337",
         "deps": [
@@ -16993,7 +17112,7 @@
         },
         "recipe": {
             "sha256": "1mhbydvk7brmkgmij5gpp6l9ixcyh1g3r4fw3kpq8nvgbwknsqc9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150627.951",
         "deps": [
@@ -17010,7 +17129,7 @@
         },
         "recipe": {
             "sha256": "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151023.313",
         "deps": [
@@ -17032,7 +17151,7 @@
         },
         "recipe": {
             "sha256": "02cqza46qp8y69jd33cg4nmcgvrpwz23vyxqnmzwwvlmnbky96yc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131012.730",
         "deps": [
@@ -17044,14 +17163,14 @@
             "tag": "fetchFromGitHub",
             "owner": "bbatsov",
             "repo": "zenburn-emacs",
-            "sha256": "14m4azwy6h8d9gw764ikddnis13armxagpfvj6v97773v56ankgg",
-            "rev": "fc77c5382f2074f8defe39541b4bfc568cd67ca7"
+            "sha256": "071wrw9n1f3f9r19ng55942fzijlssrd3kzmxxs1c76yvdpy3wy5",
+            "rev": "7bdf03cb51105bb1c8f1cd86107e4a7b03b2a81e"
         },
         "recipe": {
             "sha256": "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.1441",
+        "version": "20151223.450",
         "deps": []
     },
     "web-mode": {
@@ -17064,7 +17183,7 @@
         },
         "recipe": {
             "sha256": "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151218.1600",
         "deps": []
@@ -17079,7 +17198,7 @@
         },
         "recipe": {
             "sha256": "1yhhchksi0r4r5c5q1mggz2hykkvk93baq91b5hkaflqi30d1v8f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140929.1335",
         "deps": [
@@ -17097,7 +17216,7 @@
         },
         "recipe": {
             "sha256": "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150330.1248",
         "deps": []
@@ -17112,7 +17231,7 @@
         },
         "recipe": {
             "sha256": "0lx70l5gq43hckgdfna8s6wx287sw5ms9l1z3n6vg2x8nr9m61kc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130630.739",
         "deps": [
@@ -17129,7 +17248,7 @@
         },
         "recipe": {
             "sha256": "0gl6zzk5ha6vl2xxf5fcnv1k42cw4axdjdcirr1c4r8jwdq3nl3a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151217.1040",
         "deps": []
@@ -17138,14 +17257,14 @@
         "fetch": {
             "tag": "fetchhg",
             "url": "https://bitbucket.com/agriggio/ahg",
-            "sha256": "04ngls59336lyjbwcxz6qdddpaijh51zds8m666vgwjihniv7skg",
-            "rev": "bc4ab0720d4a"
+            "sha256": "0fnn52b2prai8dlsj4759mbcgbbbvhr2lbqs3f0k5d2q8vvqrch1",
+            "rev": "e8eda2f41471"
         },
         "recipe": {
             "sha256": "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.213",
+        "version": "20151223.501",
         "deps": []
     },
     "isearch-dabbrev": {
@@ -17158,7 +17277,7 @@
         },
         "recipe": {
             "sha256": "1hl7zl5vjcsk3z452874g4nfcnmna8m2242dc9cgpl5jddzwqa7x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141224.22",
         "deps": [
@@ -17175,7 +17294,7 @@
         },
         "recipe": {
             "sha256": "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131224.905",
         "deps": [
@@ -17195,7 +17314,7 @@
         },
         "recipe": {
             "sha256": "1sdv9rlhnabydws2sppsjcgqr0lg6bjapv753ksq5aaq21qsps0h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141128.408",
         "deps": []
@@ -17210,7 +17329,7 @@
         },
         "recipe": {
             "sha256": "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150822.1436",
         "deps": []
@@ -17225,7 +17344,7 @@
         },
         "recipe": {
             "sha256": "07fq445cjpv4ndi7hnjmsrmskm2rlp6ghq0k3bcbjxl21smd9vs9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150518.809",
         "deps": [
@@ -17237,14 +17356,14 @@
             "tag": "fetchFromGitHub",
             "owner": "holomorph",
             "repo": "transmission",
-            "sha256": "0k6y501lqk73b38l2san0hc379f4qva9b4q101m0ajwbkkw383vn",
-            "rev": "883d41ca3648838f66ca9dd7b9709be2b50b2ede"
+            "sha256": "08jir2kj42x0kf124g1znphnmh6n25vcxkykyyn01brbdycgkb1j",
+            "rev": "61d487b5cdf1931852bf3c8a30f3695c5ae7e8aa"
         },
         "recipe": {
             "sha256": "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151215.343",
+        "version": "20151220.1447",
         "deps": [
             "emacs",
             "let-alist"
@@ -17260,7 +17379,7 @@
         },
         "recipe": {
             "sha256": "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151130.318",
         "deps": []
@@ -17275,7 +17394,7 @@
         },
         "recipe": {
             "sha256": "0i29ais1m2h9v4ghcg41zfbnaj8klgm4509nkyfkxm7wqnjd166a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140420.1143",
         "deps": []
@@ -17289,7 +17408,7 @@
         },
         "recipe": {
             "sha256": "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.854",
         "deps": [
@@ -17306,7 +17425,7 @@
         },
         "recipe": {
             "sha256": "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150602.1346",
         "deps": []
@@ -17319,7 +17438,7 @@
         },
         "recipe": {
             "sha256": "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.924",
         "deps": []
@@ -17333,7 +17452,7 @@
         },
         "recipe": {
             "sha256": "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.640",
         "deps": []
@@ -17343,12 +17462,12 @@
             "tag": "fetchFromGitHub",
             "owner": "travisbhartwell",
             "repo": "nix-emacs",
-            "sha256": "0iq1j703kj3dy1di8m488kds8i6klpavwwb88ysn5pv2nwdi6i4w",
-            "rev": "2bd8a5fe792dd6a219934f5295d6116877e45f6c"
+            "sha256": "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3",
+            "rev": "6b1418611b49a6cf77380a76f7e6236bbb5df83a"
         },
         "recipe": {
             "sha256": "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151013.1809",
         "deps": [
@@ -17365,7 +17484,7 @@
         },
         "recipe": {
             "sha256": "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150404.218",
         "deps": []
@@ -17380,7 +17499,7 @@
         },
         "recipe": {
             "sha256": "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150730.416",
         "deps": [
@@ -17399,7 +17518,7 @@
         },
         "recipe": {
             "sha256": "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131014.5",
         "deps": []
@@ -17414,7 +17533,7 @@
         },
         "recipe": {
             "sha256": "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151009.946",
         "deps": [
@@ -17432,7 +17551,7 @@
         },
         "recipe": {
             "sha256": "1alqrv9yhc1f8dhvh2kjcv8qbn1hdgza5iasmchr1wggxds3s50i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150501.1126",
         "deps": [
@@ -17449,7 +17568,7 @@
         },
         "recipe": {
             "sha256": "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150828.1335",
         "deps": []
@@ -17464,7 +17583,7 @@
         },
         "recipe": {
             "sha256": "1hs9wg45mwp3fwi827rc4g0gjx4fk87zlibq3id9fcqic8q7nrnl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141027.929",
         "deps": []
@@ -17479,7 +17598,7 @@
         },
         "recipe": {
             "sha256": "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": []
@@ -17494,7 +17613,7 @@
         },
         "recipe": {
             "sha256": "0yp81phd96z594ckav796qrjm0wlkrfsl0rwpmgg840qn49w71vx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150326.31",
         "deps": [
@@ -17511,7 +17630,7 @@
         },
         "recipe": {
             "sha256": "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141108.2108",
         "deps": [
@@ -17528,7 +17647,7 @@
         },
         "recipe": {
             "sha256": "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140626.742",
         "deps": [
@@ -17552,7 +17671,7 @@
         },
         "recipe": {
             "sha256": "0pnm7yvas0q3b38ch5idm7v4ih2fjyfai8217j74xhkpcc2w4g4a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150813.808",
         "deps": [
@@ -17570,7 +17689,7 @@
         },
         "recipe": {
             "sha256": "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.456",
         "deps": [
@@ -17588,7 +17707,7 @@
         },
         "recipe": {
             "sha256": "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151218.249",
         "deps": [
@@ -17608,7 +17727,7 @@
         },
         "recipe": {
             "sha256": "1ypi7rxbgg2qck1b571hcw5m4ipllb48g6sindpdf180kbfbfpn7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150920.1533",
         "deps": [
@@ -17622,14 +17741,14 @@
             "tag": "fetchFromGitHub",
             "owner": "Floobits",
             "repo": "floobits-emacs",
-            "sha256": "11zfpwfpv8lrib9629h9jyn9svqg30kf4jbnaj0s2sxcyn2sxfga",
-            "rev": "08b3b5a3c3a178b8f21f1baf5e1f0eb0cf1fb855"
+            "sha256": "1b9zxyv5bn1ja0gcv5p3dk3lq3gp3g1dhbnizx7ifgpzc36sp374",
+            "rev": "c75af788d089b701dc71fd79c2baefe82d0d17eb"
         },
         "recipe": {
             "sha256": "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151016.1836",
+        "version": "20151221.1804",
         "deps": [
             "highlight",
             "json"
@@ -17645,7 +17764,7 @@
         },
         "recipe": {
             "sha256": "1krq0f79jjrlihr2aqq87pxdqixv2zdjw4hm732sz79g996yxyw3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150506.159",
         "deps": []
@@ -17660,7 +17779,7 @@
         },
         "recipe": {
             "sha256": "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151113.1102",
         "deps": []
@@ -17675,7 +17794,7 @@
         },
         "recipe": {
             "sha256": "189cq8n759f28nx10fn3w4qbq7q49bb788kp9l70pj38jgnjn7n7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140823.1942",
         "deps": []
@@ -17690,7 +17809,7 @@
         },
         "recipe": {
             "sha256": "0nw6zr06zq60j72qfjmbqrxyz022fnisb0bsh6xmlnd1k1kqlrz6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151105.718",
         "deps": [
@@ -17709,7 +17828,7 @@
         },
         "recipe": {
             "sha256": "095nibgs197iplphk6csvkgsrgh1fcfyy33py860v6qmihvk538f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130212.626",
         "deps": [
@@ -17727,7 +17846,7 @@
         },
         "recipe": {
             "sha256": "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130602.748",
         "deps": []
@@ -17742,7 +17861,7 @@
         },
         "recipe": {
             "sha256": "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150307.1642",
         "deps": [
@@ -17759,7 +17878,7 @@
         },
         "recipe": {
             "sha256": "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141005.40",
         "deps": []
@@ -17774,7 +17893,7 @@
         },
         "recipe": {
             "sha256": "111lf256zxlnylfmwis0pngbpj73p59s520v8abbm7pn82k2m72b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150615.2056",
         "deps": [
@@ -17792,7 +17911,7 @@
         },
         "recipe": {
             "sha256": "1513vnm5b587r15hcbnplgsfv7kv8g5fd0w4nwb6pq7myzv53ra1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131006.847",
         "deps": []
@@ -17802,14 +17921,14 @@
             "tag": "fetchFromGitHub",
             "owner": "stan-dev",
             "repo": "stan-mode",
-            "sha256": "09xgwrgb4a348fchcn24k51lh8cq1sj6lzfx8v76gkkhp7sn3l1r",
-            "rev": "58826c65f3351eb69bf999f3364afe50dc31645e"
+            "sha256": "1k0jidh177s9lk4k9vphivq8dapd2qzajim2s835pn72j6k675vg",
+            "rev": "e981ca7fee98431162b21ec6b79c82100ce4b276"
         },
         "recipe": {
             "sha256": "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150829.2215",
+        "version": "20151222.2258",
         "deps": []
     },
     "parse-csv": {
@@ -17822,7 +17941,7 @@
         },
         "recipe": {
             "sha256": "0khpfxbarw0plx8kka357d8wl1vvdih5797xlld9adc0g3cng0zz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140203.316",
         "deps": []
@@ -17837,7 +17956,7 @@
         },
         "recipe": {
             "sha256": "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150830.710",
         "deps": [
@@ -17861,7 +17980,7 @@
         },
         "recipe": {
             "sha256": "03kyr1h5pm51vn4bykj13rm4ybln266rpnxh65y2ygw8f8md88gl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.614",
         "deps": []
@@ -17871,14 +17990,14 @@
             "tag": "fetchFromGitHub",
             "owner": "abo-abo",
             "repo": "avy",
-            "sha256": "1vd6i1kpnqh7344jfz0my3ykmfj449ik26cz4sgridsi8ymq4wzg",
-            "rev": "b1a1953e1c20578b0d866d538b6045b42f4de4ef"
+            "sha256": "17sa27vhyz642y3g6pjqjs03clqlblmbx2vinpmylga3anf5rrnw",
+            "rev": "9d18bf9fc247e7423b954d05cecdea2417dfc239"
         },
         "recipe": {
             "sha256": "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151207.756",
+        "version": "20151222.445",
         "deps": [
             "cl-lib",
             "emacs"
@@ -17894,7 +18013,7 @@
         },
         "recipe": {
             "sha256": "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110602.1822",
         "deps": [
@@ -17910,7 +18029,7 @@
         },
         "recipe": {
             "sha256": "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151013.1212",
         "deps": [
@@ -17927,7 +18046,7 @@
         },
         "recipe": {
             "sha256": "1fhlng30v25ycr502vfvajl70vimscqkipva6ghr670j35ac5vz5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151015.1302",
         "deps": []
@@ -17942,7 +18061,7 @@
         },
         "recipe": {
             "sha256": "1l2jx6mvph0q2pdlhq7p4vwfw72rfl8k1rwi504bbkr5n5xwhhhz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151122.1340",
         "deps": []
@@ -17957,7 +18076,7 @@
         },
         "recipe": {
             "sha256": "1iq9wzcb625vs942khja39db1js8r46vrdiqcm47yfji98g39gsn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151104.726",
         "deps": [
@@ -17978,7 +18097,7 @@
         },
         "recipe": {
             "sha256": "0zhy94jpk29k51r7m1gd24jx7h6b68l38vhw27j3wz0ag1h5352k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110507.224",
         "deps": []
@@ -17993,7 +18112,7 @@
         },
         "recipe": {
             "sha256": "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150901.247",
         "deps": [
@@ -18010,7 +18129,7 @@
         },
         "recipe": {
             "sha256": "15in299j170n0wxmkg3cx1zzx1n7r1ifraqqzfqhcnk8i8lmc939",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130306.1415",
         "deps": []
@@ -18025,7 +18144,7 @@
         },
         "recipe": {
             "sha256": "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140717.2229",
         "deps": []
@@ -18040,7 +18159,7 @@
         },
         "recipe": {
             "sha256": "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140815.1016",
         "deps": [
@@ -18057,7 +18176,7 @@
         },
         "recipe": {
             "sha256": "0h4gblg6ls8a2wa43r990lanl6ykx8j7c8yg5i3n151imzic2n33",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.2134",
         "deps": []
@@ -18072,7 +18191,7 @@
         },
         "recipe": {
             "sha256": "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131202.1503",
         "deps": []
@@ -18082,14 +18201,14 @@
             "tag": "fetchFromGitHub",
             "owner": "clojure-emacs",
             "repo": "clojure-mode",
-            "sha256": "0mc5g44vfb8w0mhj518yxik6dg55w17vrldcw86ajhw05fww3h3n",
-            "rev": "802c1dbf3529da5a09f97cb21833e0a27ccf41d7"
+            "sha256": "130s55mwzmi1almjajfl5bv3jra9ccafsiv240ls4agqkq2702vv",
+            "rev": "22b6709a651cc9c38a0c2a4c42df500ec3e46f1b"
         },
         "recipe": {
             "sha256": "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151213.1238",
+        "version": "20151224.636",
         "deps": [
             "emacs"
         ]
@@ -18104,7 +18223,7 @@
         },
         "recipe": {
             "sha256": "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151105.447",
         "deps": [
@@ -18116,14 +18235,14 @@
             "tag": "fetchFromGitHub",
             "owner": "magit",
             "repo": "magit",
-            "sha256": "0hy9a1rjl3vs6ysb2913li1zim7wcziaiv609g7dadfyl89c2d4v",
-            "rev": "6b595ac224f512cf672c56600e136714875a940f"
+            "sha256": "1wgy1rkaanqf382m7ijy90gpaiz2049mrmwlvwkr3hw3vgkffar8",
+            "rev": "c650d164a94adcd123ed28da7d413aee76cc9fe7"
         },
         "recipe": {
             "sha256": "042fa55yakdn2di4l5dilnmqpslac46wpr1zpl4xk3v3i4nn9ndv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151214.705",
+        "version": "20151223.1541",
         "deps": [
             "async",
             "dash",
@@ -18140,7 +18259,7 @@
         },
         "recipe": {
             "sha256": "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151025.1002",
         "deps": [
@@ -18158,7 +18277,7 @@
         },
         "recipe": {
             "sha256": "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100807.1231",
         "deps": []
@@ -18173,7 +18292,7 @@
         },
         "recipe": {
             "sha256": "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.1257",
         "deps": [
@@ -18191,7 +18310,7 @@
         },
         "recipe": {
             "sha256": "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.600",
         "deps": [
@@ -18208,7 +18327,7 @@
         },
         "recipe": {
             "sha256": "1bgv4mgsnkmjdyay7lhkqdszvnwpjy4dxxw11kq45w866ba8645n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131226.1408",
         "deps": []
@@ -18223,7 +18342,7 @@
         },
         "recipe": {
             "sha256": "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150326.1118",
         "deps": [
@@ -18242,7 +18361,7 @@
         },
         "recipe": {
             "sha256": "05lkx3yfv2445fp07bhqv2aqz5hgf3dxp39lmz3nfxn4c9v8nkqi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120531.1636",
         "deps": []
@@ -18257,7 +18376,7 @@
         },
         "recipe": {
             "sha256": "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150906.521",
         "deps": []
@@ -18272,7 +18391,7 @@
         },
         "recipe": {
             "sha256": "1kyk865vkgh05vzlggs3ii81v86fcbcxybfkv5rkyl3fyqpkza1w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131207.2140",
         "deps": []
@@ -18287,7 +18406,7 @@
         },
         "recipe": {
             "sha256": "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140110.2211",
         "deps": []
@@ -18302,7 +18421,7 @@
         },
         "recipe": {
             "sha256": "1ljjk6zrbr2k0s0iaqd9iq3j45cavijcx0rqdidliswnfllav4ng",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131217.911",
         "deps": [
@@ -18319,7 +18438,7 @@
         },
         "recipe": {
             "sha256": "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.617",
         "deps": [
@@ -18336,7 +18455,7 @@
         },
         "recipe": {
             "sha256": "1ylpvx2p5l863r9qv9jdsm9rbv989c8xn0zpjl8zkcfxqxix4h4p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.1113",
         "deps": []
@@ -18351,7 +18470,7 @@
         },
         "recipe": {
             "sha256": "1hgiryhpxv30bjlgv9pywzqn2ypimwzdhx03znqvn56zrwn1frnl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151028.502",
         "deps": []
@@ -18366,7 +18485,7 @@
         },
         "recipe": {
             "sha256": "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150829.832",
         "deps": []
@@ -18381,7 +18500,7 @@
         },
         "recipe": {
             "sha256": "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150416.1257",
         "deps": [
@@ -18399,7 +18518,7 @@
         },
         "recipe": {
             "sha256": "1rlz0iqgvr8yxnv5qmk29xs1jwf0g0ckzanlyldcxvs7n6mhkjjp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150714.908",
         "deps": [
@@ -18417,7 +18536,7 @@
         },
         "recipe": {
             "sha256": "0gdap5cv08pz370fl92v9lyvgkbbyjhp9wsc4kyjm4f4pwx9fybv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151130.617",
         "deps": [
@@ -18437,7 +18556,7 @@
         },
         "recipe": {
             "sha256": "0xh17h8vmsgbrq6yf5sfy3kpia4za68f43gwgkvi2m430g15fr0x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150711.1723",
         "deps": [
@@ -18454,7 +18573,7 @@
         },
         "recipe": {
             "sha256": "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151114.2125",
         "deps": [
@@ -18472,7 +18591,7 @@
         },
         "recipe": {
             "sha256": "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150720.1255",
         "deps": [
@@ -18490,7 +18609,7 @@
         },
         "recipe": {
             "sha256": "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140619.505",
         "deps": [
@@ -18507,7 +18626,7 @@
         },
         "recipe": {
             "sha256": "0hkmpa0vg1miv8qqpnml4xblzvn9w4ba02fqp6qa2nnv554i7azp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140309.422",
         "deps": []
@@ -18522,7 +18641,7 @@
         },
         "recipe": {
             "sha256": "11ahrm4n588v7ir2r7sp4dkbypl5nhnr22px849hdxjcrwal24vj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150211.1149",
         "deps": []
@@ -18537,7 +18656,7 @@
         },
         "recipe": {
             "sha256": "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140222.2022",
         "deps": [
@@ -18554,7 +18673,7 @@
         },
         "recipe": {
             "sha256": "03xqfpnagy2sk67yq7n7s6ma3im37d558zzx8sdzd9pbfxy9ij23",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131220.1447",
         "deps": [
@@ -18569,7 +18688,7 @@
         },
         "recipe": {
             "sha256": "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150630.1635",
         "deps": []
@@ -18584,7 +18703,7 @@
         },
         "recipe": {
             "sha256": "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140528.1627",
         "deps": [
@@ -18599,7 +18718,7 @@
         },
         "recipe": {
             "sha256": "1s065w0z3sfv3d348w4zhlw96xf3j28bcz14sl46963mj2dm90lr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130822.532",
         "deps": []
@@ -18614,7 +18733,7 @@
         },
         "recipe": {
             "sha256": "1y376nz1xmchwns4fz8dixbb7hbqh4mln78zvsh7y32il98wzvx9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141109.343",
         "deps": []
@@ -18629,7 +18748,7 @@
         },
         "recipe": {
             "sha256": "0d1ad2x4md0n3fad3s2355wm8hl311qdhih1gkdqwdaj4i1d6gvb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140814.459",
         "deps": []
@@ -18644,7 +18763,7 @@
         },
         "recipe": {
             "sha256": "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150825.1749",
         "deps": []
@@ -18659,7 +18778,7 @@
         },
         "recipe": {
             "sha256": "0cpd12vhshlk2v3w42n769gc0b3rsqc8wb7g84846v9r05ypinj2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150414.1810",
         "deps": [
@@ -18676,7 +18795,7 @@
         },
         "recipe": {
             "sha256": "07kivgzv24psjq1240gwj9wkndq4bhvjh38x552k90m9v6jz8l6m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130605.1624",
         "deps": [
@@ -18694,7 +18813,7 @@
         },
         "recipe": {
             "sha256": "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150427.2214",
         "deps": []
@@ -18709,7 +18828,7 @@
         },
         "recipe": {
             "sha256": "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150220.531",
         "deps": []
@@ -18724,7 +18843,7 @@
         },
         "recipe": {
             "sha256": "0dli4gzsiycivh8dwa00lfpbimyg42qygfachzrhi8qy5413pwlp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150629.1353",
         "deps": [
@@ -18741,7 +18860,7 @@
         },
         "recipe": {
             "sha256": "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150428.1354",
         "deps": [
@@ -18759,7 +18878,7 @@
         },
         "recipe": {
             "sha256": "1zxbvfj6gvz1ynhj6i9q9y65hq7aq41qx4vnx738cjizcq0rc8bs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151019.911",
         "deps": []
@@ -18769,14 +18888,14 @@
             "tag": "fetchFromGitHub",
             "owner": "xahlee",
             "repo": "xah-fly-keys",
-            "sha256": "0c8l924sanlbwbckg4ganw91lvbh5q05gn03f2j194adgjhqsw1n",
-            "rev": "83d0da590640dda6d175cf88e83062717e39ed50"
+            "sha256": "0ayd26gmv4jw6dblq1x81hsb35hy65f2mx5nsbfrgdkh078vzsq7",
+            "rev": "668895c2f6014174b0e42539b9d2963ed71b401c"
         },
         "recipe": {
             "sha256": "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151210.348",
+        "version": "20151223.2256",
         "deps": []
     },
     "chm-view": {
@@ -18787,7 +18906,7 @@
         },
         "recipe": {
             "sha256": "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110616.1219",
         "deps": []
@@ -18802,7 +18921,7 @@
         },
         "recipe": {
             "sha256": "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150804.519",
         "deps": [
@@ -18816,14 +18935,14 @@
             "tag": "fetchFromGitHub",
             "owner": "msherry",
             "repo": "fxrd-mode",
-            "sha256": "003iqzwzf950dvn6q901y0jjadz7hqaafa9wrhzplay3kjnkjj9b",
-            "rev": "122afe6b7edeff117edf92dab1ba011ae71a5910"
+            "sha256": "1n2cvingj7li61k1ff4kmf2gf591fdkslvqsqk0lh71nz59c543j",
+            "rev": "e8c93535cc04083d3b63a1944770488984bc19ce"
         },
         "recipe": {
             "sha256": "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151211.1328",
+        "version": "20151220.1444",
         "deps": [
             "s"
         ]
@@ -18838,7 +18957,7 @@
         },
         "recipe": {
             "sha256": "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150703.854",
         "deps": [
@@ -18855,7 +18974,7 @@
         },
         "recipe": {
             "sha256": "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151007.608",
         "deps": [
@@ -18872,7 +18991,7 @@
         },
         "recipe": {
             "sha256": "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.2038",
         "deps": [
@@ -18889,7 +19008,7 @@
         },
         "recipe": {
             "sha256": "14g4q2k9zjzipzrp5mg72s40b0rwiaixgq3rvi15wh4vvcw5xajn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150430.713",
         "deps": [
@@ -18908,7 +19027,7 @@
         },
         "recipe": {
             "sha256": "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130427.1008",
         "deps": []
@@ -18923,7 +19042,7 @@
         },
         "recipe": {
             "sha256": "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150910.949",
         "deps": []
@@ -18938,7 +19057,7 @@
         },
         "recipe": {
             "sha256": "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.918",
         "deps": []
@@ -18953,7 +19072,7 @@
         },
         "recipe": {
             "sha256": "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151207.344",
         "deps": [
@@ -18970,7 +19089,7 @@
         },
         "recipe": {
             "sha256": "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150401.916",
         "deps": [
@@ -18987,7 +19106,7 @@
         },
         "recipe": {
             "sha256": "1nahcfcy831c7w3c69i2na0r8jsdgprffgfdvh4c41cnk4rkgdqj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150915.203",
         "deps": []
@@ -19002,7 +19121,7 @@
         },
         "recipe": {
             "sha256": "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141007.656",
         "deps": [
@@ -19015,14 +19134,14 @@
             "tag": "fetchFromGitHub",
             "owner": "kyleam",
             "repo": "snakemake-mode",
-            "sha256": "0ymgiqfz33b0iyc6y9m8mb76q3jrccxlh7sbpqn8hj31iwlqyr48",
-            "rev": "801662d8c1bf0905afbd7ca5071d6bf637947f0a"
+            "sha256": "18n4r3nqslvlzambraf70s5qgbdljy0qlfhpghilp1nvh327fmv5",
+            "rev": "3c6ed16930c0c18c4f5fddbe181ba407df681a07"
         },
         "recipe": {
             "sha256": "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151103.2203",
+        "version": "20151224.37",
         "deps": [
             "emacs"
         ]
@@ -19037,7 +19156,7 @@
         },
         "recipe": {
             "sha256": "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151014.639",
         "deps": [
@@ -19054,7 +19173,7 @@
         },
         "recipe": {
             "sha256": "1x16wqfjfrh7kaqar5px61bf3lnlibvcbr5xaf3mcgph37sgi6la",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150324.810",
         "deps": []
@@ -19069,7 +19188,7 @@
         },
         "recipe": {
             "sha256": "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": [
@@ -19086,7 +19205,7 @@
         },
         "recipe": {
             "sha256": "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151002.2230",
         "deps": []
@@ -19101,7 +19220,7 @@
         },
         "recipe": {
             "sha256": "00i7ni4r73mmxavhfcm0fd7jhx6gxvxx7prax1yxmhs46fpz8jwj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140214.904",
         "deps": [
@@ -19118,7 +19237,7 @@
         },
         "recipe": {
             "sha256": "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151105.934",
         "deps": [
@@ -19135,7 +19254,7 @@
         },
         "recipe": {
             "sha256": "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130605.1100",
         "deps": [
@@ -19153,7 +19272,7 @@
         },
         "recipe": {
             "sha256": "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120225.1455",
         "deps": [
@@ -19165,14 +19284,14 @@
             "tag": "fetchFromGitHub",
             "owner": "yuya373",
             "repo": "emacs-slack",
-            "sha256": "1xpkcabi0cnk895fkg8ssaz7m3bc9x5i77v6a9mwdyjjxikcmgi2",
-            "rev": "861b250458606039301480bcf8c166b1a2ce174b"
+            "sha256": "1qczdpklkb1ayyy71d40xi3iw276kpns4p3ml30sykva4y995khl",
+            "rev": "feaf6beae109e3dd9c8828cda2024eba69fad936"
         },
         "recipe": {
             "sha256": "0mybjx08yskk9vi06ayiknl5ddyd8h0mnr8c0a3zr61p1x4s6anp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.347",
+        "version": "20151226.532",
         "deps": [
             "alert",
             "circe",
@@ -19192,7 +19311,7 @@
         },
         "recipe": {
             "sha256": "123vf6nnvdhrrfjn8n8h8a11mkqmy2zm3w3yn99np0zj31x8z7bb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130607.2149",
         "deps": []
@@ -19207,7 +19326,7 @@
         },
         "recipe": {
             "sha256": "1w8r35hkl6qy9a89l0m74x9q2vcc4h2hvmi3r2hqcy2ypkn5l5bv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150426.2037",
         "deps": []
@@ -19222,7 +19341,7 @@
         },
         "recipe": {
             "sha256": "1b67hd1fp6xcj65xxp5jcpdjspxsbzxy26v6lqg5kiy8knls57kf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140606.2106",
         "deps": [
@@ -19239,7 +19358,7 @@
         },
         "recipe": {
             "sha256": "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151129.1441",
         "deps": [
@@ -19255,7 +19374,7 @@
         },
         "recipe": {
             "sha256": "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20080329.2159",
         "deps": []
@@ -19270,7 +19389,7 @@
         },
         "recipe": {
             "sha256": "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.1536",
         "deps": [
@@ -19289,7 +19408,7 @@
         },
         "recipe": {
             "sha256": "1jx2b6h23dj561xhizzbpxp3av69ic8zdw4kkf0py1jm3gnrmlm4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120515.1148",
         "deps": []
@@ -19304,7 +19423,7 @@
         },
         "recipe": {
             "sha256": "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141011.938",
         "deps": [
@@ -19323,7 +19442,7 @@
         },
         "recipe": {
             "sha256": "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150602.2004",
         "deps": [
@@ -19341,7 +19460,7 @@
         },
         "recipe": {
             "sha256": "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150623.2350",
         "deps": []
@@ -19354,7 +19473,7 @@
         },
         "recipe": {
             "sha256": "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151029.918",
         "deps": []
@@ -19369,7 +19488,7 @@
         },
         "recipe": {
             "sha256": "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150108.1003",
         "deps": []
@@ -19384,7 +19503,7 @@
         },
         "recipe": {
             "sha256": "0jhwv46gjwjbs1ai65nm6k15y0q4yl9m5mawgp3n4f45dh02cawp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141027.2142",
         "deps": [
@@ -19401,7 +19520,7 @@
         },
         "recipe": {
             "sha256": "0h11i8w8s4ia1x0lm5n7bnc3db4bv0a7f7hzl27qrg38m3c7dl6x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150712.1000",
         "deps": [
@@ -19418,7 +19537,7 @@
         },
         "recipe": {
             "sha256": "0mmr1spr21pi8sfy95dsgqcxn8qfsphdkfjm5w5q97lh7496z65p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150929.255",
         "deps": [
@@ -19435,7 +19554,7 @@
         },
         "recipe": {
             "sha256": "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131010.2258",
         "deps": []
@@ -19450,7 +19569,7 @@
         },
         "recipe": {
             "sha256": "1r1mfmv4cdlc8kzjiqz81kpqdrwbnyciwdgg6n5x0yi4apwpvnl4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141102.1239",
         "deps": []
@@ -19465,7 +19584,7 @@
         },
         "recipe": {
             "sha256": "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141024.932",
         "deps": []
@@ -19480,7 +19599,7 @@
         },
         "recipe": {
             "sha256": "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150223.1253",
         "deps": [
@@ -19498,7 +19617,7 @@
         },
         "recipe": {
             "sha256": "1fn7ii1bq7bjkz27hihclpvx0aabgwy3kv47r9qibjl2jin97rck",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151127.816",
         "deps": [
@@ -19515,7 +19634,7 @@
         },
         "recipe": {
             "sha256": "1pz82s82d4z3vkm8mpmwdxb9pd11kq09g23mg461lzqxjjw734rr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20111121.900",
         "deps": []
@@ -19530,7 +19649,7 @@
         },
         "recipe": {
             "sha256": "0rnvm3q2spfj15kx2c8ic1p8hxg7rwiqgf3x2zg34j1xxayn3h2j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141118.840",
         "deps": []
@@ -19545,7 +19664,7 @@
         },
         "recipe": {
             "sha256": "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150324.939",
         "deps": []
@@ -19560,7 +19679,7 @@
         },
         "recipe": {
             "sha256": "19qsiic6yf7g60ygjmw7kg1i28nqpm3zja8cmdh33ny2bbkwxsz5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151117.1048",
         "deps": [
@@ -19577,7 +19696,7 @@
         },
         "recipe": {
             "sha256": "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151018.409",
         "deps": [
@@ -19596,7 +19715,7 @@
         },
         "recipe": {
             "sha256": "1plvc8azpmb3phlrxhw3y18dv5y0xljsr5fqym4w84m66lq5csfj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150726.159",
         "deps": []
@@ -19611,7 +19730,7 @@
         },
         "recipe": {
             "sha256": "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151116.1740",
         "deps": [
@@ -19629,7 +19748,7 @@
         },
         "recipe": {
             "sha256": "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150823.846",
         "deps": []
@@ -19644,7 +19763,7 @@
         },
         "recipe": {
             "sha256": "0v1jhkix01l299m67jag43rnps68m19zy83vvdglxa8dj3naz5dl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120323.1835",
         "deps": []
@@ -19659,7 +19778,7 @@
         },
         "recipe": {
             "sha256": "1j23rqgq00as90nk6csi489ida6b83h1myl3icxivj2iw1iikgj1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150417.15",
         "deps": []
@@ -19674,7 +19793,7 @@
         },
         "recipe": {
             "sha256": "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151009.454",
         "deps": [
@@ -19691,7 +19810,7 @@
         },
         "recipe": {
             "sha256": "19fgjcbxgmnm59qjkxhvy2aib5qs5d5a43hwvjdhxq2k6rn3f2gj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20101125.1355",
         "deps": []
@@ -19706,7 +19825,7 @@
         },
         "recipe": {
             "sha256": "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150922.2148",
         "deps": [
@@ -19727,7 +19846,7 @@
         },
         "recipe": {
             "sha256": "0ah0nvzl30z19566kacyrsznsdm3cpij8n3bw3dfng7263rh60gj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150803.646",
         "deps": [
@@ -19745,7 +19864,7 @@
         },
         "recipe": {
             "sha256": "17nmgq4wgv4yl2rsdf32585hfa58j0825mzzajrlwgmjiqx9i778",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141024.348",
         "deps": []
@@ -19760,7 +19879,7 @@
         },
         "recipe": {
             "sha256": "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140826.656",
         "deps": [
@@ -19774,14 +19893,14 @@
             "tag": "fetchFromGitHub",
             "owner": "Wilfred",
             "repo": "ag.el",
-            "sha256": "04rvj7arjmg12vimf55yzj2md1blncksl8q15jrdbzddhrbdjvg4",
-            "rev": "421202ff9cbe717157ff4baeea891e9f2ec9dfe0"
+            "sha256": "03157dyw4in7hazw2glc9dz9509097s76x8g79w9cr9cyjwax42p",
+            "rev": "4894b38feffc4c044f8cbaabf3033f49084dba2c"
         },
         "recipe": {
             "sha256": "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151209.1750",
+        "version": "20151226.1805",
         "deps": [
             "cl-lib",
             "dash",
@@ -19798,7 +19917,7 @@
         },
         "recipe": {
             "sha256": "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131230.939",
         "deps": []
@@ -19813,7 +19932,7 @@
         },
         "recipe": {
             "sha256": "19k0ydpkiviznsngwcqwn4k30r6j8w34pchgpjlsfwq1bndaai9y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150113.1611",
         "deps": [
@@ -19831,7 +19950,7 @@
         },
         "recipe": {
             "sha256": "0ji42r7p3f3hh643839xf74gb231vr7anycr2xhkga8qy2vwa53s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151114.2108",
         "deps": [
@@ -19845,12 +19964,12 @@
             "tag": "fetchFromGitHub",
             "owner": "HKey",
             "repo": "el-init",
-            "sha256": "01yxv5kladg04rqglrzrh3vdf435g3m0hnv8ay9zkwgggcnqiknw",
-            "rev": "e9717f7f051b9685cb436e6f87b27c745bf17072"
+            "sha256": "140afbksvm1kvam7pyaibay8rqhfhmb22rrh39mvdnqskqfnlqgr",
+            "rev": "a23cc95dd67fe63e131da211caa48eae804b11c5"
         },
         "recipe": {
             "sha256": "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150728.420",
         "deps": [
@@ -19869,7 +19988,7 @@
         },
         "recipe": {
             "sha256": "1bs4air13ifx3xkhcfi80z29alsd63r436gnyvjyxlph2ip37v7k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150424.904",
         "deps": []
@@ -19884,7 +20003,7 @@
         },
         "recipe": {
             "sha256": "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.959",
         "deps": [
@@ -19902,7 +20021,7 @@
         },
         "recipe": {
             "sha256": "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130218.1737",
         "deps": []
@@ -19917,7 +20036,7 @@
         },
         "recipe": {
             "sha256": "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.1050",
         "deps": [
@@ -19932,7 +20051,7 @@
         },
         "recipe": {
             "sha256": "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100504.329",
         "deps": []
@@ -19945,7 +20064,7 @@
         },
         "recipe": {
             "sha256": "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150814.952",
         "deps": [
@@ -19960,7 +20079,7 @@
         },
         "recipe": {
             "sha256": "07sqcsad3k23agwwws7hxnc46cp9mkc9qinzva7qvjgs8pa9dh54",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150712.621",
         "deps": []
@@ -19975,7 +20094,7 @@
         },
         "recipe": {
             "sha256": "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150901.604",
         "deps": [
@@ -19997,7 +20116,7 @@
         },
         "recipe": {
             "sha256": "1zwp99mk360mqk4mjnnjr6islavginc9732p0jn9g5yz62xypxpc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151012.442",
         "deps": [
@@ -20014,7 +20133,7 @@
         },
         "recipe": {
             "sha256": "1zhz1dcy1nf84p244x6lc4ajancv5fgmqmbrm080yhb2ral1z8x7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131117.414",
         "deps": []
@@ -20029,7 +20148,7 @@
         },
         "recipe": {
             "sha256": "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150121.1327",
         "deps": [
@@ -20046,7 +20165,7 @@
         },
         "recipe": {
             "sha256": "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100504.350",
         "deps": []
@@ -20061,7 +20180,7 @@
         },
         "recipe": {
             "sha256": "0s5zwimkbsivbwlyd7g8dpnjyzqcfc5plg53ij4sljiipgjh5brl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100330.1331",
         "deps": []
@@ -20071,14 +20190,14 @@
             "tag": "fetchFromGitHub",
             "owner": "DarwinAwardWinner",
             "repo": "ido-ubiquitous",
-            "sha256": "1m9wyl4lm2sy6ax7wg4wh9nw5vq8z26z7kb9mq3p01z9v1vzyzil",
-            "rev": "3bf3c707753969b2c3b534bfe3d09dbd297dfaae"
+            "sha256": "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn",
+            "rev": "1a97a38f2d1a51371853e44da659caa6baf78cbe"
         },
         "recipe": {
             "sha256": "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151130.1816",
+        "version": "20151219.1036",
         "deps": [
             "cl-lib",
             "emacs",
@@ -20096,7 +20215,7 @@
         },
         "recipe": {
             "sha256": "0wnh7512sknagdk56j6gd8vamh9ns3vnggm56s73pik0m009w0xr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151202.525",
         "deps": []
@@ -20111,7 +20230,7 @@
         },
         "recipe": {
             "sha256": "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150328.2006",
         "deps": [
@@ -20130,7 +20249,7 @@
         },
         "recipe": {
             "sha256": "0qv1lw4fv9w9c1ypzpbnvkm6ypqrzqpwyw5gpi7n9almxpd8d68z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150707.1952",
         "deps": [
@@ -20147,7 +20266,7 @@
         },
         "recipe": {
             "sha256": "1ra0lgjv6713zym2h8pblf2ryf0f658l1khbxbwnxl023gkyj9v4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151107.1418",
         "deps": []
@@ -20162,7 +20281,7 @@
         },
         "recipe": {
             "sha256": "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141125.2159",
         "deps": []
@@ -20177,7 +20296,7 @@
         },
         "recipe": {
             "sha256": "1vbdwj8q66j6h5ijqzxhyaqf8wf9rbs03x8ppfijxl5qd2bhc1dy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141104.1545",
         "deps": []
@@ -20192,7 +20311,7 @@
         },
         "recipe": {
             "sha256": "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.740",
         "deps": []
@@ -20205,7 +20324,7 @@
         },
         "recipe": {
             "sha256": "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140307.328",
         "deps": []
@@ -20220,7 +20339,7 @@
         },
         "recipe": {
             "sha256": "1qaz7hg0wsdkl0jb7v7vrkjs554i2zgpxl8xq2f8q7m4bs2m5k48",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140918.1801",
         "deps": []
@@ -20230,14 +20349,14 @@
             "tag": "fetchFromGitHub",
             "owner": "m00natic",
             "repo": "anti-zenburn-theme",
-            "sha256": "1cqgzzk4hrdnji9cj55shs2fzjfhw0ri6gcmhs7wci4330iqgznm",
-            "rev": "0153e87f9ee3c2e8a1a41a4066aeafa99dcfde59"
+            "sha256": "0p4jg397iqriahqm7ssr8zsmqnwh0wrwl9bxkhwh8fzkd2rvxci0",
+            "rev": "7e107cd0b77e4212a6c330600e8eb83a72d7defe"
         },
         "recipe": {
             "sha256": "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151103.1846",
+        "version": "20151223.1613",
         "deps": []
     },
     "sws-mode": {
@@ -20250,7 +20369,7 @@
         },
         "recipe": {
             "sha256": "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150317.1445",
         "deps": []
@@ -20265,7 +20384,7 @@
         },
         "recipe": {
             "sha256": "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150501.447",
         "deps": [
@@ -20284,7 +20403,7 @@
         },
         "recipe": {
             "sha256": "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150121.1037",
         "deps": [
@@ -20296,14 +20415,14 @@
             "tag": "fetchFromGitHub",
             "owner": "phillord",
             "repo": "lentic",
-            "sha256": "1lb7sxnnz1hi4xlf1q0ldvzig48dfmf6ki2p8b0mxk3lm4i3m1js",
-            "rev": "37f9fedb44c5feaeb14279ab3e8113f69cdf19a7"
+            "sha256": "0r5mngz8jsgx1z0dyvm93pimsh63wg18bisvk11d9mq7c1whyc4v",
+            "rev": "02073c4f1c376c99511e0e637a15ed0da18405a8"
         },
         "recipe": {
             "sha256": "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.1029",
+        "version": "20151223.314",
         "deps": [
             "dash",
             "emacs",
@@ -20322,7 +20441,7 @@
         },
         "recipe": {
             "sha256": "0ja71l3cghhn1c6w2pff80km8h8xgzf0j9gcldfyc72ar6ifhjkj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150412.1300",
         "deps": []
@@ -20337,7 +20456,7 @@
         },
         "recipe": {
             "sha256": "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150805.1006",
         "deps": []
@@ -20347,12 +20466,12 @@
             "tag": "fetchFromGitHub",
             "owner": "rvirding",
             "repo": "lfe",
-            "sha256": "1i0nw7b19c26v6lnv8zjmcvirjbh7hfb1magr49ric3gpwlblnv7",
-            "rev": "b0921aacf954e68689c181ec1c4651b02dc51855"
+            "sha256": "14rkvxyyxsr80bcymvwxvnyvk9mminvxsy5yg1gqvw9aif0y8ia4",
+            "rev": "64dec553ac6fcee72cb61f7e0f6f317690a73c1f"
         },
         "recipe": {
             "sha256": "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151110.1835",
         "deps": []
@@ -20366,7 +20485,7 @@
         },
         "recipe": {
             "sha256": "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20080305.234",
         "deps": []
@@ -20381,7 +20500,7 @@
         },
         "recipe": {
             "sha256": "1pg889mgpv0waccm135mlvag7q13gzfkzchv2532jngwrn6amqc7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131029.133",
         "deps": []
@@ -20394,7 +20513,7 @@
         },
         "recipe": {
             "sha256": "0jb63f7qwhfbz0n4yrvnvx03cjqly3mqsc3rq9mgf4svy2zw702r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.700",
         "deps": []
@@ -20409,7 +20528,7 @@
         },
         "recipe": {
             "sha256": "0n4m4f0zqcx966582af1nqff5sla7jcr0wrmgzzxnn97yjrlnzk2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150709.109",
         "deps": [
@@ -20427,7 +20546,7 @@
         },
         "recipe": {
             "sha256": "16qc2isvf6cgl5ihdbwmvv0gbhns4mkhd5lxkl6f8f6h0za054ci",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20090510.1555",
         "deps": []
@@ -20442,7 +20561,7 @@
         },
         "recipe": {
             "sha256": "1564a86950xdwsrwinrs118bjsfmbv8gicq0c2dfr827v5b6zrlb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140211.150",
         "deps": [
@@ -20460,7 +20579,7 @@
         },
         "recipe": {
             "sha256": "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140810.8",
         "deps": []
@@ -20475,7 +20594,7 @@
         },
         "recipe": {
             "sha256": "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.526",
         "deps": [
@@ -20491,7 +20610,7 @@
         },
         "recipe": {
             "sha256": "10x2k99m3kl6y0k0mw590gq1ac162nmdwk58i8i7a4mb72zmsmhc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141107.1717",
         "deps": [
@@ -20508,7 +20627,7 @@
         },
         "recipe": {
             "sha256": "11b3wn53309ws60w8sfpfxij7vnibj6kxxsx6w1agglqx9zqngz4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150626.145",
         "deps": []
@@ -20523,7 +20642,7 @@
         },
         "recipe": {
             "sha256": "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140510.1637",
         "deps": []
@@ -20538,7 +20657,7 @@
         },
         "recipe": {
             "sha256": "0pydp6scj5icaqfp3dp5h0q1y2i7z9mfyw1ll6iphsz9qh3x2bj2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151019.1144",
         "deps": [
@@ -20550,14 +20669,14 @@
             "tag": "fetchFromGitHub",
             "owner": "rexim",
             "repo": "org-cliplink",
-            "sha256": "1hc8yrfnla66p9lqvcnql51xa5pdmaqpka60nvfnyc5h40jyjsfd",
-            "rev": "0e97eb716d66de4e13704f8aa3ac6f99ee0189e2"
+            "sha256": "1fwnsyl6lq43bvdh4fldsb8224y1dasavkjdlg0fw1libqjp8w6i",
+            "rev": "401d378e6324334d8b6ac4d28c86182848cd8c26"
         },
         "recipe": {
             "sha256": "19l3k9w9csgvdr7n824bzg7jja0f28dmz6caldxh43vankpmlg3p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150922.51",
+        "version": "20151219.1455",
         "deps": []
     },
     "flymake-cppcheck": {
@@ -20570,7 +20689,7 @@
         },
         "recipe": {
             "sha256": "11brzgq2zl32a8a2dgj2imsldjqaqvxwk2jypf4bmfwa3mkcqh3d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140415.757",
         "deps": [
@@ -20587,7 +20706,7 @@
         },
         "recipe": {
             "sha256": "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.647",
         "deps": [
@@ -20607,7 +20726,7 @@
         },
         "recipe": {
             "sha256": "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150328.1401",
         "deps": [
@@ -20628,7 +20747,7 @@
         },
         "recipe": {
             "sha256": "0ns49p7nsifpi7wrzr02ljrr0p6hxanrg54zaixakvjkxwcgfabr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.1339",
         "deps": []
@@ -20643,7 +20762,7 @@
         },
         "recipe": {
             "sha256": "055c6jy2q761za4cl1vlqdskcd3mc1j58k8b4418q7h2lv2zc0ry",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150814.1301",
         "deps": []
@@ -20658,7 +20777,7 @@
         },
         "recipe": {
             "sha256": "0nv2wsqmpschym6ch8fr4a79hlnpz31jc8y2flsygaqj0annjkfk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151207.1503",
         "deps": []
@@ -20673,7 +20792,7 @@
         },
         "recipe": {
             "sha256": "0ws4kd94m8fh55d7whsf3rj9qrxjp1wsgxh0valsjxyp2ck9zrz0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150828.1527",
         "deps": [
@@ -20690,7 +20809,7 @@
         },
         "recipe": {
             "sha256": "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150809.2340",
         "deps": [
@@ -20706,7 +20825,7 @@
         },
         "recipe": {
             "sha256": "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1604",
         "deps": []
@@ -20721,7 +20840,7 @@
         },
         "recipe": {
             "sha256": "14hmmic0px3z38dm2dg0kis6cz1p3p1hj7xaqnqjmv02dkx2mmcy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150428.2252",
         "deps": [
@@ -20738,7 +20857,7 @@
         },
         "recipe": {
             "sha256": "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130707.116",
         "deps": []
@@ -20753,7 +20872,7 @@
         },
         "recipe": {
             "sha256": "1j454jy4ia2wrgi3fxzjfdqi3z8x13hq8kh62lnb84whs7a1nhik",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151002.2030",
         "deps": []
@@ -20768,7 +20887,7 @@
         },
         "recipe": {
             "sha256": "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150830.2028",
         "deps": []
@@ -20783,7 +20902,7 @@
         },
         "recipe": {
             "sha256": "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151204.1123",
         "deps": [
@@ -20801,7 +20920,7 @@
         },
         "recipe": {
             "sha256": "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140117.120",
         "deps": [
@@ -20818,7 +20937,7 @@
         },
         "recipe": {
             "sha256": "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130327.732",
         "deps": []
@@ -20833,7 +20952,7 @@
         },
         "recipe": {
             "sha256": "1m5qjl3r96riljp48il8k4rb6rwys1xf1pl93d4qjhprwvz57mv2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150218.430",
         "deps": []
@@ -20848,7 +20967,7 @@
         },
         "recipe": {
             "sha256": "1vc391fdkdqd4g0piq66zhrlgqx5s2ijv7qd1rc3a235sjb9i2n4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151119.1222",
         "deps": [
@@ -20866,7 +20985,7 @@
         },
         "recipe": {
             "sha256": "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121227.1702",
         "deps": []
@@ -20881,7 +21000,7 @@
         },
         "recipe": {
             "sha256": "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150927.224",
         "deps": []
@@ -20891,12 +21010,12 @@
             "tag": "fetchFromGitHub",
             "owner": "google",
             "repo": "protobuf",
-            "sha256": "023654g10pwx6h88jiwqdfskq663cc06dvr9pf6l1xjqm28wra34",
-            "rev": "43f9cb1e6f535e3a57bab517f8041beb2b3b1c51"
+            "sha256": "04j0i9glv0g6k59gjdpdpnlq44h2b958md8vr2mh4qsbhm89nbk3",
+            "rev": "b27f2893b2a118b4e3bfcd23d32114dbdd4e6d9b"
         },
         "recipe": {
             "sha256": "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150521.2211",
         "deps": []
@@ -20911,7 +21030,7 @@
         },
         "recipe": {
             "sha256": "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141130.805",
         "deps": [
@@ -20928,7 +21047,7 @@
         },
         "recipe": {
             "sha256": "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150107.1139",
         "deps": [
@@ -20945,7 +21064,7 @@
         },
         "recipe": {
             "sha256": "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151127.2332",
         "deps": [
@@ -20962,7 +21081,7 @@
         },
         "recipe": {
             "sha256": "0rl6s1d0y2pggbfiq4f4xg9qp7nhkd708himzilfqyfa4jwna8yz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150403.2127",
         "deps": [
@@ -20979,7 +21098,7 @@
         },
         "recipe": {
             "sha256": "1gqmjb2f9izra0x9ds1jyk7h204qsll6viwkvdnmxczyyc0wx44n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151002.1657",
         "deps": [
@@ -20994,7 +21113,7 @@
         },
         "recipe": {
             "sha256": "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131117.1335",
         "deps": []
@@ -21008,7 +21127,7 @@
         },
         "recipe": {
             "sha256": "036lf6iirxamlqzq3w6m0hji36l480yx5c9wnwypms85hi8hq0vl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120507.207",
         "deps": []
@@ -21023,7 +21142,7 @@
         },
         "recipe": {
             "sha256": "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121118.1753",
         "deps": []
@@ -21038,7 +21157,7 @@
         },
         "recipe": {
             "sha256": "02mkji4sxym07jf5ww5kgv1c18x0xdfn8cmvgns5h4gij64lnr66",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130313.443",
         "deps": []
@@ -21051,7 +21170,7 @@
         },
         "recipe": {
             "sha256": "14py5hz523847f7bhw67v81x5cfhzz5la15mrqavc4z4yicy63iq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151011.345",
         "deps": []
@@ -21066,7 +21185,7 @@
         },
         "recipe": {
             "sha256": "1316cj3ynl80j39ha0371ss7cqw5hcr3m8944pdacdzbmp2sak2m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150712.210",
         "deps": [
@@ -21085,7 +21204,7 @@
         },
         "recipe": {
             "sha256": "1xchqwhav9x7b02787ghka567fihdc14aamx92jg549c6d14qpwk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150129.1516",
         "deps": []
@@ -21100,7 +21219,7 @@
         },
         "recipe": {
             "sha256": "14pkrj1rpi2ihpb7c1hx6xwzvc1x7l41lwr9znp5vn7z93i034fr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131123.1039",
         "deps": [
@@ -21118,7 +21237,7 @@
         },
         "recipe": {
             "sha256": "02vdhvipzwnh6mlj25lirzxkc0shfzqfs1p4gn3smkxqx6g7mdb2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130705.250",
         "deps": []
@@ -21133,7 +21252,7 @@
         },
         "recipe": {
             "sha256": "0vh882b44vxnij3l01sig87c1jmbymgirf6s98mvag1p9rm8agxw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121224.1947",
         "deps": []
@@ -21146,7 +21265,7 @@
         },
         "recipe": {
             "sha256": "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130130.1550",
         "deps": []
@@ -21161,7 +21280,7 @@
         },
         "recipe": {
             "sha256": "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150525.2045",
         "deps": []
@@ -21176,7 +21295,7 @@
         },
         "recipe": {
             "sha256": "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150312.28",
         "deps": [
@@ -21192,7 +21311,7 @@
         },
         "recipe": {
             "sha256": "1ya0dh7gz7qfflhn6dq43rapb2zg7djvxwn7p4jajyjnwbxmk611",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120205.507",
         "deps": []
@@ -21207,7 +21326,7 @@
         },
         "recipe": {
             "sha256": "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150714.1520",
         "deps": [
@@ -21224,7 +21343,7 @@
         },
         "recipe": {
             "sha256": "0nnkv7lp7ks9qhkbhz15ixm53grc2q0xfspzykxi9c4b59kypcq5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150202.225",
         "deps": []
@@ -21239,7 +21358,7 @@
         },
         "recipe": {
             "sha256": "05s02gw8b339yvsr7vvka1r2140y7mbjzs8px4kn4acgb5y7rk71",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130527.1625",
         "deps": []
@@ -21254,7 +21373,7 @@
         },
         "recipe": {
             "sha256": "0mzrip6y346mix4ny1xj8rkji1w531ix24k3cczmlmm4hm7l29ql",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130616.125",
         "deps": []
@@ -21269,7 +21388,7 @@
         },
         "recipe": {
             "sha256": "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140216.619",
         "deps": [
@@ -21293,7 +21412,7 @@
         },
         "recipe": {
             "sha256": "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.2006",
         "deps": [
@@ -21310,7 +21429,7 @@
         },
         "recipe": {
             "sha256": "15xb0vjamnfwi25yqd37zwfm6xb6p71if88hk2ymxikza4i47x0f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130328.1218",
         "deps": []
@@ -21325,7 +21444,7 @@
         },
         "recipe": {
             "sha256": "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140122.1056",
         "deps": []
@@ -21340,7 +21459,7 @@
         },
         "recipe": {
             "sha256": "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150926.756",
         "deps": []
@@ -21355,7 +21474,7 @@
         },
         "recipe": {
             "sha256": "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140220.2258",
         "deps": [
@@ -21370,7 +21489,7 @@
         },
         "recipe": {
             "sha256": "15b3m1jvr7kg5sc4c8cp0aaiiyivfx8ip1zf7w5m702krv4lfvpk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130130.1551",
         "deps": []
@@ -21385,7 +21504,7 @@
         },
         "recipe": {
             "sha256": "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150126.959",
         "deps": []
@@ -21400,7 +21519,7 @@
         },
         "recipe": {
             "sha256": "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.746",
         "deps": []
@@ -21415,7 +21534,7 @@
         },
         "recipe": {
             "sha256": "1ydsd455dvaw6a180b6570bfgg0kxn01sn6cb57smqj835am6gx8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131209.2319",
         "deps": [
@@ -21432,7 +21551,7 @@
         },
         "recipe": {
             "sha256": "0i1bgjlwcc2ks8hzjkyrw924q4k8pcz8335z9935m73js0sq0lxl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140109.812",
         "deps": []
@@ -21447,7 +21566,7 @@
         },
         "recipe": {
             "sha256": "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141120.1431",
         "deps": []
@@ -21462,7 +21581,7 @@
         },
         "recipe": {
             "sha256": "17ckshimdma6fqiis4kxczxkbrsfpm2a0b41m5f3qz3qlhcw2xgr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140420.1143",
         "deps": []
@@ -21477,7 +21596,7 @@
         },
         "recipe": {
             "sha256": "10lxd93lkrvz8884dv4sh6fzzg355j7ab4p5dpvwry79rhs7f739",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.102",
         "deps": [
@@ -21494,7 +21613,7 @@
         },
         "recipe": {
             "sha256": "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150511.519",
         "deps": []
@@ -21509,7 +21628,7 @@
         },
         "recipe": {
             "sha256": "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150501.1300",
         "deps": [
@@ -21522,14 +21641,14 @@
             "tag": "fetchFromGitHub",
             "owner": "wavexx",
             "repo": "python-x.el",
-            "sha256": "0ahsz3ij4smngss0kspw0f27xl6324a48m7z0r78wywclnnpvrv2",
-            "rev": "1ffb8d748d1e01ca12ebf7ff93e0bade5cdf123a"
+            "sha256": "0ky23irh8zdkssgzhsyas37118vjc7w50rlc5a2414d2mmgnp70m",
+            "rev": "d241015775e34f5ef7844abc067ea68b88f0b548"
         },
         "recipe": {
             "sha256": "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151214.909",
+        "version": "20151226.1926",
         "deps": [
             "cl-lib",
             "folding",
@@ -21546,7 +21665,7 @@
         },
         "recipe": {
             "sha256": "017syizs8qw5phwvpzzffzdnj6rh9q4n7s51qjvj8qfb3088igkh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121018.204",
         "deps": []
@@ -21561,7 +21680,7 @@
         },
         "recipe": {
             "sha256": "14x9lzpkgkc96jsbfpahl027qh6y5azwdk0cmk9pbd1xm95kxj6n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131230.2108",
         "deps": [
@@ -21578,7 +21697,7 @@
         },
         "recipe": {
             "sha256": "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151127.218",
         "deps": [
@@ -21595,7 +21714,7 @@
         },
         "recipe": {
             "sha256": "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150806.1251",
         "deps": [
@@ -21613,7 +21732,7 @@
         },
         "recipe": {
             "sha256": "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150402.1922",
         "deps": []
@@ -21626,8 +21745,8 @@
             "rev": "5b49aea3810d"
         },
         "recipe": {
-            "sha256": "00vck0ma5c4zygw0jfqx4nk4pv40rvzvrlp8igzwr0533p19p0pk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151014.2228",
         "deps": []
@@ -21642,7 +21761,7 @@
         },
         "recipe": {
             "sha256": "1ya1bvh28qgz1zg9kdh2lzbsf0w0lx4xr42mdrjwaz3bbfa9asg4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150527.423",
         "deps": [
@@ -21657,7 +21776,7 @@
         },
         "recipe": {
             "sha256": "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20090208.2238",
         "deps": []
@@ -21672,11 +21791,28 @@
         },
         "recipe": {
             "sha256": "13xwvyy27dz1abjkkazm3s1p6cw32l2klr1bnln02w0azkbdy7x3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -21687,7 +21823,7 @@
         },
         "recipe": {
             "sha256": "1g9wzkkqmlkxlxwx43446q9mlam035zwq0wzpf7m6394rw2xlwx6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.2057",
         "deps": []
@@ -21702,7 +21838,7 @@
         },
         "recipe": {
             "sha256": "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.513",
         "deps": [
@@ -21720,7 +21856,7 @@
         },
         "recipe": {
             "sha256": "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151108.116",
         "deps": []
@@ -21735,7 +21871,7 @@
         },
         "recipe": {
             "sha256": "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.639",
         "deps": [
@@ -21752,7 +21888,7 @@
         },
         "recipe": {
             "sha256": "178nhng87bdi8s0r2bdh2gk31w9mmjkyi6ncnddk3v7p8fsh4jjp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151202.1746",
         "deps": [
@@ -21765,14 +21901,14 @@
             "tag": "fetchFromGitHub",
             "owner": "ensime",
             "repo": "ensime-emacs",
-            "sha256": "0mzw17s831r8m4kbs2d5p15c86v7w1y7barzqwcj76sdbb7wfkmy",
-            "rev": "dc203a1fd52e05dee4462eb7b9cfb2ea28b833ca"
+            "sha256": "0p6fdph08332c82vv8ds2h6ghxjb1kird84ykblkx41f748hw2y2",
+            "rev": "f590c350695e3efbe3a3197bb4ad7e6a3174f77c"
         },
         "recipe": {
             "sha256": "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151205.1416",
+        "version": "20151224.620",
         "deps": [
             "company",
             "dash",
@@ -21793,7 +21929,7 @@
         },
         "recipe": {
             "sha256": "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151218.610",
         "deps": [
@@ -21811,7 +21947,7 @@
         },
         "recipe": {
             "sha256": "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150901.1017",
         "deps": [
@@ -21828,7 +21964,7 @@
         },
         "recipe": {
             "sha256": "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151008.1649",
         "deps": [
@@ -21845,7 +21981,7 @@
         },
         "recipe": {
             "sha256": "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150827.2234",
         "deps": [
@@ -21864,7 +22000,7 @@
         },
         "recipe": {
             "sha256": "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131015.822",
         "deps": [
@@ -21879,7 +22015,7 @@
         },
         "recipe": {
             "sha256": "11z23kx89yy03hzs1xlbcih70lsp2lplxs8nkc8jvfcpsjwypsl0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140630.947",
         "deps": []
@@ -21894,7 +22030,7 @@
         },
         "recipe": {
             "sha256": "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120328.314",
         "deps": [
@@ -21909,7 +22045,7 @@
         },
         "recipe": {
             "sha256": "075vzvmh9y403m1vm5a807vkzrqv8dmhgfdzyizfj80q365sv72p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.700",
         "deps": []
@@ -21922,7 +22058,7 @@
         },
         "recipe": {
             "sha256": "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150821.1428",
         "deps": [
@@ -21939,7 +22075,7 @@
         },
         "recipe": {
             "sha256": "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151021.2302",
         "deps": [
@@ -21957,7 +22093,7 @@
         },
         "recipe": {
             "sha256": "0mcyly88a3c15hl3wll56agpdsyvd26r501h0v64lasfr4k634m7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151113.1035",
         "deps": []
@@ -21972,7 +22108,7 @@
         },
         "recipe": {
             "sha256": "1ncsb4jip07hbrf1l4j9yzn3l0kb63ylhzzsb4bb2yx6as4a66k7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140102.1736",
         "deps": []
@@ -21987,7 +22123,7 @@
         },
         "recipe": {
             "sha256": "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.100",
         "deps": [
@@ -22005,7 +22141,7 @@
         },
         "recipe": {
             "sha256": "0klhxwxsz7xan2vsknw79r1dj4qhhjbfpddr67mk9qzccp8q0w8g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150825.327",
         "deps": []
@@ -22020,7 +22156,7 @@
         },
         "recipe": {
             "sha256": "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.1544",
         "deps": [
@@ -22036,7 +22172,7 @@
         },
         "recipe": {
             "sha256": "1xgq7wsh08fb23zv71lfw5rska9wijsl64ijpi2m06zyw1m7mdqr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140307.1044",
         "deps": []
@@ -22051,7 +22187,7 @@
         },
         "recipe": {
             "sha256": "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140320.208",
         "deps": [
@@ -22069,7 +22205,7 @@
         },
         "recipe": {
             "sha256": "0hixsi60nf0khm9xmya3saf95ahn1gydp0l5wxawsc491qwg4vqd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151116.1937",
         "deps": [
@@ -22081,12 +22217,12 @@
             "tag": "fetchFromGitHub",
             "owner": "cfengine",
             "repo": "core",
-            "sha256": "1z68f6x0ycpsiszlv7mwh2vcsrvl97nk0wzsn9q858yyki7slya1",
-            "rev": "ccaf5d1c5225ab4b50212273d45fb20b8034795e"
+            "sha256": "176s48z9zm8xl1dm891kzky0f6c0ammsn1kk9vps9i7cig8j4aar",
+            "rev": "6929de02ae1084c20f89ade7f2653ee8860baee0"
         },
         "recipe": {
             "sha256": "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131209.611",
         "deps": []
@@ -22101,7 +22237,7 @@
         },
         "recipe": {
             "sha256": "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150411.1055",
         "deps": []
@@ -22116,7 +22252,7 @@
         },
         "recipe": {
             "sha256": "1yw251f6vpj2bikjw79arywprk8qnmmfcki99mvwnqhsqlv1a8iv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151015.1249",
         "deps": [
@@ -22134,7 +22270,7 @@
         },
         "recipe": {
             "sha256": "12ami0k6rfwhrr6xgj0dls4mkk6dp0r9smwzhr4897dv0lw89bdj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.803",
         "deps": [
@@ -22152,7 +22288,7 @@
         },
         "recipe": {
             "sha256": "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151120.1809",
         "deps": []
@@ -22165,7 +22301,7 @@
         },
         "recipe": {
             "sha256": "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.1226",
         "deps": []
@@ -22180,7 +22316,7 @@
         },
         "recipe": {
             "sha256": "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120319.1859",
         "deps": [
@@ -22197,7 +22333,7 @@
         },
         "recipe": {
             "sha256": "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150101.2206",
         "deps": []
@@ -22212,7 +22348,7 @@
         },
         "recipe": {
             "sha256": "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121006.34",
         "deps": [
@@ -22229,7 +22365,7 @@
         },
         "recipe": {
             "sha256": "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151007.537",
         "deps": [
@@ -22248,7 +22384,7 @@
         },
         "recipe": {
             "sha256": "0v29rzlyccrc37052w2qmvjaii84jihhp736l807b0hjjfryras4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150214.23",
         "deps": []
@@ -22263,7 +22399,7 @@
         },
         "recipe": {
             "sha256": "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131013.1044",
         "deps": [
@@ -22280,7 +22416,7 @@
         },
         "recipe": {
             "sha256": "0mww0jysxqky1zkkhvhj7fn20w970n2w6501rdm5jwqfb58ivxfx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150929.801",
         "deps": []
@@ -22295,7 +22431,7 @@
         },
         "recipe": {
             "sha256": "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151204.1100",
         "deps": []
@@ -22310,7 +22446,7 @@
         },
         "recipe": {
             "sha256": "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": [
@@ -22330,7 +22466,7 @@
         },
         "recipe": {
             "sha256": "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150906.2352",
         "deps": [
@@ -22345,7 +22481,7 @@
         },
         "recipe": {
             "sha256": "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1841",
         "deps": []
@@ -22360,7 +22496,7 @@
         },
         "recipe": {
             "sha256": "0qqsg383391dnsk46xm8plq7xmdmnis3iv7h7dmchpzd99bkm9lq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141105.1226",
         "deps": []
@@ -22375,7 +22511,7 @@
         },
         "recipe": {
             "sha256": "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150513.1253",
         "deps": [
@@ -22393,7 +22529,7 @@
         },
         "recipe": {
             "sha256": "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151002.2249",
         "deps": [
@@ -22410,7 +22546,7 @@
         },
         "recipe": {
             "sha256": "0ndavaan7k55l3ghm5h08i0slmmzc82c0gl4b8w91fa8bi2lq4h4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.733",
         "deps": [
@@ -22427,7 +22563,7 @@
         },
         "recipe": {
             "sha256": "14wxfhb17n2f9wil68lb05abj7m0whwkqvrm3y9dg9mh14lcpbvc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151128.1712",
         "deps": []
@@ -22442,7 +22578,7 @@
         },
         "recipe": {
             "sha256": "1y9idhf9qcsw3dbdj7rwa7bdrn1q0m3bg3r2jzwdnvkq8aas1w56",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150320.826",
         "deps": [
@@ -22458,7 +22594,7 @@
         },
         "recipe": {
             "sha256": "10szb9mni37s2blvhl1spj96narmkrv8zhrryw9q1251z8laq5v0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120508.1320",
         "deps": []
@@ -22473,7 +22609,7 @@
         },
         "recipe": {
             "sha256": "0nf1f719m4pvxn0mf4qyx8mzwhrhv6kchnrpiy9clx520y8x3dqi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131221.545",
         "deps": [
@@ -22491,7 +22627,7 @@
         },
         "recipe": {
             "sha256": "0h25lc87pa8irgxflnmnmkr9dcv4kz841nfc45fcz4awrn75kkzb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151125.335",
         "deps": []
@@ -22506,7 +22642,7 @@
         },
         "recipe": {
             "sha256": "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150226.1017",
         "deps": []
@@ -22521,7 +22657,7 @@
         },
         "recipe": {
             "sha256": "0022bhy1mzngjmjydyqnmlgnhww05v4dxsfav034r8nyyc7677z0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130131.348",
         "deps": []
@@ -22536,7 +22672,7 @@
         },
         "recipe": {
             "sha256": "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150115.1301",
         "deps": [
@@ -22549,14 +22685,14 @@
             "tag": "fetchFromGitHub",
             "owner": "marcowahl",
             "repo": "rope-read-mode",
-            "sha256": "1mmrk88nlv66f5q7l7wll1ivc0hpcv5rd1wq3my8b2xvhwxlhfqs",
-            "rev": "8837e18405f96aab34821e890141ecf6b749bb73"
+            "sha256": "1zcpd2rb35xjv16jrypd0vvsfw8ik72gil8wdzbwq19phjqvccjx",
+            "rev": "9ea77f9cb6f5e4e97838f05603a1c81834bcde1f"
         },
         "recipe": {
             "sha256": "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151118.1705",
+        "version": "20151220.1359",
         "deps": []
     },
     "desktop+": {
@@ -22569,7 +22705,7 @@
         },
         "recipe": {
             "sha256": "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151004.1440",
         "deps": [
@@ -22588,7 +22724,7 @@
         },
         "recipe": {
             "sha256": "12qggg1m28mlvkdn52dig8bwv58pvipkvn1mlc4r7w569arar44x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141205.1815",
         "deps": []
@@ -22603,7 +22739,7 @@
         },
         "recipe": {
             "sha256": "1bfzs5px1k6g3cnwjdaq2m78bbnfy3lxhjzkcch7zdv3nyacwl5z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1812",
         "deps": [
@@ -22620,7 +22756,7 @@
         },
         "recipe": {
             "sha256": "0piy5gy9a7c8s10b99fmdyh6glhvjvdyrz0x2bv30h7wplx5szi6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140203.1706",
         "deps": [
@@ -22644,7 +22780,7 @@
         },
         "recipe": {
             "sha256": "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150514.928",
         "deps": []
@@ -22659,7 +22795,7 @@
         },
         "recipe": {
             "sha256": "0gj0nv6ii7pya0hcxs8haz5pahj0sa12c2ls53c3j85in645zb3s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140920.1611",
         "deps": []
@@ -22674,7 +22810,7 @@
         },
         "recipe": {
             "sha256": "1qadwkcic2qckqy8hgrnj08ajhxayknhpyxkc6ir15vfqjk5crr8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130127.524",
         "deps": []
@@ -22689,7 +22825,7 @@
         },
         "recipe": {
             "sha256": "1mrl2x6j708nchyh9y5avbf2cq10kpnhfj553l6akarvl5n5pvkl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150807.232",
         "deps": [
@@ -22706,7 +22842,7 @@
         },
         "recipe": {
             "sha256": "0r265rwfbl1iyclnspxpbzf2w1q0w8dnc0wv5mz5g6hhcrr0iv6g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140605.1610",
         "deps": [
@@ -22726,7 +22862,7 @@
         },
         "recipe": {
             "sha256": "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.1527",
         "deps": []
@@ -22741,7 +22877,7 @@
         },
         "recipe": {
             "sha256": "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151110.2213",
         "deps": [
@@ -22758,7 +22894,7 @@
         },
         "recipe": {
             "sha256": "0xm7zzz6hs5qnqkmv7hwxpvp3jjca57agx71sj0m12v0h53gbzhr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151130.807",
         "deps": [
@@ -22776,7 +22912,7 @@
         },
         "recipe": {
             "sha256": "0ldy6j6l6rf72w0hl195rdnrabml2a5k91200s186k0r5aja4b95",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130329.48",
         "deps": []
@@ -22791,7 +22927,7 @@
         },
         "recipe": {
             "sha256": "05mnq0bgcla0pxsgywpvcdgd4sk2xr7bjlp87l0dx8j121vqripj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151031.1139",
         "deps": [
@@ -22808,7 +22944,7 @@
         },
         "recipe": {
             "sha256": "1b2vi8q6jhq1xv7yr5f3aiyp1w8j59w19vxys0pv6bqr2gra07i1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140517.918",
         "deps": [
@@ -22825,7 +22961,7 @@
         },
         "recipe": {
             "sha256": "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140303.1542",
         "deps": [
@@ -22844,7 +22980,7 @@
         },
         "recipe": {
             "sha256": "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150310.353",
         "deps": [
@@ -22861,7 +22997,7 @@
         },
         "recipe": {
             "sha256": "0zzxi3c203fiw6jp1ar9bb9f28x2lg23bczgy8n5cicrq59jfsn9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140713.131",
         "deps": [
@@ -22878,7 +23014,7 @@
         },
         "recipe": {
             "sha256": "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151117.358",
         "deps": []
@@ -22893,7 +23029,7 @@
         },
         "recipe": {
             "sha256": "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150929.1448",
         "deps": [
@@ -22908,7 +23044,7 @@
         },
         "recipe": {
             "sha256": "13yv2nmx1wb80z4yifnh6d67rag17wirmp7z8ssq3havjl8lbpix",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1622",
         "deps": []
@@ -22923,7 +23059,7 @@
         },
         "recipe": {
             "sha256": "1bddkcl9kzj3v071qpzmxzjwywqfj5j6cldz240qgp5mx685r0a9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150307.211",
         "deps": [
@@ -22940,7 +23076,7 @@
         },
         "recipe": {
             "sha256": "0gnyjwn6jshs8bzdssm2xppg2s9p2x3rrhp523q39aydskc6ggc9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1018",
         "deps": []
@@ -22955,7 +23091,7 @@
         },
         "recipe": {
             "sha256": "12yq4dhyv3p5gxnd2w193ilpj2d3gx5ns09w0z1zkg7ax3a4q4b8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150818.2328",
         "deps": []
@@ -22970,7 +23106,7 @@
         },
         "recipe": {
             "sha256": "1448rffyzn5k5mr31hwd28wlj7if7rp5sjlqcsvbxd2mnbgkgjz0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151012.1828",
         "deps": [
@@ -22987,7 +23123,7 @@
         },
         "recipe": {
             "sha256": "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151217.215",
         "deps": []
@@ -23002,7 +23138,7 @@
         },
         "recipe": {
             "sha256": "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.154",
         "deps": []
@@ -23017,7 +23153,7 @@
         },
         "recipe": {
             "sha256": "0pa66ymhazcfgd9jmxizq5w2sgj008hph42wsa9ljr2rina1gai6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140310.430",
         "deps": []
@@ -23032,7 +23168,7 @@
         },
         "recipe": {
             "sha256": "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.653",
         "deps": []
@@ -23047,7 +23183,7 @@
         },
         "recipe": {
             "sha256": "1myaqxzrgff5gxcn3zn1bsmyf5122ql1mwr05wamd450lq8nmbw5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151122.2321",
         "deps": [
@@ -23064,7 +23200,7 @@
         },
         "recipe": {
             "sha256": "0215li17gn35wmvd84gnp4hkwa2jd81wz4frb1cba2b5j33rlprc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150721.1437",
         "deps": []
@@ -23079,7 +23215,7 @@
         },
         "recipe": {
             "sha256": "0wapicggkngpdzi0yxc0b24s526fs819rc2d6miv6ix3gnw11n0n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150110.812",
         "deps": []
@@ -23094,7 +23230,7 @@
         },
         "recipe": {
             "sha256": "0jpdq090r37d07bm52yx3x9y3gsip6fyxxq1ax1k5k0r0js45kq9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.102",
         "deps": [
@@ -23111,7 +23247,7 @@
         },
         "recipe": {
             "sha256": "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141231.1558",
         "deps": []
@@ -23126,7 +23262,7 @@
         },
         "recipe": {
             "sha256": "18mj0vpv3dybfpa8hl9jwlagsivbhgqgz8lwb8cswsq9hwv3jgd3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141024.423",
         "deps": []
@@ -23141,7 +23277,7 @@
         },
         "recipe": {
             "sha256": "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150826.1609",
         "deps": []
@@ -23156,7 +23292,7 @@
         },
         "recipe": {
             "sha256": "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151202.830",
         "deps": [
@@ -23174,7 +23310,7 @@
         },
         "recipe": {
             "sha256": "19i6ys58wswl5ckf33swl6lsfzg4znx850br4icik15yrry65yj7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150218.45",
         "deps": [
@@ -23191,7 +23327,7 @@
         },
         "recipe": {
             "sha256": "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151202.1739",
         "deps": []
@@ -23206,7 +23342,7 @@
         },
         "recipe": {
             "sha256": "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130429.1659",
         "deps": [
@@ -23223,7 +23359,7 @@
         },
         "recipe": {
             "sha256": "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140619.722",
         "deps": []
@@ -23238,7 +23374,7 @@
         },
         "recipe": {
             "sha256": "0jahi84ra9g7h0cvz3c02zkbkknrzgv48zq32n72lkxl958swqn1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130113.1700",
         "deps": [
@@ -23256,7 +23392,7 @@
         },
         "recipe": {
             "sha256": "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150828.613",
         "deps": [
@@ -23269,14 +23405,14 @@
             "tag": "fetchFromGitHub",
             "owner": "politza",
             "repo": "pdf-tools",
-            "sha256": "1ik26v8x94myx04wy9vi6bwzvfxbl43fam765g0gy2n8289bhpi8",
-            "rev": "aac3bdc43eb6ea78dcf7c59653c9aa526fb41f1f"
+            "sha256": "05b5fn3w2bika21a5sxyjs3yfrcdvn6qdrx9li1jda9jg623bpn3",
+            "rev": "97b86cd09a411d00a7947da76b4c3f77995ccf44"
         },
         "recipe": {
             "sha256": "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151126.1658",
+        "version": "20151224.1359",
         "deps": [
             "emacs",
             "let-alist",
@@ -23293,7 +23429,7 @@
         },
         "recipe": {
             "sha256": "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151205.1203",
         "deps": [
@@ -23310,7 +23446,7 @@
         },
         "recipe": {
             "sha256": "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150707.1116",
         "deps": [
@@ -23327,7 +23463,7 @@
         },
         "recipe": {
             "sha256": "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.1057",
         "deps": []
@@ -23342,7 +23478,7 @@
         },
         "recipe": {
             "sha256": "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131209.658",
         "deps": []
@@ -23357,7 +23493,7 @@
         },
         "recipe": {
             "sha256": "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.1347",
         "deps": [
@@ -23379,7 +23515,7 @@
         },
         "recipe": {
             "sha256": "0iqqvygx50wi2vcbs6bfgqzhcz9a89zrwb7sg0ang9qrkiz5k36w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150917.100",
         "deps": []
@@ -23394,7 +23530,7 @@
         },
         "recipe": {
             "sha256": "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141217.1934",
         "deps": [
@@ -23412,7 +23548,7 @@
         },
         "recipe": {
             "sha256": "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": [
@@ -23433,7 +23569,7 @@
         },
         "recipe": {
             "sha256": "1lpsjpc7par12zsmg9sf4r1h039kxa4n68anjr3mhpp3d6rapjcx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151018.135",
         "deps": []
@@ -23443,14 +23579,14 @@
             "tag": "fetchFromGitHub",
             "owner": "flycheck",
             "repo": "flycheck-pos-tip",
-            "sha256": "17xfh8kbf1915mq4wli32nrvk7jcg67kq698cc35g8glkkxjm64v",
-            "rev": "6209525c675832ae4026d1458cb14fdd9e4b7527"
+            "sha256": "1aq68lycw3pfzb0bivldfaz8v6lf35jidjgm74hh2pgppvijyi31",
+            "rev": "32ddd6bf3c1a642a9f7afe25475c4bf2ebc7aae9"
         },
         "recipe": {
             "sha256": "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151130.258",
+        "version": "20151224.822",
         "deps": [
             "dash",
             "flycheck",
@@ -23467,7 +23603,7 @@
         },
         "recipe": {
             "sha256": "1whjlkpkkirpnvvjryhlpzwphr1syz5zfyg4pb66i0db03hxwwcy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130620.2110",
         "deps": []
@@ -23482,7 +23618,7 @@
         },
         "recipe": {
             "sha256": "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150413.1548",
         "deps": [
@@ -23500,7 +23636,7 @@
         },
         "recipe": {
             "sha256": "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150702.924",
         "deps": [
@@ -23518,7 +23654,7 @@
         },
         "recipe": {
             "sha256": "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140211.304",
         "deps": [
@@ -23536,7 +23672,7 @@
         },
         "recipe": {
             "sha256": "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150202.416",
         "deps": []
@@ -23551,7 +23687,7 @@
         },
         "recipe": {
             "sha256": "1kgs4ki0s6bxx2ri6zxmsy2b2w56gnr9hjkr6302wcmp3qy7clwn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150708.1957",
         "deps": [
@@ -23568,7 +23704,7 @@
         },
         "recipe": {
             "sha256": "0dq9p37i5rrp2nb1vhqzzqfmdg11va2xr3yz8hdxpwykm1ldqdcf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130902.1248",
         "deps": [
@@ -23585,7 +23721,7 @@
         },
         "recipe": {
             "sha256": "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.837",
         "deps": [
@@ -23601,7 +23737,7 @@
         },
         "recipe": {
             "sha256": "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150710.2151",
         "deps": []
@@ -23616,7 +23752,7 @@
         },
         "recipe": {
             "sha256": "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151108.1107",
         "deps": [
@@ -23633,7 +23769,7 @@
         },
         "recipe": {
             "sha256": "1djqzzlbwsp9xyjqjbjwdck73wzikbpq19irzamybk90nc98wirl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140220.1701",
         "deps": []
@@ -23648,7 +23784,7 @@
         },
         "recipe": {
             "sha256": "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150318.1013",
         "deps": []
@@ -23663,7 +23799,7 @@
         },
         "recipe": {
             "sha256": "0wbrszl9rq4is0ymxq9lxpqzlfg93gljh6almjy0hp3cs7pkzyl4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151011.1416",
         "deps": []
@@ -23678,7 +23814,7 @@
         },
         "recipe": {
             "sha256": "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150604.233",
         "deps": [
@@ -23698,7 +23834,7 @@
         },
         "recipe": {
             "sha256": "0azahlflnh6sk081k5dcqal6nmwkjnj4dq8pv8ckwf8684zp23d3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150203.125",
         "deps": []
@@ -23712,7 +23848,7 @@
         },
         "recipe": {
             "sha256": "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151025.1804",
         "deps": [
@@ -23729,7 +23865,7 @@
         },
         "recipe": {
             "sha256": "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151202.1818",
         "deps": [
@@ -23746,7 +23882,7 @@
         },
         "recipe": {
             "sha256": "056pcr9ynsl34wqa2pw6sh4bdl5kpp1r0pl1vvw15p4866l9bdz3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141017.444",
         "deps": [
@@ -23763,7 +23899,7 @@
         },
         "recipe": {
             "sha256": "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151217.753",
         "deps": [
@@ -23781,7 +23917,7 @@
         },
         "recipe": {
             "sha256": "0k36c2k7wwix10rgmjxipc77fkn9jahjyvl191af6w41wla47x4x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151125.410",
         "deps": [
@@ -23798,7 +23934,7 @@
         },
         "recipe": {
             "sha256": "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.507",
         "deps": []
@@ -23813,7 +23949,7 @@
         },
         "recipe": {
             "sha256": "061mmw39dq8sqzi2589lf7svy15n2iyiwbfiram48r2yhma5dd0f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130627.1808",
         "deps": []
@@ -23828,7 +23964,7 @@
         },
         "recipe": {
             "sha256": "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150423.2322",
         "deps": [
@@ -23846,7 +23982,7 @@
         },
         "recipe": {
             "sha256": "0ak6g2d2sq026ml6cmn6v1qz7sczkplgv2j9zq9zgzafihyyzs5f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130513.1737",
         "deps": [
@@ -23864,7 +24000,7 @@
         },
         "recipe": {
             "sha256": "1iihfsmnkpfp08pldghf3w5k8v5dlmy5ns0l4niwdwp5w8lyjcd6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130424.1019",
         "deps": [
@@ -23882,7 +24018,7 @@
         },
         "recipe": {
             "sha256": "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130324.551",
         "deps": [
@@ -23899,7 +24035,7 @@
         },
         "recipe": {
             "sha256": "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150307.408",
         "deps": []
@@ -23914,7 +24050,7 @@
         },
         "recipe": {
             "sha256": "0m9rqjb5c0yqr2wv5dsdiba21knr63b5pxsqgbkbybi15zgxcicb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150807.331",
         "deps": []
@@ -23929,7 +24065,7 @@
         },
         "recipe": {
             "sha256": "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141111.307",
         "deps": []
@@ -23944,7 +24080,7 @@
         },
         "recipe": {
             "sha256": "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150823.608",
         "deps": [
@@ -23963,7 +24099,7 @@
         },
         "recipe": {
             "sha256": "1199k1xvvv7ald6ywrh2sfpw2v42ckpcsw6mcj617bg3b5m7770i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130407.1322",
         "deps": [
@@ -23981,7 +24117,7 @@
         },
         "recipe": {
             "sha256": "0q7v70xbprh03f1yabq216q4q82a58s2c1ykr6ig49cg1jdgzkf3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140205.725",
         "deps": [
@@ -23998,7 +24134,7 @@
         },
         "recipe": {
             "sha256": "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.604",
         "deps": [
@@ -24016,7 +24152,7 @@
         },
         "recipe": {
             "sha256": "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151116.2040",
         "deps": [
@@ -24035,7 +24171,7 @@
         },
         "recipe": {
             "sha256": "1fk5xz8qq3azc66f954x5qvym94xnv4fg6wy83ihdfwycsas7j20",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.1412",
         "deps": []
@@ -24050,7 +24186,7 @@
         },
         "recipe": {
             "sha256": "0axr0x8mdxif0xbvs83mxc3gqgs84jb4b9la9n62i3lldckghwmg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20101016.1022",
         "deps": []
@@ -24065,7 +24201,7 @@
         },
         "recipe": {
             "sha256": "08bz60fxcgzab77690mmv0f7wdxcpygmasazcss427k37z9ysm7r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150328.959",
         "deps": [
@@ -24083,7 +24219,7 @@
         },
         "recipe": {
             "sha256": "0l41xp38iji55dv20lk7r187ywcz8s1g2jmwbjwkspzmcf763xvx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150215.1548",
         "deps": []
@@ -24098,7 +24234,7 @@
         },
         "recipe": {
             "sha256": "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140501.731",
         "deps": [
@@ -24115,7 +24251,7 @@
         },
         "recipe": {
             "sha256": "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140610.231",
         "deps": [
@@ -24133,7 +24269,7 @@
         },
         "recipe": {
             "sha256": "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.1021",
         "deps": []
@@ -24146,7 +24282,7 @@
         },
         "recipe": {
             "sha256": "14i9w897gnb3mvnkbzhzij04bgr551r8km310mbrmzzag54w077z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120329.1136",
         "deps": []
@@ -24161,7 +24297,7 @@
         },
         "recipe": {
             "sha256": "0dddx5nxr519wqdgrbglh0pqjl3alg4ddmank42g4llzycy61wsd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151115.1956",
         "deps": [
@@ -24178,7 +24314,7 @@
         },
         "recipe": {
             "sha256": "1r5k7022vxgj3p5l16y839lff85z0m9hpifq59knij61g9hxadsp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150904.1313",
         "deps": [
@@ -24197,7 +24333,7 @@
         },
         "recipe": {
             "sha256": "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141104.1845",
         "deps": [
@@ -24214,7 +24350,7 @@
         },
         "recipe": {
             "sha256": "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.413",
         "deps": [
@@ -24232,7 +24368,7 @@
         },
         "recipe": {
             "sha256": "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.700",
         "deps": []
@@ -24247,7 +24383,7 @@
         },
         "recipe": {
             "sha256": "04dj2r4035k0c3x6iyjydshzmq381d60pmscp2hg5m7sp7bqn5xs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150302.734",
         "deps": [
@@ -24264,7 +24400,7 @@
         },
         "recipe": {
             "sha256": "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151026.111",
         "deps": [
@@ -24282,7 +24418,7 @@
         },
         "recipe": {
             "sha256": "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140310.1632",
         "deps": []
@@ -24297,7 +24433,7 @@
         },
         "recipe": {
             "sha256": "0k4n4vw261v3bcxg7pqhxr99vh673l963yjridl0dp1663gcrfpk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150722.726",
         "deps": [
@@ -24315,7 +24451,7 @@
         },
         "recipe": {
             "sha256": "1y52675j4kcq14jypxjw1rflxrxwaxyn1n3m613klad55wpfaamf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141202.1157",
         "deps": [
@@ -24333,7 +24469,7 @@
         },
         "recipe": {
             "sha256": "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150604.1238",
         "deps": [
@@ -24353,7 +24489,7 @@
         },
         "recipe": {
             "sha256": "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150304.848",
         "deps": [
@@ -24372,7 +24508,7 @@
         },
         "recipe": {
             "sha256": "1cgmqsl5dzi8xy3sh5xsfkczl555fpd4q6kgsh9xkn74sz227907",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130718.932",
         "deps": [
@@ -24389,7 +24525,7 @@
         },
         "recipe": {
             "sha256": "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150120.2358",
         "deps": [
@@ -24406,7 +24542,7 @@
         },
         "recipe": {
             "sha256": "1v46ck9imffhrmx6s4c3kbi5g5spf2mn2axy5nfpn7q8sc8bf0s3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150217.2028",
         "deps": [
@@ -24424,7 +24560,7 @@
         },
         "recipe": {
             "sha256": "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.1327",
         "deps": [
@@ -24441,7 +24577,7 @@
         },
         "recipe": {
             "sha256": "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150902.1149",
         "deps": []
@@ -24456,7 +24592,7 @@
         },
         "recipe": {
             "sha256": "1c6vxpd9c24d2flzwgvzqz0wr70xzqqs3f59pp897h0f7j91im5d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120830.1228",
         "deps": []
@@ -24471,7 +24607,7 @@
         },
         "recipe": {
             "sha256": "05cnvyqmh5h5mqys7qs7d9knzxzmi2x0j1avp77x5l5njzzv59s2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150702.304",
         "deps": []
@@ -24486,13 +24622,28 @@
         },
         "recipe": {
             "sha256": "0hr2zz7nq65jig2036g5sa8q2lhb42jv40ijikcz8s4f5v3y14i7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -24503,7 +24654,7 @@
         },
         "recipe": {
             "sha256": "08s73pnyrmklb660jl5rshncpq31z3m9fl55v7453ch8syp7gzh7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131106.1303",
         "deps": [
@@ -24521,7 +24672,7 @@
         },
         "recipe": {
             "sha256": "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150605.406",
         "deps": []
@@ -24530,15 +24681,15 @@
         "fetch": {
             "tag": "fetchFromGitHub",
             "owner": "bbatsov",
-            "repo": "projectile",
-            "sha256": "01mwciy9bacx5vkxckp0hsxx0s00qss48kkcc2rhlypdcmmawvn7",
-            "rev": "05058b1c73799b07003ad0978f5ba9a231783be4"
+            "repo": "helm-projectile",
+            "sha256": "1c6pfy3qghpqnng1jsnxnvqnd6sq41f2dm7kkwkgml405asqlcqa",
+            "rev": "2544343b4214511988fa1b652474d7984008f807"
         },
         "recipe": {
-            "sha256": "0s7la43q2v2h2s6lykxw5ag8if8d931jhw5k716b26ihzl1xxbv5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.49",
+        "version": "20151220.421",
         "deps": [
             "cl-lib",
             "dash",
@@ -24556,7 +24707,7 @@
         },
         "recipe": {
             "sha256": "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151104.1737",
         "deps": [
@@ -24574,7 +24725,7 @@
         },
         "recipe": {
             "sha256": "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151204.119",
         "deps": [
@@ -24595,7 +24746,7 @@
         },
         "recipe": {
             "sha256": "1v1pfmm9g18p6kgn27q1m1bjgwbzvwfm0jbsxp8gdsssaygky71k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150830.1601",
         "deps": [
@@ -24613,7 +24764,7 @@
         },
         "recipe": {
             "sha256": "0mbq9v8fiqqyldpb66v9bc777mzxywaq2dabivabxjg6554s8chf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150315.1942",
         "deps": []
@@ -24628,7 +24779,7 @@
         },
         "recipe": {
             "sha256": "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140615.120",
         "deps": []
@@ -24643,7 +24794,7 @@
         },
         "recipe": {
             "sha256": "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151125.225",
         "deps": [
@@ -24661,7 +24812,7 @@
         },
         "recipe": {
             "sha256": "0xf2r5ca3gnx2cv9f8rr4s1hds2ggqsbllvfr229gznkcqjnglik",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151003.531",
         "deps": [
@@ -24681,7 +24832,7 @@
         },
         "recipe": {
             "sha256": "18sxgihmqmkrbgs66qgnrsjqbp90l93531hns31fbnif10bkx2j5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120331.1544",
         "deps": []
@@ -24696,7 +24847,7 @@
         },
         "recipe": {
             "sha256": "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150917.613",
         "deps": [
@@ -24713,7 +24864,7 @@
         },
         "recipe": {
             "sha256": "0yghf2ixl3dkcaxnkr4qzxfa9k1rrac7w5qpw1jx2bvic0cfs40l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150818.320",
         "deps": []
@@ -24728,7 +24879,7 @@
         },
         "recipe": {
             "sha256": "0iycyfgv8v15ygngvyx66m3w3sv8p9h6q6j1hbpzwd8azl8fzj5z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141229.1919",
         "deps": [
@@ -24746,7 +24897,7 @@
         },
         "recipe": {
             "sha256": "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130901.935",
         "deps": []
@@ -24761,7 +24912,7 @@
         },
         "recipe": {
             "sha256": "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.2255",
         "deps": [
@@ -24778,7 +24929,7 @@
         },
         "recipe": {
             "sha256": "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150119.1906",
         "deps": [
@@ -24794,7 +24945,7 @@
         },
         "recipe": {
             "sha256": "1j0y4h97pqsw6k18w6r3rza3ql04ag3cixyndji7i1smbfsh4v95",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120808.2207",
         "deps": []
@@ -24809,7 +24960,7 @@
         },
         "recipe": {
             "sha256": "1lj9a0bgn7lmc2wyjzzvmpaz1f1spj02l51ki2wydjbfhxq61k0s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130721.1950",
         "deps": []
@@ -24824,7 +24975,7 @@
         },
         "recipe": {
             "sha256": "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141105.2236",
         "deps": []
@@ -24839,7 +24990,7 @@
         },
         "recipe": {
             "sha256": "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130209.1940",
         "deps": [
@@ -24856,7 +25007,7 @@
         },
         "recipe": {
             "sha256": "0vrxkg62qr3ki8n9mdn02sdni5fkj79fpkn0drx0a4kqp0nrrj7c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140115.424",
         "deps": []
@@ -24871,7 +25022,7 @@
         },
         "recipe": {
             "sha256": "0riz5n8fzvxdnzgg650xqc2zwc4xvhwjlrrzls5h0pl5adaxz96p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130926.10",
         "deps": []
@@ -24886,7 +25037,7 @@
         },
         "recipe": {
             "sha256": "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150130.1004",
         "deps": [
@@ -24903,7 +25054,7 @@
         },
         "recipe": {
             "sha256": "1ackqv95sdphbsjwydbc4dmdzwpaj74v329f55zcwa8hn3li9d5m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131004.1759",
         "deps": []
@@ -24913,14 +25064,14 @@
             "tag": "fetchFromGitHub",
             "owner": "fourier",
             "repo": "idea-darkula-theme",
-            "sha256": "0i5cw6wcykirpkgyq5sg8mcpz2pf0fvjscw5n4mqcqgr0mzkxqq1",
-            "rev": "6ee45ec8a97d9afadc4d8f96d838b365c36d5f2d"
+            "sha256": "0famn16syz4d5ln1xiblqm0naxr5cnv9757r03xnzi9l9r67vyrs",
+            "rev": "509481632d337dc6ad49809225d209eb2fdb243f"
         },
         "recipe": {
             "sha256": "0lanhwlhd7pbzjc047vd5sgsmi2bx66gr3inr8y57swgrfw3l8sk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151210.1310",
+        "version": "20151223.517",
         "deps": [
             "emacs"
         ]
@@ -24930,14 +25081,14 @@
             "tag": "fetchFromGitHub",
             "owner": "jyp",
             "repo": "boon",
-            "sha256": "1apxgj14hgfpz6hjp3384yjf2zrkv4pcncf2zklijs668igvaskq",
-            "rev": "82458a944e9cf3e4c959e63ebad09312aafe6d2c"
+            "sha256": "1qgyfcrk1rs1kbshmcgy67hhpfw7rbkbncm3iyqs51wk076hss7a",
+            "rev": "b4bb92a5c4ce0367e84137b29625a03ace60da2a"
         },
         "recipe": {
             "sha256": "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151213.1533",
+        "version": "20151226.1557",
         "deps": [
             "emacs",
             "expand-region",
@@ -24954,7 +25105,7 @@
         },
         "recipe": {
             "sha256": "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121016.357",
         "deps": []
@@ -24969,7 +25120,7 @@
         },
         "recipe": {
             "sha256": "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150611.1237",
         "deps": []
@@ -24984,7 +25135,7 @@
         },
         "recipe": {
             "sha256": "13zynac3h50x68f1ja72kqdrapjks2zmgqd4g7qwscq92mmh60i9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130325.907",
         "deps": [
@@ -24999,7 +25150,7 @@
         },
         "recipe": {
             "sha256": "1iq08s5ji6hd8as80qxqkbavnjbx0kcmmjjvhjchmvv93vsn1f96",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150112.1454",
         "deps": []
@@ -25013,7 +25164,7 @@
         },
         "recipe": {
             "sha256": "1r9mh7756jgf1hdnprci988z07xxh2jvh8d0c1h5rmxmldlbx8az",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120814.312",
         "deps": []
@@ -25028,7 +25179,7 @@
         },
         "recipe": {
             "sha256": "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150803.1620",
         "deps": []
@@ -25043,7 +25194,7 @@
         },
         "recipe": {
             "sha256": "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140625.2306",
         "deps": []
@@ -25058,7 +25209,7 @@
         },
         "recipe": {
             "sha256": "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150307.712",
         "deps": []
@@ -25073,7 +25224,7 @@
         },
         "recipe": {
             "sha256": "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151124.338",
         "deps": [
@@ -25090,7 +25241,7 @@
         },
         "recipe": {
             "sha256": "1vi30y71vflsbprp5j4phbp7x1j24vxn9d6sifaddari0g0zxpfw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150907.1504",
         "deps": []
@@ -25105,7 +25256,7 @@
         },
         "recipe": {
             "sha256": "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151124.333",
         "deps": [
@@ -25124,7 +25275,7 @@
         },
         "recipe": {
             "sha256": "04jqnag8jiyfbwvc3vd9ikrsmf6cajld7dz2gz9y0zkj1k4gs7zv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150505.1211",
         "deps": []
@@ -25134,12 +25285,12 @@
             "tag": "fetchFromGitHub",
             "owner": "skeeto",
             "repo": "autotetris-mode",
-            "sha256": "14pjsb026mgjf6l3dggy255knr7c1vfmgb6kgafmkzvr96aglcdc",
-            "rev": "7d348d33829bc89ddbd2b4d5cfe5073c3b0cbaaa"
+            "sha256": "162zay36mmkkpbfvp0lagv2js4cr1z75dc1z5l2505814m5sx3az",
+            "rev": "dd490d5ad6d84bd964ab349484f6a2d05651ede1"
         },
         "recipe": {
             "sha256": "0k4yq4pvrs1zaf9aqxmlb6l2v4k774zbxj4zcx49w3l1h8gwxpbb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141114.1046",
         "deps": [
@@ -25156,7 +25307,7 @@
         },
         "recipe": {
             "sha256": "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.839",
         "deps": [
@@ -25171,7 +25322,7 @@
         },
         "recipe": {
             "sha256": "0mpy84f2zdyzmipzhs06b8rl2pxiypazf35ls1nc1yj8r16ijrds",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1609",
         "deps": []
@@ -25186,7 +25337,7 @@
         },
         "recipe": {
             "sha256": "0dxdqr3z5bw0vcfxhhhc1499vrfk1xqwxshr0kvlhdalpf59rqiw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20111002.347",
         "deps": []
@@ -25201,7 +25352,7 @@
         },
         "recipe": {
             "sha256": "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151031.1610",
         "deps": [
@@ -25220,7 +25371,7 @@
         },
         "recipe": {
             "sha256": "0lzj0h23g6alqcmd20ack53p72g9i09dp9x0bp3rdw5izcfkvhh3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20111019.1800",
         "deps": []
@@ -25235,7 +25386,7 @@
         },
         "recipe": {
             "sha256": "030m67d8g60ljm7ny3jh4vwj3cshypsklgbjpcvh32y109ga1hy1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150714.233",
         "deps": []
@@ -25250,7 +25401,7 @@
         },
         "recipe": {
             "sha256": "1lq8nwhf8n5i280v0kqksndm4b3n6x34wnd5fa5i48ljwr5cinih",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141204.1945",
         "deps": []
@@ -25263,7 +25414,7 @@
         },
         "recipe": {
             "sha256": "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.1120",
         "deps": []
@@ -25278,7 +25429,7 @@
         },
         "recipe": {
             "sha256": "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.1654",
         "deps": [
@@ -25295,7 +25446,7 @@
         },
         "recipe": {
             "sha256": "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130309.1005",
         "deps": []
@@ -25310,7 +25461,7 @@
         },
         "recipe": {
             "sha256": "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150916.658",
         "deps": []
@@ -25324,7 +25475,7 @@
         },
         "recipe": {
             "sha256": "1zmy6cbnqhsbwc5vx30mx45xn88d2186hgrl75ws7vvbl197j03b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.1236",
         "deps": []
@@ -25339,7 +25490,7 @@
         },
         "recipe": {
             "sha256": "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141111.1230",
         "deps": [
@@ -25356,7 +25507,7 @@
         },
         "recipe": {
             "sha256": "1q5fkl8crqrgxik2mxbkqv10qnqhqrazd66rgfw797s3jcchv58j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140202.1341",
         "deps": []
@@ -25369,7 +25520,7 @@
         },
         "recipe": {
             "sha256": "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141009.939",
         "deps": []
@@ -25384,7 +25535,7 @@
         },
         "recipe": {
             "sha256": "145zmfmsxcbmfh9s0mvxxgfh1d51q66396zc29k1c0hw94ffhkdd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140806.2342",
         "deps": []
@@ -25399,7 +25550,7 @@
         },
         "recipe": {
             "sha256": "0qdgf0phs3iz29zj3qjhdgb3i4xvf5r2vi0709pwxx2s6r13pvcc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.838",
         "deps": [
@@ -25417,7 +25568,7 @@
         },
         "recipe": {
             "sha256": "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151024.1051",
         "deps": []
@@ -25432,7 +25583,7 @@
         },
         "recipe": {
             "sha256": "1lr330bqj4rfh2jgn3562sliani4yw5y4j2hr6cq9cfjjp18qgsj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20090715.1703",
         "deps": []
@@ -25447,7 +25598,7 @@
         },
         "recipe": {
             "sha256": "1pmjz27dlp5yrihgsy8q1bwbhkkj3sn7d79ccvljvzxg5jn1grkd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151021.1243",
         "deps": []
@@ -25462,7 +25613,7 @@
         },
         "recipe": {
             "sha256": "0x9bfr4j0sp41jkgnyjlaxnnjjrc102x6sznn6cgcmqk5qhswl4q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.101",
         "deps": [
@@ -25479,7 +25630,7 @@
         },
         "recipe": {
             "sha256": "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150330.1248",
         "deps": []
@@ -25494,7 +25645,7 @@
         },
         "recipe": {
             "sha256": "0dl0ibw145f84kd709r5i2kaw07z1sjzn3dmsiqn8dncspcf2vb4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151015.428",
         "deps": [
@@ -25512,7 +25663,7 @@
         },
         "recipe": {
             "sha256": "0hwxhirdvaysw9hxcgfdf0l12wilr6b9f9w91pk1hfwfi1w0lfwr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141218.2114",
         "deps": []
@@ -25527,7 +25678,7 @@
         },
         "recipe": {
             "sha256": "0p7ybgldjs046jrkkbpli1iicfmblpxfz9lql8m8sz7lpjn7h300",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131110.519",
         "deps": [
@@ -25545,7 +25696,7 @@
         },
         "recipe": {
             "sha256": "1ra5p8k96wvb04v69xm87jl4jlgi57v4jw2xxzkwbwxbydncnv0b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130312.1458",
         "deps": []
@@ -25560,7 +25711,7 @@
         },
         "recipe": {
             "sha256": "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140915.952",
         "deps": [
@@ -25577,7 +25728,7 @@
         },
         "recipe": {
             "sha256": "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1822",
         "deps": []
@@ -25592,7 +25743,7 @@
         },
         "recipe": {
             "sha256": "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131203.751",
         "deps": [
@@ -25608,7 +25759,7 @@
         },
         "recipe": {
             "sha256": "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150414.22",
         "deps": []
@@ -25623,7 +25774,7 @@
         },
         "recipe": {
             "sha256": "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151023.953",
         "deps": [
@@ -25642,7 +25793,7 @@
         },
         "recipe": {
             "sha256": "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150227.1019",
         "deps": [
@@ -25661,7 +25812,7 @@
         },
         "recipe": {
             "sha256": "0vng52axp7r01s00cqbbclbm5bx1qbhmlrx9h9kj7smx1al4daml",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.1812",
         "deps": [
@@ -25681,7 +25832,7 @@
         },
         "recipe": {
             "sha256": "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131021.1329",
         "deps": [
@@ -25700,7 +25851,7 @@
         },
         "recipe": {
             "sha256": "165sivmv5h4nvh08ampq95x6b0bkzxgrdjbxjxlq6rv00vaidn7v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131108.527",
         "deps": []
@@ -25714,7 +25865,7 @@
         },
         "recipe": {
             "sha256": "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150530.1326",
         "deps": [
@@ -25726,12 +25877,12 @@
             "tag": "fetchFromGitHub",
             "owner": "travisbhartwell",
             "repo": "nix-emacs",
-            "sha256": "0iq1j703kj3dy1di8m488kds8i6klpavwwb88ysn5pv2nwdi6i4w",
-            "rev": "2bd8a5fe792dd6a219934f5295d6116877e45f6c"
+            "sha256": "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3",
+            "rev": "6b1418611b49a6cf77380a76f7e6236bbb5df83a"
         },
         "recipe": {
             "sha256": "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151013.1809",
         "deps": [
@@ -25750,7 +25901,7 @@
         },
         "recipe": {
             "sha256": "103zkslqdihjyl81688fvkq96rzk3an1vf3gz8rlmmz5anbql8ai",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150315.719",
         "deps": []
@@ -25763,7 +25914,7 @@
         },
         "recipe": {
             "sha256": "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1558",
         "deps": []
@@ -25778,7 +25929,7 @@
         },
         "recipe": {
             "sha256": "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130424.157",
         "deps": [
@@ -25795,7 +25946,7 @@
         },
         "recipe": {
             "sha256": "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150508.2212",
         "deps": [
@@ -25813,7 +25964,7 @@
         },
         "recipe": {
             "sha256": "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.1130",
         "deps": [
@@ -25830,7 +25981,7 @@
         },
         "recipe": {
             "sha256": "06dpv19wgbw48gbf701c77vw1dkpddx8056wpim3zbvwwfwk8ra4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151204.924",
         "deps": [
@@ -25846,7 +25997,7 @@
         },
         "recipe": {
             "sha256": "1m280ll07i5c6s4w0s227jygdlpvd87dq45039v0sljyxm4bfrsv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150527.1048",
         "deps": []
@@ -25861,7 +26012,7 @@
         },
         "recipe": {
             "sha256": "0562x2s3kk9vlaavak4lya1nlmn4mwlzlc7nw1l3687q023z4hmv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130321.1912",
         "deps": []
@@ -25876,7 +26027,7 @@
         },
         "recipe": {
             "sha256": "1y5lq6lq9qdydbypb1pjnxryh94a295nnqqh2x27whiwdiysirjj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150212.924",
         "deps": [
@@ -25893,7 +26044,7 @@
         },
         "recipe": {
             "sha256": "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150522.533",
         "deps": []
@@ -25908,7 +26059,7 @@
         },
         "recipe": {
             "sha256": "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130908.1322",
         "deps": [
@@ -25925,7 +26076,7 @@
         },
         "recipe": {
             "sha256": "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150602.1029",
         "deps": []
@@ -25940,7 +26091,7 @@
         },
         "recipe": {
             "sha256": "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130620.622",
         "deps": [
@@ -25957,7 +26108,7 @@
         },
         "recipe": {
             "sha256": "16zvsmqn882w320h26hjjz5lcyl9y0x4amkf2zfps77xxmkmi5n0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141023.958",
         "deps": []
@@ -25972,7 +26123,7 @@
         },
         "recipe": {
             "sha256": "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151005.29",
         "deps": []
@@ -25987,7 +26138,7 @@
         },
         "recipe": {
             "sha256": "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.438",
         "deps": [
@@ -26004,7 +26155,7 @@
         },
         "recipe": {
             "sha256": "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150929.346",
         "deps": [
@@ -26025,7 +26176,7 @@
         },
         "recipe": {
             "sha256": "037i2fgxxsfb85vd6xk17wyh7ny6fqfixvb0a18lf8m1hib1gyhr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150513.2259",
         "deps": []
@@ -26038,7 +26189,7 @@
         },
         "recipe": {
             "sha256": "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151108.1305",
         "deps": []
@@ -26053,7 +26204,7 @@
         },
         "recipe": {
             "sha256": "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151127.821",
         "deps": [
@@ -26071,7 +26222,7 @@
         },
         "recipe": {
             "sha256": "0ffjrpiph21dn8bplklsz3hrsai25l67yyr7n8qjxlwlibwqzv6j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141229.1634",
         "deps": []
@@ -26086,7 +26237,7 @@
         },
         "recipe": {
             "sha256": "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140530.433",
         "deps": [
@@ -26103,7 +26254,7 @@
         },
         "recipe": {
             "sha256": "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120209.1251",
         "deps": []
@@ -26118,7 +26269,7 @@
         },
         "recipe": {
             "sha256": "1rpgngixf1xnnqf0l2vvh6y9q3395qyj9ln1rh0xz5lm7d4pq4hy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150428.1359",
         "deps": []
@@ -26133,7 +26284,7 @@
         },
         "recipe": {
             "sha256": "13grkww14w39y2x6mrbfa9nzljsnl5l7il8dnj6sjdyv0hz9x8vm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150904.332",
         "deps": []
@@ -26148,7 +26299,7 @@
         },
         "recipe": {
             "sha256": "06mx2b0zjck82vp3i4bwbqlrzn05i2rkf8080cn34nkizi59wlbs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150921.905",
         "deps": []
@@ -26163,7 +26314,7 @@
         },
         "recipe": {
             "sha256": "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20101130.643",
         "deps": []
@@ -26178,7 +26329,7 @@
         },
         "recipe": {
             "sha256": "0c98zm94958rb9kdvqr3pad744nh63y3vy3lshfm0lsg85k9j62p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150101.801",
         "deps": []
@@ -26193,7 +26344,7 @@
         },
         "recipe": {
             "sha256": "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.808",
         "deps": [
@@ -26210,7 +26361,7 @@
         },
         "recipe": {
             "sha256": "1gf73li6q5rg1dimzihxq0rdxiqzbl2w78r1qzc9mxw3qj7azxqp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1539",
         "deps": [
@@ -26229,7 +26380,7 @@
         },
         "recipe": {
             "sha256": "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": [
@@ -26247,7 +26398,7 @@
         },
         "recipe": {
             "sha256": "13s38zdd9j127p6jxbcj4d4va8mkri5dx5zh39g465mnlzx7fp8g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150424.1916",
         "deps": []
@@ -26262,7 +26413,7 @@
         },
         "recipe": {
             "sha256": "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151001.1024",
         "deps": [
@@ -26279,7 +26430,7 @@
         },
         "recipe": {
             "sha256": "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150302.728",
         "deps": [
@@ -26296,7 +26447,7 @@
         },
         "recipe": {
             "sha256": "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140202.931",
         "deps": [
@@ -26313,7 +26464,7 @@
         },
         "recipe": {
             "sha256": "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131115.550",
         "deps": [
@@ -26331,7 +26482,7 @@
         },
         "recipe": {
             "sha256": "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150320.2215",
         "deps": [
@@ -26350,7 +26501,7 @@
         },
         "recipe": {
             "sha256": "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.2352",
         "deps": [
@@ -26367,7 +26518,7 @@
         },
         "recipe": {
             "sha256": "1l8nisn2c124cpylyahr76hfpdim2125zrns2897p466l5wcxcx5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150315.600",
         "deps": []
@@ -26382,7 +26533,7 @@
         },
         "recipe": {
             "sha256": "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150109.1223",
         "deps": []
@@ -26397,7 +26548,7 @@
         },
         "recipe": {
             "sha256": "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121104.1304",
         "deps": [
@@ -26414,7 +26565,7 @@
         },
         "recipe": {
             "sha256": "186h5ky48i1xmjbvvhn1i0rzhsy8bgdv1d8f7rlr2z4brb52f9c1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140630.1721",
         "deps": [
@@ -26431,7 +26582,7 @@
         },
         "recipe": {
             "sha256": "1kwnxa0ndfj8b211xy5d47sxkwmsay0kk8q7azfm5ag5dkg56zgi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150330.301",
         "deps": []
@@ -26446,7 +26597,7 @@
         },
         "recipe": {
             "sha256": "1989pkhaha6s2rmgyswnzps92x9hhzymjz4ng4a5jda1b9snp60q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150224.2259",
         "deps": []
@@ -26461,7 +26612,7 @@
         },
         "recipe": {
             "sha256": "11cpaxk9wb27b9zhyns75dqpds4gh3cbjcvia4p2bnvmbm8lz4y8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150701.855",
         "deps": [
@@ -26478,7 +26629,7 @@
         },
         "recipe": {
             "sha256": "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151218.1031",
         "deps": [
@@ -26495,7 +26646,7 @@
         },
         "recipe": {
             "sha256": "1rwn521dc8kxh43vcd3rf0h8jc53d4gmid3szj2msi0da1sk0mmj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150902.1706",
         "deps": [
@@ -26514,7 +26665,7 @@
         },
         "recipe": {
             "sha256": "0nqmc8f2qrsp25vzc66xw6b232n7fyw6g06mwn2cdpm3d2pgb7rg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140417.614",
         "deps": [
@@ -26531,7 +26682,7 @@
         },
         "recipe": {
             "sha256": "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150718.2131",
         "deps": [
@@ -26552,7 +26703,7 @@
         },
         "recipe": {
             "sha256": "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151004.915",
         "deps": [
@@ -26571,7 +26722,7 @@
         },
         "recipe": {
             "sha256": "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150612.1439",
         "deps": [
@@ -26588,7 +26739,7 @@
         },
         "recipe": {
             "sha256": "16ahgvi85ddjlrjxld14zm2vvam0m89mwskizjd5clcz0snk51sc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150822.1336",
         "deps": []
@@ -26603,7 +26754,7 @@
         },
         "recipe": {
             "sha256": "0lkfpbzsry9jigrx5zp14bkrvqnavnk4y3s0whnbigc4fgpf94rq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20091203.1215",
         "deps": []
@@ -26618,7 +26769,7 @@
         },
         "recipe": {
             "sha256": "1q4y6mgll8wyp0c7zx810nzsm0k4wvz0wkly1fbja9z63sjzzxwb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150414.1930",
         "deps": []
@@ -26633,7 +26784,7 @@
         },
         "recipe": {
             "sha256": "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151003.1322",
         "deps": [
@@ -26651,7 +26802,7 @@
         },
         "recipe": {
             "sha256": "13829yrh36qac7gpxanizlk4n7av99ngvv06y6mmi5rq06a4hjx4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120702.1536",
         "deps": []
@@ -26661,14 +26812,14 @@
             "tag": "fetchFromGitHub",
             "owner": "xahlee",
             "repo": "xah-math-input",
-            "sha256": "118dcxq6ya9ks488az5h7hwbvjw0amamaw52pi2cx6s74zyxvwb8",
-            "rev": "dbf055ca2b5497465de57e98d6cc58ddfa09bb8d"
+            "sha256": "1j2dca3j71g2g8phzfxjvcwymlr10dq8fbahwslwdhadffjv9m87",
+            "rev": "f0c98d1271b20334c8af2593fd391af23a6e64b4"
         },
         "recipe": {
             "sha256": "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150907.1900",
+        "version": "20151225.1358",
         "deps": []
     },
     "vim-region": {
@@ -26681,7 +26832,7 @@
         },
         "recipe": {
             "sha256": "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140329.1124",
         "deps": [
@@ -26696,7 +26847,7 @@
         },
         "recipe": {
             "sha256": "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.700",
         "deps": []
@@ -26711,7 +26862,7 @@
         },
         "recipe": {
             "sha256": "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.1349",
         "deps": [
@@ -26728,7 +26879,7 @@
         },
         "recipe": {
             "sha256": "0qgvpv5hcai8wmkv2fp6i2vdy7qp4gwidwpzz8j6vl9519x73s62",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150127.1546",
         "deps": [
@@ -26746,7 +26897,7 @@
         },
         "recipe": {
             "sha256": "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151124.1111",
         "deps": []
@@ -26761,7 +26912,7 @@
         },
         "recipe": {
             "sha256": "1gx35m0wv60cfgm87y2c7vrpwdsqjzk9bz4pp9dbs8dhxvji0ay4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.1527",
         "deps": [
@@ -26779,7 +26930,7 @@
         },
         "recipe": {
             "sha256": "0hphrqwryp3c0wwyf2f16hj8nc7jlg2dkvljgm2rdvmh2kgj3007",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120809.718",
         "deps": []
@@ -26794,7 +26945,7 @@
         },
         "recipe": {
             "sha256": "0h9hqfb8fm90h87bi3myl84nppbbminhnvv6jqg62qi9k6snn1iq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.1250",
         "deps": [
@@ -26807,15 +26958,17 @@
             "tag": "fetchFromGitHub",
             "owner": "alezost",
             "repo": "aurel",
-            "sha256": "1vzjrdzb7wp5ydlwsfxy8jnml7pb16y2dhf85qqv0ckncvwwrs3h",
-            "rev": "dec8063d243176a176f9d7c117c0bb4be9bd03dc"
+            "sha256": "0z0wq79ks8251fflk2iwrhd885h5qbki2m19f0jy4a8c00ydmxyz",
+            "rev": "bcabf49c1410b89d592d8aa78f896428c492879a"
         },
         "recipe": {
             "sha256": "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.1353",
-        "deps": []
+        "version": "20151219.2340",
+        "deps": [
+            "emacs"
+        ]
     },
     "ob-typescript": {
         "fetch": {
@@ -26827,7 +26980,7 @@
         },
         "recipe": {
             "sha256": "1wpy928ndvc076jzi14f6k5fsw8had0pz7f1yjdqql4icszhqa0p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150804.730",
         "deps": [
@@ -26845,7 +26998,7 @@
         },
         "recipe": {
             "sha256": "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150922.737",
         "deps": [
@@ -26866,7 +27019,7 @@
         },
         "recipe": {
             "sha256": "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141027.1750",
         "deps": [
@@ -26883,7 +27036,7 @@
         },
         "recipe": {
             "sha256": "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150717.732",
         "deps": []
@@ -26898,7 +27051,7 @@
         },
         "recipe": {
             "sha256": "0gfl8if83jbs0icz6gcjkwxvcz5v744k1kvqnbx3ga481kds9rqf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150503.237",
         "deps": [
@@ -26910,11 +27063,11 @@
             "tag": "fetchsvn",
             "url": "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/",
             "sha256": "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq",
-            "rev": "1720849"
+            "rev": "1721816"
         },
         "recipe": {
             "sha256": "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130120.1457",
         "deps": []
@@ -26929,7 +27082,7 @@
         },
         "recipe": {
             "sha256": "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150505.1043",
         "deps": [
@@ -26947,7 +27100,7 @@
         },
         "recipe": {
             "sha256": "0b7zgmpsdn5p3jx4kif7phxz8pb85snmmfr3yz98xf6p7h6w60gw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150807.2336",
         "deps": []
@@ -26960,7 +27113,7 @@
         },
         "recipe": {
             "sha256": "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1624",
         "deps": []
@@ -26975,7 +27128,7 @@
         },
         "recipe": {
             "sha256": "1fsnha3x3pgq582libb3dmxb93aagv1avnc0rigpfd7hv6bagj40",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151007.1708",
         "deps": []
@@ -26990,7 +27143,7 @@
         },
         "recipe": {
             "sha256": "0l8zvfwpngkgcxl1a36jwwxdh23hi390mikz7xrq63w5zwm0007n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150108.1435",
         "deps": []
@@ -27005,7 +27158,7 @@
         },
         "recipe": {
             "sha256": "0q02lksrbn43s8d9rzpglqybalglpi6qi9lix0cllag6i7fzcbms",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150106.706",
         "deps": [
@@ -27022,7 +27175,7 @@
         },
         "recipe": {
             "sha256": "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130104.821",
         "deps": []
@@ -27037,7 +27190,7 @@
         },
         "recipe": {
             "sha256": "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151129.519",
         "deps": []
@@ -27050,7 +27203,7 @@
         },
         "recipe": {
             "sha256": "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.707",
         "deps": []
@@ -27060,14 +27213,14 @@
             "tag": "fetchFromGitHub",
             "owner": "kawabata",
             "repo": "helm-chrome",
-            "sha256": "0mc15ymq72l8j7p8v6w99zmhpmqfbyc1w1h2pl5aqn2fmhbmhicy",
-            "rev": "212711d5adcbd3af9195855792ef0166fdf7b8ff"
+            "sha256": "0wkskm0d1mvh49l65xg6pgwd7yxy02llflkzx59ayqv4wjvsyayb",
+            "rev": "4591cc760d3e721094c70b913b91138776f0e52e"
         },
         "recipe": {
             "sha256": "0p3n2pna83mp4ym8x69lk4r3q4apbj5v2blg2mwcsd9zij153nxz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151014.2327",
+        "version": "20151222.1958",
         "deps": [
             "cl-lib",
             "emacs",
@@ -27084,7 +27237,7 @@
         },
         "recipe": {
             "sha256": "0pk6vdvmifiq52n452lbrkklxa69c40bfyzra9qhrghxr2q5v3mk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151204.630",
         "deps": []
@@ -27099,7 +27252,7 @@
         },
         "recipe": {
             "sha256": "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150814.622",
         "deps": [
@@ -27111,14 +27264,14 @@
             "tag": "fetchFromGitHub",
             "owner": "company-mode",
             "repo": "company-mode",
-            "sha256": "0xvrhkh2vdvy0xvwicsmy96bfa46lj89m1gy35lp3dl36nh64kjb",
-            "rev": "250ca1c395c6f05b733abce69a2d928b6cd31618"
+            "sha256": "0nd0zxzgaxwncbrrs2cql9kiya8s6kjjq0gls58qgq2vd9mwrrgg",
+            "rev": "900ae0d7a2270ea1d2ea00567e80a619333fd4e5"
         },
         "recipe": {
             "sha256": "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151208.1541",
+        "version": "20151225.2110",
         "deps": [
             "cl-lib",
             "emacs"
@@ -27134,7 +27287,7 @@
         },
         "recipe": {
             "sha256": "074cqs55gwy5jlaay3m9bpdpdfb45nmlijvapz96nibl64pyk83d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130605.343",
         "deps": []
@@ -27149,7 +27302,7 @@
         },
         "recipe": {
             "sha256": "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130328.1104",
         "deps": []
@@ -27164,7 +27317,7 @@
         },
         "recipe": {
             "sha256": "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140629.1016",
         "deps": [
@@ -27181,7 +27334,7 @@
         },
         "recipe": {
             "sha256": "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.1247",
         "deps": [
@@ -27200,7 +27353,7 @@
         },
         "recipe": {
             "sha256": "169sy7a1bgczwfxkkzjiggb7vdjxhrx7i3a39g6zv9f1zs6byk6m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141231.1014",
         "deps": []
@@ -27213,7 +27366,7 @@
         },
         "recipe": {
             "sha256": "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.707",
         "deps": []
@@ -27228,7 +27381,7 @@
         },
         "recipe": {
             "sha256": "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150709.140",
         "deps": [
@@ -27248,7 +27401,7 @@
         },
         "recipe": {
             "sha256": "03m0h13jd37vfvn4mavaq3vbzx4x0lklbs0mbc29zaz8pwqlcwz6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141227.19",
         "deps": [
@@ -27262,14 +27415,14 @@
             "tag": "fetchFromGitHub",
             "owner": "joodland",
             "repo": "bm",
-            "sha256": "0ifiqy3lpqf0v76jzhgi59smrbzph7silrhjw6w9fqw6nvmyg608",
-            "rev": "d773ecda1c7aec7d9adf4471884c3aba8be22e2b"
+            "sha256": "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x",
+            "rev": "b91f87c8f78d2430edc376830d5ba15f45d28637"
         },
         "recipe": {
             "sha256": "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151105.1722",
+        "version": "20151222.1803",
         "deps": []
     },
     "ox-textile": {
@@ -27282,7 +27435,7 @@
         },
         "recipe": {
             "sha256": "01kri7vh16xhy8x5qd6s5z08xr0q964rk6xrligdb3i6x78wfvi4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151114.2225",
         "deps": [
@@ -27299,7 +27452,7 @@
         },
         "recipe": {
             "sha256": "019rya3bf13cnval8iz680wby3sqlmqg4nbn0a13l1pkhlnv9fvm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140129.117",
         "deps": [
@@ -27317,7 +27470,7 @@
         },
         "recipe": {
             "sha256": "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150826.914",
         "deps": [
@@ -27336,7 +27489,7 @@
         },
         "recipe": {
             "sha256": "0jzmcynr6lvsr36nblqzrjwxawyqcdz972zsv4rqkihdydpqfz7m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151128.635",
         "deps": [
@@ -27353,7 +27506,7 @@
         },
         "recipe": {
             "sha256": "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": [
@@ -27369,7 +27522,7 @@
         },
         "recipe": {
             "sha256": "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140520.1148",
         "deps": []
@@ -27384,7 +27537,7 @@
         },
         "recipe": {
             "sha256": "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150827.2329",
         "deps": []
@@ -27399,7 +27552,7 @@
         },
         "recipe": {
             "sha256": "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151025.743",
         "deps": []
@@ -27414,7 +27567,7 @@
         },
         "recipe": {
             "sha256": "12y84fa1wc82js53rpadaysmbshhqf6wb97889qkksx19n3xmb9g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.904",
         "deps": [
@@ -27431,7 +27584,7 @@
         },
         "recipe": {
             "sha256": "1d8kc137cd8i3wglir1rlvk7w8mrdhd3xvcihi2f2f2g5nh2n5jk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150522.145",
         "deps": [
@@ -27449,7 +27602,7 @@
         },
         "recipe": {
             "sha256": "12l8jyl743zqk8m2xzcz75y1ybdkbkvcbvfkn1k88k09s31kdq4h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150719.1620",
         "deps": [
@@ -27467,7 +27620,7 @@
         },
         "recipe": {
             "sha256": "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150928.1643",
         "deps": [
@@ -27483,7 +27636,7 @@
         },
         "recipe": {
             "sha256": "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150814.949",
         "deps": []
@@ -27498,7 +27651,7 @@
         },
         "recipe": {
             "sha256": "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.1002",
         "deps": [
@@ -27516,7 +27669,7 @@
         },
         "recipe": {
             "sha256": "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150504.1522",
         "deps": [
@@ -27533,7 +27686,7 @@
         },
         "recipe": {
             "sha256": "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150819.620",
         "deps": []
@@ -27548,7 +27701,7 @@
         },
         "recipe": {
             "sha256": "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150424.218",
         "deps": [
@@ -27565,7 +27718,7 @@
         },
         "recipe": {
             "sha256": "056aql35502sgvdpbgphpqdxzbjf4ay01rra6pm11c1dya8avv0j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.101",
         "deps": [
@@ -27582,7 +27735,7 @@
         },
         "recipe": {
             "sha256": "0672mqm0c261mknbgc3a4pahq27gw2pfklflxl1y4ykbs6q7vcyw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150919.421",
         "deps": [
@@ -27600,7 +27753,7 @@
         },
         "recipe": {
             "sha256": "079bw4lgxbmk65rrfyy8givs8j5wsyhpcjjw915ifkg577gj87qp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150611.1104",
         "deps": [
@@ -27612,14 +27765,14 @@
             "tag": "fetchFromGitHub",
             "owner": "syohex",
             "repo": "emacs-helm-ag",
-            "sha256": "11m1r4bcwk3w2g8wsgc1fbmkj5c30qfljwxhg1zw3hakvmycnpg6",
-            "rev": "47aca7f291eccd81f1b1a4a8f96b8d8caec5242e"
+            "sha256": "19ymwdi9ld1myl66a4xsy32ysni8wb5qi80yh5l7v0bmgp6ybdqq",
+            "rev": "679ce0cc4a36cc377fa9f438705c3c8be9a944f3"
         },
         "recipe": {
             "sha256": "023zvgmi5b5b2qga3jqd7jrq9ap8n3rhvl6jrv9fsi565sg1fv43",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151210.218",
+        "version": "20151222.335",
         "deps": [
             "cl-lib",
             "helm"
@@ -27635,7 +27788,7 @@
         },
         "recipe": {
             "sha256": "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140515.1006",
         "deps": [
@@ -27650,7 +27803,7 @@
         },
         "recipe": {
             "sha256": "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20090804.1752",
         "deps": []
@@ -27665,7 +27818,7 @@
         },
         "recipe": {
             "sha256": "0vp57plwqx4nf3pbv5g4frjriq8niiia9xc3bv6c3gzd4a0zm7xi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150602.1423",
         "deps": []
@@ -27678,7 +27831,7 @@
         },
         "recipe": {
             "sha256": "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1534",
         "deps": []
@@ -27693,7 +27846,7 @@
         },
         "recipe": {
             "sha256": "1qbyfi6s4hdp5sv394w3sib8g2kx06i06q8gh6hdv5pis5kq9fx6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140306.827",
         "deps": []
@@ -27703,12 +27856,12 @@
             "tag": "fetchFromGitHub",
             "owner": "Kitware",
             "repo": "CMake",
-            "sha256": "1fga8yvhna953p8gkx69767ai9lkzrxfisqwlf3mrc4pn40yi74x",
-            "rev": "f9e3ca46cbeae4fb885398e8f7b90c784078b1d3"
+            "sha256": "1imzpf467rkmgsifbycc81jqvkpwhdi1ngr39h9i3z2j7nx7f023",
+            "rev": "1d73f6525c523661e51173829b327acf9de9dfc4"
         },
         "recipe": {
             "sha256": "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151012.926",
         "deps": []
@@ -27721,7 +27874,7 @@
         },
         "recipe": {
             "sha256": "07kdn90vm2nbdprw9hwdgi4py6gqzmrad09y1fwqdy49hrvbwdzk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150509.1545",
         "deps": [
@@ -27738,7 +27891,7 @@
         },
         "recipe": {
             "sha256": "032yc45c19fl886jmi5q04r6q47xz5rphb040wjvpd4fnb06hr8c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140430.213",
         "deps": [
@@ -27750,14 +27903,14 @@
             "tag": "fetchFromGitLab",
             "owner": "franksn",
             "repo": "majapahit-theme",
-            "sha256": "0ibw6x0wl257kxfp145ybzcnfgjr997wylxy0m6riv6sklzhx4db",
-            "rev": "09a038826ef00b82684e569eaca07ceff7228219"
+            "sha256": "0bn2qllfv0iwssdc17g2vhmkk7i9iygh7wji6nbksv0ssgxbfvc0",
+            "rev": "3b753a972f716a10f6a4ed1f596ceea348d6b489"
         },
         "recipe": {
             "sha256": "04k2smrya27rrjlzvnl3a6llg8vj8x4mm9qyk4kwrmckhd6jd68s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151209.1243",
+        "version": "20151219.2232",
         "deps": []
     },
     "interleave": {
@@ -27770,7 +27923,7 @@
         },
         "recipe": {
             "sha256": "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151120.835",
         "deps": []
@@ -27785,7 +27938,7 @@
         },
         "recipe": {
             "sha256": "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141102.1322",
         "deps": [
@@ -27805,7 +27958,7 @@
         },
         "recipe": {
             "sha256": "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.816",
         "deps": [
@@ -27823,7 +27976,7 @@
         },
         "recipe": {
             "sha256": "1vdh5i9qznzd9r148a6jw9v47swf7ykwyciqfzc3ismv5q909bl2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150214.648",
         "deps": [
@@ -27835,14 +27988,14 @@
             "tag": "fetchFromGitHub",
             "owner": "extemporelang",
             "repo": "extempore-emacs-mode",
-            "sha256": "1gdvls5gaqiwrc8v335ap9raa25jzjq32h80y0mfq0iyrk1r9glp",
-            "rev": "e1efe28b29e2a5caf03a0cf1f1406e6a375be919"
+            "sha256": "0nry653cd3qzsj6asrf9hh4zkzhz8nnwjrg1wp17f5ggzpjyybjw",
+            "rev": "a08be9f0cec32c2818f93a6f7633c14fc2013e61"
         },
         "recipe": {
             "sha256": "1z8nzpcj27s74kxfjz7wyr3848jpd6mbyjkssd06ri5p694j9php",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151214.40",
+        "version": "20151225.51",
         "deps": [
             "emacs"
         ]
@@ -27857,7 +28010,7 @@
         },
         "recipe": {
             "sha256": "18z3i5brxm60z373cwx2sa3hx7v38a5s62gbs9b0lxb20ah4p9rz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130127.1951",
         "deps": []
@@ -27870,7 +28023,7 @@
         },
         "recipe": {
             "sha256": "1d9m5k18k73vhidwd50mcbq7mlvwdn4sb9ih8r5gri9a9whi2nkj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141128.837",
         "deps": []
@@ -27880,14 +28033,14 @@
             "tag": "fetchFromGitHub",
             "owner": "waymondo",
             "repo": "apropospriate-theme",
-            "sha256": "1p9nplbxp57i2m2r1f1ff1xgsb152az9yb4zyapf0cvspqzllrvx",
-            "rev": "3cc7729e266058c3c080ee67769cb0ff3e0789a6"
+            "sha256": "1jw6am5c8szrrlff1qfh0hpyi5p5nqnhs8kywl5s4bpj1gxgq8dh",
+            "rev": "fdd70f890c2fd25882de011c1327ddab143937ce"
         },
         "recipe": {
             "sha256": "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151112.1059",
+        "version": "20151224.956",
         "deps": []
     },
     "speech-tagger": {
@@ -27900,7 +28053,7 @@
         },
         "recipe": {
             "sha256": "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150903.2",
         "deps": [
@@ -27917,7 +28070,7 @@
         },
         "recipe": {
             "sha256": "0q5ybyj35dyh8k0nfvbglsq3ad2apc8cdijw4wqczc5180fckgy9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140130.1136",
         "deps": []
@@ -27932,7 +28085,7 @@
         },
         "recipe": {
             "sha256": "1rhy2bwkqlha4bj3zmb0iassiglch7yb2kbas0bbpl3d0hdki2i8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151117.1830",
         "deps": []
@@ -27947,7 +28100,7 @@
         },
         "recipe": {
             "sha256": "01wp4h97hjyzbpd7iighjj26m79499wp5pn8m4pa7v59f6r3sdk6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151006.2326",
         "deps": [
@@ -27966,7 +28119,7 @@
         },
         "recipe": {
             "sha256": "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150608.411",
         "deps": [
@@ -27983,7 +28136,7 @@
         },
         "recipe": {
             "sha256": "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110901.330",
         "deps": []
@@ -27998,7 +28151,7 @@
         },
         "recipe": {
             "sha256": "15r3m58hnc75l3j02xdr8yg25fbn2sbz1295ac44widzis82m792",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130810.917",
         "deps": []
@@ -28013,7 +28166,7 @@
         },
         "recipe": {
             "sha256": "0s88xihw44ks4b07wcb9swr52f3l1ls0jn629mxvfkv4a6hn7rmz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150531.343",
         "deps": []
@@ -28028,7 +28181,7 @@
         },
         "recipe": {
             "sha256": "1mwkx3hynabwr0a2rm1bh91h7xf38a11h1fb6ys8s3mnr68csd9z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150314.322",
         "deps": []
@@ -28043,7 +28196,7 @@
         },
         "recipe": {
             "sha256": "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150927.1225",
         "deps": []
@@ -28058,7 +28211,7 @@
         },
         "recipe": {
             "sha256": "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.625",
         "deps": []
@@ -28073,7 +28226,7 @@
         },
         "recipe": {
             "sha256": "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.1603",
         "deps": []
@@ -28088,7 +28241,7 @@
         },
         "recipe": {
             "sha256": "1h0a1briinp9ka7ga3ipdhyf7yfinwvf7babv36myi720900wcq5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.1323",
         "deps": []
@@ -28103,7 +28256,7 @@
         },
         "recipe": {
             "sha256": "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151008.1614",
         "deps": [
@@ -28123,7 +28276,7 @@
         },
         "recipe": {
             "sha256": "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130122.1053",
         "deps": []
@@ -28133,14 +28286,14 @@
             "tag": "fetchFromGitHub",
             "owner": "rmuslimov",
             "repo": "browse-at-remote",
-            "sha256": "1djylgajp47mjxgdppm8ihbs4k4gnqn6ryzq3d1wkq5vlmqq25m3",
-            "rev": "6b07282cbf3d40d654cbc083f19a07118848ee6d"
+            "sha256": "0q71ah62q6acivhxzsw9j1ky54i9hhlnj97sjn8bxrxx7nw01gf7",
+            "rev": "d7e155e9ea7acfc9dadd334fe41ac57e93f38674"
         },
         "recipe": {
             "sha256": "1d40b9j3pc6iy3l25062k7f52aq0vk9sizdwd7wii3v5nciczv6w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151214.1527",
+        "version": "20151226.1628",
         "deps": [
             "cl-lib",
             "f",
@@ -28157,7 +28310,7 @@
         },
         "recipe": {
             "sha256": "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150517.643",
         "deps": [
@@ -28174,7 +28327,7 @@
         },
         "recipe": {
             "sha256": "06kaqzb0nh8sndhk7p5n4acn5nc27dyxw3ldgcbp81wj6ipii26h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.702",
         "deps": [
@@ -28191,7 +28344,7 @@
         },
         "recipe": {
             "sha256": "1znav2pbax0rsvdl85mmbgbmxy7gnrm4nx54ij1ff6yd831r5jyl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151124.1311",
         "deps": [
@@ -28208,7 +28361,7 @@
         },
         "recipe": {
             "sha256": "0iflwl0rijbkx1b7i1s7984dw7sz1wa1cb74fqij0kcn76kal7ak",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140626.1925",
         "deps": [
@@ -28226,7 +28379,7 @@
         },
         "recipe": {
             "sha256": "0cn5b9pr9i9hrix7dbrylwb2812al8ipbpqvlb9bm2f8hc9kgsmc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150731.512",
         "deps": [
@@ -28243,7 +28396,7 @@
         },
         "recipe": {
             "sha256": "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.628",
         "deps": [
@@ -28260,7 +28413,7 @@
         },
         "recipe": {
             "sha256": "1zysip6cb8s4nzsxiwk052gq6higz2xnd376r9wxmgj7w8him2c4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140407.20",
         "deps": []
@@ -28275,7 +28428,7 @@
         },
         "recipe": {
             "sha256": "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.1205",
         "deps": []
@@ -28290,7 +28443,7 @@
         },
         "recipe": {
             "sha256": "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150801.1202",
         "deps": [
@@ -28307,7 +28460,7 @@
         },
         "recipe": {
             "sha256": "0gbqxlrsh9lcdkrj8bqh1mpxyhdlwbaxz4ndp5s90inmisaqb83v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1839",
         "deps": []
@@ -28322,7 +28475,7 @@
         },
         "recipe": {
             "sha256": "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150208.2111",
         "deps": []
@@ -28337,7 +28490,7 @@
         },
         "recipe": {
             "sha256": "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140807.1054",
         "deps": [
@@ -28354,7 +28507,7 @@
         },
         "recipe": {
             "sha256": "0nc3k8ly4nx7fm3b2apga3p4svz5c9sldnlk86pz2lzra5h3b4ss",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130921.2242",
         "deps": []
@@ -28369,7 +28522,7 @@
         },
         "recipe": {
             "sha256": "1z6w4vbn0aaajyqanc7h1m5ali7dbrnh4ngw87a2x2pkxarx6x16",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.148",
         "deps": []
@@ -28379,14 +28532,14 @@
             "tag": "fetchFromGitHub",
             "owner": "lujun9972",
             "repo": "el-dmenu",
-            "sha256": "1k9fkydy5rwfnj610fv2k8pallz4w545f4ms0snj63fp01640090",
-            "rev": "3b8e146f1f2170a7db2a0e45c352e523be25f25e"
+            "sha256": "0spj80vq6m2kqbdy6y1vh9fzwqyqkij30457d2n39kjn2gzbyar8",
+            "rev": "b9be62dc33b59fdd34b449699801c1772af84284"
         },
         "recipe": {
             "sha256": "1w1pgaj2yasfhsd1ibvrwy11ykq8v17h913g298h3ycsvqv8gic0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151216.1027",
+        "version": "20151220.702",
         "deps": [
             "cl-lib"
         ]
@@ -28401,7 +28554,7 @@
         },
         "recipe": {
             "sha256": "1625nbi2bmb7vzjz0s7y1cy7dp8lp83dayiib3nr2bfkv76fwkcq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131102.609",
         "deps": []
@@ -28416,7 +28569,7 @@
         },
         "recipe": {
             "sha256": "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150620.1943",
         "deps": [
@@ -28433,7 +28586,7 @@
         },
         "recipe": {
             "sha256": "05z2ax9mgyxldd3ds44xnh9f5w5q4ziy4rxmnfiqjykan2f5hnkn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100703.741",
         "deps": []
@@ -28448,7 +28601,7 @@
         },
         "recipe": {
             "sha256": "1fdfhp39zr2mhy5rd6mwqv5fwd8xaypdqig7v3ksv77m5zq7cmmj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140612.2321",
         "deps": []
@@ -28463,7 +28616,7 @@
         },
         "recipe": {
             "sha256": "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130204.1653",
         "deps": []
@@ -28478,7 +28631,7 @@
         },
         "recipe": {
             "sha256": "0n82fbd7aircqg2c9m138qfv8csrv0amhya3xlwswdkqn51vn3gw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150506.1858",
         "deps": [
@@ -28496,7 +28649,7 @@
         },
         "recipe": {
             "sha256": "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140904.1910",
         "deps": [
@@ -28511,7 +28664,7 @@
         },
         "recipe": {
             "sha256": "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.657",
         "deps": []
@@ -28526,7 +28679,7 @@
         },
         "recipe": {
             "sha256": "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151013.414",
         "deps": []
@@ -28541,7 +28694,7 @@
         },
         "recipe": {
             "sha256": "1v7zwi29as0218vy6ch21iqqcxfhyh373m3dbcdzm2pb8bpcg58j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140222.2001",
         "deps": [
@@ -28558,7 +28711,7 @@
         },
         "recipe": {
             "sha256": "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150908.156",
         "deps": [
@@ -28577,7 +28730,7 @@
         },
         "recipe": {
             "sha256": "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150422.208",
         "deps": [
@@ -28595,7 +28748,7 @@
         },
         "recipe": {
             "sha256": "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.1857",
         "deps": []
@@ -28605,14 +28758,14 @@
             "tag": "fetchFromGitHub",
             "owner": "justbur",
             "repo": "emacs-which-key",
-            "sha256": "11mi23djk690n4984hk3pv61rrkdnxpkmywsqibi3xki27v2al36",
-            "rev": "ad60a6c7206752d9b9cf4ba17c2293dba365e9fb"
+            "sha256": "0d722q5g05q0kbxlbv0iacv7d7r9dvk15g3i4i66v2p6knd7zqpx",
+            "rev": "f4a1b4283bf09475e5255a889a34784501ad2fc0"
         },
         "recipe": {
             "sha256": "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.827",
+        "version": "20151221.1112",
         "deps": [
             "emacs"
         ]
@@ -28627,7 +28780,7 @@
         },
         "recipe": {
             "sha256": "1yg8zy2z18pbyr507ms2b162c0819rna1ilwyp6hb3iv2zjw45sd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150806.707",
         "deps": []
@@ -28642,7 +28795,7 @@
         },
         "recipe": {
             "sha256": "152x7fzjnjjdk9d9h0hbixdp3haqn5vdx3bq1nfqfrkvzychyr06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130610.249",
         "deps": []
@@ -28657,7 +28810,7 @@
         },
         "recipe": {
             "sha256": "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151013.1328",
         "deps": [
@@ -28674,7 +28827,7 @@
         },
         "recipe": {
             "sha256": "1my4vi1x07hg0dva97i685lx6m6fcbfk16j1zy93zriyd7z5plkc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141001.1413",
         "deps": []
@@ -28689,7 +28842,7 @@
         },
         "recipe": {
             "sha256": "17mrdkldv4gfwm6ggc047l4a69xg2fy9f9mjbphkjl0p5nr6b4kz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150528.800",
         "deps": []
@@ -28704,7 +28857,7 @@
         },
         "recipe": {
             "sha256": "07i3vyci52jvslq28djwkgx1r157wvxd99rvqlxnmmsl5yj4k1jf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131029.1816",
         "deps": []
@@ -28719,7 +28872,7 @@
         },
         "recipe": {
             "sha256": "0pxpkikkn2ys0kgf3lbrdxv8iym50h5ik2xzza0qk7cw1v93jza9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150208.1937",
         "deps": [
@@ -28736,7 +28889,7 @@
         },
         "recipe": {
             "sha256": "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150927.1317",
         "deps": [
@@ -28753,7 +28906,7 @@
         },
         "recipe": {
             "sha256": "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131209.1800",
         "deps": []
@@ -28768,7 +28921,7 @@
         },
         "recipe": {
             "sha256": "0dzr86jyf2j49gq40q6qd6lppa57n65n94xzpdjjbs182hxzavp2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130323.1225",
         "deps": []
@@ -28783,7 +28936,7 @@
         },
         "recipe": {
             "sha256": "0r4kmjmrpi38q3y0q9h5xkxh7x728ha2nbnc152lzw6zfsxnm4x4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150421.2257",
         "deps": []
@@ -28798,7 +28951,7 @@
         },
         "recipe": {
             "sha256": "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131230.1119",
         "deps": [
@@ -28815,7 +28968,7 @@
         },
         "recipe": {
             "sha256": "18q66f7hhys2ab9ljsdp9013mp7d6v6d1lrb0d1bb035r1b4pfj7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150731.845",
         "deps": []
@@ -28830,7 +28983,7 @@
         },
         "recipe": {
             "sha256": "0nj06ixl76dd80zg83q4bi8k224mcwb612mr4gd1xppj5k8xl03g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150807.312",
         "deps": []
@@ -28845,7 +28998,7 @@
         },
         "recipe": {
             "sha256": "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151117.1705",
         "deps": [
@@ -28864,7 +29017,7 @@
         },
         "recipe": {
             "sha256": "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150926.627",
         "deps": [
@@ -28882,7 +29035,7 @@
         },
         "recipe": {
             "sha256": "01p17mlkwjm60f14arda3ly8ng0r98nn3rly94ghn6jr7r7fv14b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20090528.136",
         "deps": []
@@ -28897,7 +29050,7 @@
         },
         "recipe": {
             "sha256": "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151014.2138",
         "deps": [
@@ -28914,7 +29067,7 @@
         },
         "recipe": {
             "sha256": "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.225",
         "deps": [
@@ -28935,7 +29088,7 @@
         },
         "recipe": {
             "sha256": "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130526.1014",
         "deps": []
@@ -28950,7 +29103,7 @@
         },
         "recipe": {
             "sha256": "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151022.1225",
         "deps": []
@@ -28965,7 +29118,7 @@
         },
         "recipe": {
             "sha256": "1zwrzblkag1d18xz450b7khsdssvsxyl1x6a682vy0dkn1y5qh1n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151021.2133",
         "deps": [
@@ -28984,7 +29137,7 @@
         },
         "recipe": {
             "sha256": "1marz8gmk824hb0nkhaw48d4qw1xjk1aad27gviya7f5ilypxrya",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131217.912",
         "deps": [
@@ -29001,7 +29154,7 @@
         },
         "recipe": {
             "sha256": "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131229.441",
         "deps": []
@@ -29016,7 +29169,7 @@
         },
         "recipe": {
             "sha256": "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.154",
         "deps": []
@@ -29031,7 +29184,7 @@
         },
         "recipe": {
             "sha256": "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150522.440",
         "deps": [
@@ -29046,7 +29199,7 @@
         },
         "recipe": {
             "sha256": "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131228.859",
         "deps": []
@@ -29061,7 +29214,7 @@
         },
         "recipe": {
             "sha256": "17q10fw6y0icsv6vv9n968bwmbjlihrpkkyw62d1kfxhs9yw659z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150321.2325",
         "deps": [
@@ -29079,7 +29232,7 @@
         },
         "recipe": {
             "sha256": "050hskqcjz5kc8nni255vj3hc9m936w1rybvg5kqyz4p4lpzj00k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130508.923",
         "deps": [
@@ -29098,7 +29251,7 @@
         },
         "recipe": {
             "sha256": "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150417.332",
         "deps": []
@@ -29113,7 +29266,7 @@
         },
         "recipe": {
             "sha256": "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150116.1007",
         "deps": [
@@ -29131,7 +29284,7 @@
         },
         "recipe": {
             "sha256": "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150807.457",
         "deps": []
@@ -29146,7 +29299,7 @@
         },
         "recipe": {
             "sha256": "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151104.1740",
         "deps": [
@@ -29163,7 +29316,7 @@
         },
         "recipe": {
             "sha256": "0pyb6c0gvc16z5rc5h0kpl8021hz2hzv86cmjsd20gbhz7imrqwk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140129.304",
         "deps": [
@@ -29181,7 +29334,7 @@
         },
         "recipe": {
             "sha256": "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130217.1605",
         "deps": []
@@ -29196,7 +29349,7 @@
         },
         "recipe": {
             "sha256": "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150729.2237",
         "deps": []
@@ -29211,7 +29364,7 @@
         },
         "recipe": {
             "sha256": "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151106.1602",
         "deps": [
@@ -29228,7 +29381,7 @@
         },
         "recipe": {
             "sha256": "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.905",
         "deps": [
@@ -29247,7 +29400,7 @@
         },
         "recipe": {
             "sha256": "01xx2byjh6vlckaxamm2x2qzicd9qc8h6amyjg0bxz3932a4llaa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151005.1125",
         "deps": []
@@ -29257,14 +29410,14 @@
             "tag": "fetchFromGitHub",
             "owner": "AdrieanKhisbe",
             "repo": "cask-package-toolset.el",
-            "sha256": "1182z9h6xk8mj2blq4x4429kjg7b9s54gdhza4cdb6jk9409bdrn",
-            "rev": "27467a52e243f3ba4024ce19d8e1f4dbd5dd7c0b"
+            "sha256": "12bpf5vk2na428h1fc3qb6nh7hyhxfvmzpcs45ym9ddjvdzwb0gs",
+            "rev": "e691d8815586bef059de26bedbd2162f64ca0827"
         },
         "recipe": {
             "sha256": "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151213.130",
+        "version": "20151220.18",
         "deps": [
             "ansi",
             "cl-lib",
@@ -29286,7 +29439,7 @@
         },
         "recipe": {
             "sha256": "0lns846l70wcrzqb6p5cy5hpd0szh4gvjxd4xq4zsb0z5nfz97jr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140410.355",
         "deps": [
@@ -29303,7 +29456,7 @@
         },
         "recipe": {
             "sha256": "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140829.859",
         "deps": []
@@ -29318,7 +29471,7 @@
         },
         "recipe": {
             "sha256": "0kqv6zkywa7kqh8kg1dzcgkbi91lwx335przdakndm1lfai38i9b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130903.755",
         "deps": []
@@ -29332,7 +29485,7 @@
         },
         "recipe": {
             "sha256": "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110806.158",
         "deps": []
@@ -29347,7 +29500,7 @@
         },
         "recipe": {
             "sha256": "1fs3wf61lzm1hxh5sx8pr74g7g9np3npdwg7xmk81b5f2jx2vy6m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150519.1726",
         "deps": []
@@ -29362,7 +29515,7 @@
         },
         "recipe": {
             "sha256": "12c6yb3v7xwkzc51binfgl4jb3sm3al5nlrklbsxhn44alazsvb0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120425.1735",
         "deps": []
@@ -29377,7 +29530,7 @@
         },
         "recipe": {
             "sha256": "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150228.1447",
         "deps": []
@@ -29392,7 +29545,7 @@
         },
         "recipe": {
             "sha256": "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150830.1837",
         "deps": [
@@ -29408,7 +29561,7 @@
         },
         "recipe": {
             "sha256": "1qhlsdhs40cyly87pj3f1n6ckr7z5pmhqndgay5jyxwxxdpknpap",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140123.2102",
         "deps": []
@@ -29423,7 +29576,7 @@
         },
         "recipe": {
             "sha256": "1pqgm7m2gzkn65v3qic71c38qiira29cwx11l96qph8h8sf47zw5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140924.1000",
         "deps": [
@@ -29441,7 +29594,7 @@
         },
         "recipe": {
             "sha256": "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130813.1145",
         "deps": []
@@ -29456,7 +29609,7 @@
         },
         "recipe": {
             "sha256": "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141226.1532",
         "deps": [
@@ -29477,7 +29630,7 @@
         },
         "recipe": {
             "sha256": "10crwm34igb4kjh97alni15xzhsb2s0d4ghva86f2gpjidka9fhr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141024.427",
         "deps": [
@@ -29495,7 +29648,7 @@
         },
         "recipe": {
             "sha256": "0cdnmq9f06lzkj0hs948a7j5sgg6fl5f36bfnyaxgss23akbfjhr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151112.910",
         "deps": [
@@ -29508,14 +29661,14 @@
             "tag": "fetchFromGitHub",
             "owner": "kyleam",
             "repo": "bog",
-            "sha256": "15nmcnyj2w5llbznyww3i2ldfifp866qyg4bx1kbylqc3hd3y51w",
-            "rev": "ea55493083ba08ac96e6cf130f24ac38c94abb45"
+            "sha256": "0p9smhj53xy2flfcf988jq20kgf5jj4w3z8h9lb7378vwai0y70i",
+            "rev": "ea99bc6b8108bd3b2ff767541fa264db4dbf04a5"
         },
         "recipe": {
             "sha256": "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150918.1730",
+        "version": "20151213.2151",
         "deps": [
             "cl-lib"
         ]
@@ -29529,7 +29682,7 @@
         },
         "recipe": {
             "sha256": "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110301.234",
         "deps": []
@@ -29544,7 +29697,7 @@
         },
         "recipe": {
             "sha256": "172a3krid5lrx1w9xcifkhjnvlxg1nbz4w102d99d0grr9465r09",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130831.1719",
         "deps": [
@@ -29561,7 +29714,7 @@
         },
         "recipe": {
             "sha256": "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150223.755",
         "deps": [
@@ -29582,7 +29735,7 @@
         },
         "recipe": {
             "sha256": "032h0nxlsrk30bsqb02by842ycrw1qscpfprifjjkaiq08wigh1l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131004.342",
         "deps": []
@@ -29597,7 +29750,7 @@
         },
         "recipe": {
             "sha256": "1ci61blm7wc83wm2iyax017ai4jljyag5j1mvw86rimmmjzr0v8f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151120.135",
         "deps": []
@@ -29612,7 +29765,7 @@
         },
         "recipe": {
             "sha256": "196i8lzxv2smpj5yhmiqwazn4pvc14yqyzasrgimhv3vi2xnxlfb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.440",
         "deps": [
@@ -29628,7 +29781,7 @@
         },
         "recipe": {
             "sha256": "1nyjk9jr1xvdkil13ylfsgg7q2sx71za05gi8m2v5f45pbmbi50h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121125.1337",
         "deps": []
@@ -29643,7 +29796,7 @@
         },
         "recipe": {
             "sha256": "01wk3lgln5lac65hp6v83d292bdk7544z23xa1v6a756nhybwv25",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150525.619",
         "deps": [
@@ -29660,7 +29813,7 @@
         },
         "recipe": {
             "sha256": "1rrqlq08jnh9ihb99ji1vvmamj742assnm4a7xqz6gp7f248nb81",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150117.1152",
         "deps": [
@@ -29677,7 +29830,7 @@
         },
         "recipe": {
             "sha256": "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131029.1634",
         "deps": [
@@ -29694,7 +29847,7 @@
         },
         "recipe": {
             "sha256": "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150527.149",
         "deps": []
@@ -29709,7 +29862,7 @@
         },
         "recipe": {
             "sha256": "0brgjgbw804x0gf2vq01yv6bd0ilp3x9kvr1nnsqxb9c03ffmb2m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121004.1826",
         "deps": []
@@ -29724,7 +29877,7 @@
         },
         "recipe": {
             "sha256": "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140128.441",
         "deps": [
@@ -29743,7 +29896,7 @@
         },
         "recipe": {
             "sha256": "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150707.123",
         "deps": []
@@ -29758,7 +29911,7 @@
         },
         "recipe": {
             "sha256": "1zspb79x6s151wwiian45j1nh0xps8y8yd98byyn5lbwbj2pp2gk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150718.2133",
         "deps": []
@@ -29771,7 +29924,7 @@
         },
         "recipe": {
             "sha256": "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.1226",
         "deps": [
@@ -29789,7 +29942,7 @@
         },
         "recipe": {
             "sha256": "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140731.1422",
         "deps": [
@@ -29806,7 +29959,7 @@
         },
         "recipe": {
             "sha256": "1l5winy30w8fs3f5cylc3a3j3mfkvchwanlgsin7q76jivn87h7w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141115.901",
         "deps": []
@@ -29821,7 +29974,7 @@
         },
         "recipe": {
             "sha256": "1sq1kim17bcmh39106vfgm7gq9nj9943lw8by0bpi5qr8xdjsn5r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130215.1504",
         "deps": []
@@ -29836,7 +29989,7 @@
         },
         "recipe": {
             "sha256": "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.938",
         "deps": []
@@ -29851,7 +30004,7 @@
         },
         "recipe": {
             "sha256": "0l81hs7bp46jlk41b9fk1lkvlp17fqc5hcz8k8kkal7rh7ari1fd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130726.1407",
         "deps": [
@@ -29866,14 +30019,14 @@
             "tag": "fetchFromGitHub",
             "owner": "lokedhs",
             "repo": "gnu-apl-mode",
-            "sha256": "1l37447zshk5bl3r8v8nladxrcq252z05z1wch5ywp3h2qkmhkxp",
-            "rev": "ee7e633c65a36acdf92a34325fc759698614fbfe"
+            "sha256": "1dfkjzx33wzafj9cfm1bpj99bmnq5a8qrvzmhjykr7mfkca79ymz",
+            "rev": "fb1686403e4842b6f44eebe80e5acf86a5151d88"
         },
         "recipe": {
             "sha256": "0971pzc14gw8f0b4lzvicxww1k3wc58gbr3fd0qvdra2jifk2is6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.2305",
+        "version": "20151224.1059",
         "deps": [
             "emacs"
         ]
@@ -29888,7 +30041,7 @@
         },
         "recipe": {
             "sha256": "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140920.235",
         "deps": [
@@ -29902,14 +30055,14 @@
             "tag": "fetchFromGitHub",
             "owner": "ardumont",
             "repo": "markdown-toc",
-            "sha256": "0bmd601y2gafydnvzv9nbi5sh7m8hkwxbidim03knl2fh4j5rkyv",
-            "rev": "44c79a3b57224337fdaca5d2bdedba918e908fcd"
+            "sha256": "0jgr327qlh7acwi6sld27xdsvr89parspk6wmfklwszvy1v13633",
+            "rev": "c2ac578113015ba7d3377c0756a4d00c61ba2e17"
         },
         "recipe": {
             "sha256": "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150715.1114",
+        "version": "20151223.514",
         "deps": [
             "dash",
             "markdown-mode",
@@ -29926,7 +30079,7 @@
         },
         "recipe": {
             "sha256": "11ymzbj1ji7avfjqafj9p5zx0m4y1jfjcmyanpjq1frdcz639ir9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150817.1016",
         "deps": [
@@ -29943,7 +30096,7 @@
         },
         "recipe": {
             "sha256": "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151005.231",
         "deps": [
@@ -29963,7 +30116,7 @@
         },
         "recipe": {
             "sha256": "0h7gfg0c5pwfh18qzg1mx7an9p958ygdfqb54s85mbkv8x3rh1a0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140407.2325",
         "deps": []
@@ -29973,14 +30126,14 @@
             "tag": "fetchFromGitHub",
             "owner": "abo-abo",
             "repo": "swiper",
-            "sha256": "021rl53d7qmrkg0l3z19khfznj60bf45907dz1ypgbk6blakbk8q",
-            "rev": "8306be11c84a23e0ab3bcdd36cab1e5c16df8fbe"
+            "sha256": "1262k48ky88m3jgdryyxm9dqzsd2lc17vcra93lp3yrr6iqn55dl",
+            "rev": "d74fab4a5b98910bd09956d3cb9b3376d6287840"
         },
         "recipe": {
             "sha256": "13lld7kjz1n1ryxvrfsy0iym5l9m9ybrf7bpcmkzsalpp15j3mvm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.523",
+        "version": "20151227.300",
         "deps": [
             "emacs"
         ]
@@ -29995,7 +30148,7 @@
         },
         "recipe": {
             "sha256": "1cbv4frsrwd8d3rg8r4sylwnc1hl3hgh595qwbpx0zd3dp5na2yl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.1625",
         "deps": []
@@ -30010,7 +30163,7 @@
         },
         "recipe": {
             "sha256": "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150512.706",
         "deps": []
@@ -30020,14 +30173,14 @@
             "tag": "fetchFromGitHub",
             "owner": "jcollard",
             "repo": "elm-mode",
-            "sha256": "1gbb8896fg0kdkdnnhq9zyknq5jifyj25lsigil407y4a4d0s78m",
-            "rev": "a813a0ab2ac7a255b41f2da230dae5e479a8de5d"
+            "sha256": "055bnhkw0nvry3n20a980nrq3y2rlihp59pmrm1s4rlb0f5drckc",
+            "rev": "3462740eb2add23fc294aa5b2b549ee08f5f711e"
         },
         "recipe": {
             "sha256": "18hky1d1d2q5paz271w17r6n1k2sb7rrski8dxq3q586k4lqykj2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.257",
+        "version": "20151227.556",
         "deps": [
             "emacs",
             "f",
@@ -30044,7 +30197,7 @@
         },
         "recipe": {
             "sha256": "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.1509",
         "deps": [
@@ -30061,7 +30214,7 @@
         },
         "recipe": {
             "sha256": "14q423an7v5hhfx1x039fizxcn5hcscqf2jfn9rqifg4jpq8bq5g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150120.2234",
         "deps": [
@@ -30078,7 +30231,7 @@
         },
         "recipe": {
             "sha256": "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150202.1728",
         "deps": [
@@ -30091,14 +30244,14 @@
             "tag": "fetchFromGitHub",
             "owner": "emacs-helm",
             "repo": "helm-descbinds",
-            "sha256": "1f9nfvfsj9m1ha6cyic2l6gq5wlabx3mhnvs0jb111ybm87v4bhz",
-            "rev": "871771c458b59e494b0af036cff1cebf4fc24e2b"
+            "sha256": "1f7k0h1g1835fsvx6vc272bk62jf4y1r4qynjy7zbhzk13m6k6z2",
+            "rev": "f8ef6e195e7b0a9f167d2da4810a97baebbe2228"
         },
         "recipe": {
             "sha256": "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151215.1557",
+        "version": "20151222.849",
         "deps": [
             "helm"
         ]
@@ -30113,7 +30266,7 @@
         },
         "recipe": {
             "sha256": "1888xiqhrn7fcpjnr3smchmmqwfayfbbyvdkdb79c6drzjcvidp1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150331.908",
         "deps": [
@@ -30131,7 +30284,7 @@
         },
         "recipe": {
             "sha256": "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130529.1233",
         "deps": [
@@ -30149,7 +30302,7 @@
         },
         "recipe": {
             "sha256": "141x4scl13gqxyg0nlc8vig1iaybc3g95il5r51k4k83isi62iyq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151209.1647",
         "deps": [
@@ -30167,7 +30320,7 @@
         },
         "recipe": {
             "sha256": "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140103.1632",
         "deps": [
@@ -30184,7 +30337,7 @@
         },
         "recipe": {
             "sha256": "08zg3wgr80rp89c53ffqzz22ws9bp62a1m74xvxa74x6nq9i4xl0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150817.2113",
         "deps": [
@@ -30206,7 +30359,7 @@
         },
         "recipe": {
             "sha256": "139zq66cpcn4dnidf22h7x88p812ywrrz4c3c62w3915b75f71ki",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140129.952",
         "deps": [
@@ -30224,7 +30377,7 @@
         },
         "recipe": {
             "sha256": "0d05qb60k5f7wwpsp3amzghayfbwcha6rh8nrslhnklpjbg87aw5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150114.1033",
         "deps": []
@@ -30239,7 +30392,7 @@
         },
         "recipe": {
             "sha256": "1261dki0q44sw9h0g1305i2fj1dg9xgwzry50jbn2idcrqg4xf7k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130802.611",
         "deps": []
@@ -30254,7 +30407,7 @@
         },
         "recipe": {
             "sha256": "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151101.807",
         "deps": []
@@ -30269,7 +30422,7 @@
         },
         "recipe": {
             "sha256": "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151018.1231",
         "deps": [
@@ -30287,7 +30440,7 @@
         },
         "recipe": {
             "sha256": "0bc3d8bnvg1w2chrr4rp9daq1x8p41qgklrniq0bbkr2h93cmkgv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150919.1701",
         "deps": [
@@ -30305,7 +30458,7 @@
         },
         "recipe": {
             "sha256": "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": [
@@ -30317,14 +30470,14 @@
             "tag": "fetchFromGitHub",
             "owner": "tumashu",
             "repo": "easy-lentic",
-            "sha256": "0gk2a1bhxb2fr9mcli3j3mry0gipc407mbwrdip385rrzy7vqv2w",
-            "rev": "ecf7bac5e3ab760ab1e46f1955575b3c25ac99fe"
+            "sha256": "0qpabig0qrkyhhiifjpq9a7qv7h3nlqmpz79xy8lk58xy6rj0zk0",
+            "rev": "1b59ebe748e80488512034f885ad6540ad037382"
         },
         "recipe": {
             "sha256": "1j141lncgcgfpa42m505xndiy6lh848xymfvb3cz4d6h73421khg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151130.2116",
+        "version": "20151227.357",
         "deps": [
             "cl-lib",
             "lentic"
@@ -30340,7 +30493,7 @@
         },
         "recipe": {
             "sha256": "1p1k0yg5fxcjgwpq2ix9ckh2kn69m7d5rnz76h14hw9p72cb54r0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.440",
         "deps": [
@@ -30353,14 +30506,14 @@
             "tag": "fetchFromGitHub",
             "owner": "osv",
             "repo": "company-web",
-            "sha256": "00acy74sgp4r2dxgss66aldc9s59dn0i85ixz9glgamk9411j5qr",
-            "rev": "8fafaf180cade7633dc5fcbbf12b1e4843e4e365"
+            "sha256": "1a9qx041w7i1ahg6rmi82hv161k57z4aljzm8wpa9wrfj8a6df2q",
+            "rev": "2b426fc09b45b0e6bb95bb27d8ef22789c72a1d8"
         },
         "recipe": {
             "sha256": "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151023.1546",
+        "version": "20151219.517",
         "deps": [
             "cl-lib",
             "company",
@@ -30378,7 +30531,7 @@
         },
         "recipe": {
             "sha256": "11hspadm520cjlv1wk2bdpzg7hg2g0chbh26qijj9jgvca26x0md",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150821.614",
         "deps": []
@@ -30393,7 +30546,7 @@
         },
         "recipe": {
             "sha256": "12vgbypawxhhrnjp8dgh0wrcp7pvjccfaxw4yhq7msai7ik3h83b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150203.1843",
         "deps": []
@@ -30403,14 +30556,14 @@
             "tag": "fetchFromGitHub",
             "owner": "emacs-helm",
             "repo": "helm-recoll",
-            "sha256": "0c9h8n67wxy93rbf6ma7p27hpaj8v562mjnrc9wzgccb9rk4z4fn",
-            "rev": "e3e010d084697137d0b3cb802b19ab34c488094b"
+            "sha256": "1nl8acbvkbrgbxc4h2i10gq0bngyk74cfl8hi50cdq6agrsrfa3r",
+            "rev": "a13c5f372b470e1247a62834021931dcb4e50c96"
         },
         "recipe": {
             "sha256": "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151118.658",
+        "version": "20151220.854",
         "deps": [
             "helm"
         ]
@@ -30425,7 +30578,7 @@
         },
         "recipe": {
             "sha256": "1apc865a01jyx602ldzj32rrjk6xmgnxdccpjpcfgh24h2aqpdan",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140518.943",
         "deps": [
@@ -30441,7 +30594,7 @@
         },
         "recipe": {
             "sha256": "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150804.1151",
         "deps": []
@@ -30456,7 +30609,7 @@
         },
         "recipe": {
             "sha256": "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140817.1804",
         "deps": [
@@ -30476,14 +30629,14 @@
             "tag": "fetchFromGitHub",
             "owner": "emacs-eclim",
             "repo": "emacs-eclim",
-            "sha256": "1m674w1wskzvi92yjfk7sz4i59kc6bbgnic5z2m806qr1dmdyy0s",
-            "rev": "c13ad662a5194b292576fba477282263f573bc46"
+            "sha256": "1hjrnz3z5ac7gcly6jqxsv7v3b84xvyiv1dlbaivgic5rwp2n9mx",
+            "rev": "de6f6d7be1ba4e2d96cdbd05853f07ebbcd091cc"
         },
         "recipe": {
             "sha256": "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.2022",
+        "version": "20151226.1623",
         "deps": [
             "cl-lib",
             "dash",
@@ -30502,7 +30655,7 @@
         },
         "recipe": {
             "sha256": "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141112.1211",
         "deps": [
@@ -30519,7 +30672,7 @@
         },
         "recipe": {
             "sha256": "00y2nwyx13xlny40afczr31lvbpnw1cgmj5wc3iycyznizg5kvhq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151116.250",
         "deps": [
@@ -30537,7 +30690,7 @@
         },
         "recipe": {
             "sha256": "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150927.1318",
         "deps": [
@@ -30556,7 +30709,7 @@
         },
         "recipe": {
             "sha256": "0vzamqb52n330mi6rydrd4ls8nbwh5s42fc2gs5y15zakp6mvhr3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141102.854",
         "deps": []
@@ -30571,7 +30724,7 @@
         },
         "recipe": {
             "sha256": "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150910.843",
         "deps": []
@@ -30586,7 +30739,7 @@
         },
         "recipe": {
             "sha256": "0jh3rla8s8prprvhnlg0psdrj7swz7v6vf2xy1m6ff66p9saiv8i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130508.439",
         "deps": [
@@ -30603,7 +30756,7 @@
         },
         "recipe": {
             "sha256": "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150611.356",
         "deps": [
@@ -30624,7 +30777,7 @@
         },
         "recipe": {
             "sha256": "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151107.804",
         "deps": [
@@ -30643,7 +30796,7 @@
         },
         "recipe": {
             "sha256": "1jz26bw2h7ahcb7y2qhpqrlfald244c92m6pvfrb0jg0z384i6aj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150126.2337",
         "deps": [
@@ -30661,7 +30814,7 @@
         },
         "recipe": {
             "sha256": "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150324.1740",
         "deps": [
@@ -30678,7 +30831,7 @@
         },
         "recipe": {
             "sha256": "1vnm9piq71nx7q1843izm4vydfjq1564ax4ffwmqmlpisqzd6wq5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140314.817",
         "deps": []
@@ -30693,7 +30846,7 @@
         },
         "recipe": {
             "sha256": "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151023.1806",
         "deps": []
@@ -30708,7 +30861,7 @@
         },
         "recipe": {
             "sha256": "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150105.852",
         "deps": []
@@ -30718,14 +30871,14 @@
             "tag": "fetchFromGitHub",
             "owner": "haskell",
             "repo": "haskell-mode",
-            "sha256": "1fi74hk3q8r75k9kyahfnx302kca5p0r04i8hj21cn9fd9q2nfq0",
-            "rev": "93bfb29b8e49aba39f1de791bcece1b8043a4d32"
+            "sha256": "1z4yagdzcl66ak0wiiqfxpy1l9j0rh5kb5ir597w2lpahgrxz9p7",
+            "rev": "8ef95feb969df21905d8b8942a32155fce21b1cd"
         },
         "recipe": {
             "sha256": "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.1822",
+        "version": "20151226.950",
         "deps": [
             "cl-lib"
         ]
@@ -30738,9 +30891,9 @@
         },
         "recipe": {
             "sha256": "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151015.1751",
+        "version": "20151225.1201",
         "deps": []
     },
     "linum-relative": {
@@ -30753,7 +30906,7 @@
         },
         "recipe": {
             "sha256": "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151205.1956",
         "deps": []
@@ -30768,7 +30921,7 @@
         },
         "recipe": {
             "sha256": "1r8fy6q6isjxz9mvaa8in4imdghzla3gg1l93dfm1v2rlr7bhzbg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150809.1916",
         "deps": []
@@ -30783,7 +30936,7 @@
         },
         "recipe": {
             "sha256": "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130613.402",
         "deps": [
@@ -30800,7 +30953,7 @@
         },
         "recipe": {
             "sha256": "0w6f6998rqx8a3i4xhga7mrmvhxrm690wkqwfzspidid2z7v71az",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150911.1847",
         "deps": [
@@ -30818,7 +30971,7 @@
         },
         "recipe": {
             "sha256": "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140918.1337",
         "deps": []
@@ -30833,7 +30986,7 @@
         },
         "recipe": {
             "sha256": "1j2gi3f72kvavdcj6xs7zng0dcnivrhc7pjzm2g4mjm5ad5s1flq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150106.1156",
         "deps": []
@@ -30848,7 +31001,7 @@
         },
         "recipe": {
             "sha256": "032s7ax8qp3qzcj1njbyyxiyadjirphswqdlr45zj6hzajfsr247",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151125.1048",
         "deps": []
@@ -30863,7 +31016,7 @@
         },
         "recipe": {
             "sha256": "1vbgphmvvsj5jl8f78rpsidlmlgyp1kq3nkmziqhwkcq8hfywssm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141205.1451",
         "deps": []
@@ -30876,7 +31029,7 @@
         },
         "recipe": {
             "sha256": "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1909",
         "deps": []
@@ -30889,7 +31042,7 @@
         },
         "recipe": {
             "sha256": "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150702.1143",
         "deps": []
@@ -30904,7 +31057,7 @@
         },
         "recipe": {
             "sha256": "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150902.2356",
         "deps": [
@@ -30920,7 +31073,7 @@
         },
         "recipe": {
             "sha256": "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1553",
         "deps": []
@@ -30935,7 +31088,7 @@
         },
         "recipe": {
             "sha256": "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151128.928",
         "deps": [
@@ -30948,14 +31101,14 @@
             "tag": "fetchFromGitHub",
             "owner": "dgtized",
             "repo": "list-environment.el",
-            "sha256": "1vlli9fmd5fsb19bmylp3yzqnhwk5ldxld0m0q4sai0992lwx897",
-            "rev": "70919f3f75cfee6a68bf617baf417d672deb8c4b"
+            "sha256": "1szbs16jlxfj71986dbg0d3j5raaxcwz0xq5ar352731r5mdcqw4",
+            "rev": "b7ca30b05905047be2e55199a6475f8d98ce318b"
         },
         "recipe": {
             "sha256": "1zdhrlp8vk8knjwh56pws6dyn003r6avjzvhghlkgnw9nfrdk57h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150620.2218",
+        "version": "20151226.2056",
         "deps": []
     },
     "flyspell-popup": {
@@ -30968,7 +31121,7 @@
         },
         "recipe": {
             "sha256": "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150926.1003",
         "deps": [
@@ -30985,7 +31138,7 @@
         },
         "recipe": {
             "sha256": "0iq8cfii39ha8sxn9w7kyfvys8kwyax8g4l0pkl05q0a0s95padp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151017.2319",
         "deps": []
@@ -31000,7 +31153,7 @@
         },
         "recipe": {
             "sha256": "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151105.1719",
         "deps": []
@@ -31010,14 +31163,14 @@
             "tag": "fetchFromGitHub",
             "owner": "Bad-ptr",
             "repo": "persp-mode.el",
-            "sha256": "129cl5az4rr5j7krpyyi5khhbl8klw7ji9ysarz0s7ivy096jq7b",
-            "rev": "00e5f345f13b2b9e615082ac9ccbfd076592cc22"
+            "sha256": "11xcaxd0c2jxm8gxhspi5v5y64xz4gx8xzy5qsw81y2gj96byjc5",
+            "rev": "1f80818462211a8f81b8e352ec28d6a6745e8396"
         },
         "recipe": {
             "sha256": "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151212.207",
+        "version": "20151222.659",
         "deps": []
     },
     "replace-from-region": {
@@ -31028,7 +31181,7 @@
         },
         "recipe": {
             "sha256": "19q8hz2xiyamhw8hzpahqwd4352k1m9r9wlh9kdh6hbb6sjgllnb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150406.1930",
         "deps": []
@@ -31037,12 +31190,12 @@
         "fetch": {
             "tag": "fetchgit",
             "url": "git://factorcode.org/git/factor.git",
-            "sha256": "4a92fbfc3f08910d7fb1e351209dc40eb7bd724eebe7bf91bfab31f5faba54ec",
-            "rev": "216a1234c26d793488bb5a2c397c830b825f8da2"
+            "sha256": "8f9db8a5dae2ddd9a8a7118c79fe40be3d9c890d112f5858fb98a6ea90a19e56",
+            "rev": "7e40b6037490f2194f0dcf02e18992e601e28b78"
         },
         "recipe": {
             "sha256": "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151204.543",
         "deps": [
@@ -31060,7 +31213,7 @@
         },
         "recipe": {
             "sha256": "0nnyb6hq6r21wf1x3q41ab48b3dmcz5lyli771a59dk1gs8qpgak",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150901.816",
         "deps": []
@@ -31075,7 +31228,7 @@
         },
         "recipe": {
             "sha256": "1n0zp1mc7x7z0671lf7p9r4qxic90bkf5q3zwz4vinpiw2qh88lz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.101",
         "deps": [
@@ -31092,7 +31245,7 @@
         },
         "recipe": {
             "sha256": "1kdmp0wd7838nk58lby8gx91pjan47lq3izk4vdb2vm0h0iq57sa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140714.219",
         "deps": []
@@ -31102,14 +31255,14 @@
             "tag": "fetchFromGitHub",
             "owner": "emacs-helm",
             "repo": "helm",
-            "sha256": "1dsipz9qz3bsmgj49z42vfs3ggdv37jcn852hffwjyzlhalwpi8i",
-            "rev": "e42e3ed6543b72756e6f2f1a96cbd0d35166cb6e"
+            "sha256": "0l7dzk4xa4nfyj943x4gqcn1brfznfyrdxfwf1v097fp4ix8654q",
+            "rev": "e6fbd80f9f21e7cdb5d530f7aba138ad1dc527ab"
         },
         "recipe": {
             "sha256": "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151213.217",
+        "version": "20151224.1331",
         "deps": [
             "async",
             "cl-lib",
@@ -31126,7 +31279,7 @@
         },
         "recipe": {
             "sha256": "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151130.1754",
         "deps": [
@@ -31144,7 +31297,7 @@
         },
         "recipe": {
             "sha256": "0b1yf9bx1ldkzry7v5qvcnl059rq62a50dvpa10i2f5v0y96n1q9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130403.942",
         "deps": []
@@ -31158,7 +31311,7 @@
         },
         "recipe": {
             "sha256": "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120110.1440",
         "deps": []
@@ -31173,7 +31326,7 @@
         },
         "recipe": {
             "sha256": "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130912.2019",
         "deps": [
@@ -31193,7 +31346,7 @@
         },
         "recipe": {
             "sha256": "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151104.845",
         "deps": [
@@ -31210,7 +31363,7 @@
         },
         "recipe": {
             "sha256": "0rnq97jpr047gpkxhw22jj3gw09r45vn6fwkzxnxjzcmsyk492d0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150920.38",
         "deps": []
@@ -31220,14 +31373,14 @@
             "tag": "fetchFromGitHub",
             "owner": "bburns",
             "repo": "clipmon",
-            "sha256": "11q4qdl50ffxm9f8hllipikj28zriy48cbvmvvrr8q199jwzjfwl",
-            "rev": "0789be82a19bcdc556a93a287579c9eab2cc5c43"
+            "sha256": "1xqszj16yim89pln9aw17lji5knxm3pklaihydagd7a1f99hr51w",
+            "rev": "a531c3e5d3cf760b00d3f00726a4e60e226aae99"
         },
         "recipe": {
             "sha256": "1gvy1722px4fh88jyb8xx7k1dgyjgq7zjadr5fghdir42l0byw7i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150306.1423",
+        "version": "20151224.1147",
         "deps": []
     },
     "datomic-snippets": {
@@ -31240,7 +31393,7 @@
         },
         "recipe": {
             "sha256": "0lax0pj4k9c9n0gmrvil240pc9p25535q3n5m8nb2ar4sli8dn8r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130707.1515",
         "deps": [
@@ -31257,7 +31410,7 @@
         },
         "recipe": {
             "sha256": "01hm1rm9x3bqs6vf65l4xv2n4ramh3qwgmrp632fyfz5dlrvbssi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131228.1352",
         "deps": []
@@ -31270,7 +31423,7 @@
         },
         "recipe": {
             "sha256": "037f2jr8bs2sfxw28cal2d49bsbrg0zkz2xdham627l04qnkgv8x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140421.1122",
         "deps": []
@@ -31285,7 +31438,7 @@
         },
         "recipe": {
             "sha256": "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151013.303",
         "deps": [
@@ -31307,7 +31460,7 @@
         },
         "recipe": {
             "sha256": "0sva7i93dam8mc2z3cp785vmgcg7cphrpkwyvqyqhq8w51qg8mxx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151027.1035",
         "deps": [
@@ -31325,7 +31478,7 @@
         },
         "recipe": {
             "sha256": "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.140",
         "deps": [
@@ -31352,7 +31505,7 @@
         },
         "recipe": {
             "sha256": "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151029.1338",
         "deps": [
@@ -31371,7 +31524,7 @@
         },
         "recipe": {
             "sha256": "1vfnx114bvnly1k3fmcpkqq4m9558wqr5c9k9yj8f046dgfh8dp1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151113.859",
         "deps": [
@@ -31383,12 +31536,12 @@
         "fetch": {
             "tag": "fetchgit",
             "url": "git://orgmode.org/org-mode.git",
-            "sha256": "c1c1d1723bd8d8b0a1b45d89000f1fed977ceddf7de0acc66ebd1121bd1dbb62",
-            "rev": "73803c1cf9d0e4016cd1c36653b40573396bd9e7"
+            "sha256": "5f5c7580539162bd268e6e2703a47aea2a353984fe86158df72594d6105476d7",
+            "rev": "955bc57ded513be2cf2248a7d7a858c11a1110b3"
         },
         "recipe": {
             "sha256": "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140107.719",
         "deps": []
@@ -31403,24 +31556,42 @@
         },
         "recipe": {
             "sha256": "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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": "1xl76gxjinggg332dib2h6z1gyqfi81r0x5rl8hrfpx8spi4iql0",
-            "rev": "319d88242c78d6073d25f8bb68336603c35904d0"
+            "sha256": "1r2liqjww0yscxjpg13dsfhhv3yjahlbas0dabqlh4f9q0jdrgj4",
+            "rev": "5983e70a3ed5d62d218e1149cfe777b10c3168e5"
         },
         "recipe": {
             "sha256": "0zpk6nx757hasgzcww90fzkcdn078my33p7yax7xslvi4msm37bi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151210.801",
+        "version": "20151224.358",
         "deps": [
             "ace-jump-mode",
             "cl-lib",
@@ -31440,7 +31611,7 @@
         },
         "recipe": {
             "sha256": "0lijj2n4saw0xd3jaghbvx9v6a4ldl5gd8wy7s7hfcm30wb75cdb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150923.1102",
         "deps": [
@@ -31458,7 +31629,7 @@
         },
         "recipe": {
             "sha256": "1brmsgnkhr5nlma1p8f5s78y9gw3rfm8sah55n6vyhr0dpb4z7kl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150610.1206",
         "deps": []
@@ -31473,7 +31644,7 @@
         },
         "recipe": {
             "sha256": "0cb1w0sxgb5jf0p2a5s2i4d511lsjjhyaqkqlwjz8nk4w14n0zxm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140805.1554",
         "deps": [
@@ -31492,7 +31663,7 @@
         },
         "recipe": {
             "sha256": "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150519.955",
         "deps": [
@@ -31511,7 +31682,7 @@
         },
         "recipe": {
             "sha256": "0mqxg622lqnkb52a0wff7h8b0k6mm1k7fhkfi95fi5sahclja0rp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150114.32",
         "deps": [
@@ -31529,7 +31700,7 @@
         },
         "recipe": {
             "sha256": "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151106.534",
         "deps": []
@@ -31544,7 +31715,7 @@
         },
         "recipe": {
             "sha256": "1mbwbzg606winf5af7qkg6a1hg79lc7k2miq4d3mwih496l5sinb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151117.22",
         "deps": [
@@ -31563,7 +31734,7 @@
         },
         "recipe": {
             "sha256": "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140224.2210",
         "deps": []
@@ -31578,7 +31749,7 @@
         },
         "recipe": {
             "sha256": "0p7v564p8n1hm7rzlrbm2pnhyha8aif2r9g7g4kg0iqln89f5yhc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120202.2334",
         "deps": []
@@ -31593,7 +31764,7 @@
         },
         "recipe": {
             "sha256": "1ipqfylgiw9iyjc1nckbay890clfkhda81nr00cq06sjmm71iniq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150714.1125",
         "deps": [
@@ -31610,7 +31781,7 @@
         },
         "recipe": {
             "sha256": "18janbmhbwb6a46fgc1sxl9ww591v60y3wgh2wqh62vdy4ix3bd9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150828.2339",
         "deps": []
@@ -31625,7 +31796,7 @@
         },
         "recipe": {
             "sha256": "0wcd2r60ibbc2mzpq8fvyfc1fy172rf9kzdj51p4jyl51r76i86z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150818.824",
         "deps": [
@@ -31642,7 +31813,7 @@
         },
         "recipe": {
             "sha256": "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.1312",
         "deps": [
@@ -31659,7 +31830,7 @@
         },
         "recipe": {
             "sha256": "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140827.2056",
         "deps": [
@@ -31676,7 +31847,7 @@
         },
         "recipe": {
             "sha256": "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150719.1955",
         "deps": []
@@ -31689,7 +31860,7 @@
         },
         "recipe": {
             "sha256": "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151122.1052",
         "deps": []
@@ -31704,7 +31875,7 @@
         },
         "recipe": {
             "sha256": "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150915.1230",
         "deps": []
@@ -31719,7 +31890,7 @@
         },
         "recipe": {
             "sha256": "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150218.434",
         "deps": [
@@ -31735,7 +31906,7 @@
         },
         "recipe": {
             "sha256": "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140119.1543",
         "deps": []
@@ -31750,7 +31921,7 @@
         },
         "recipe": {
             "sha256": "0mgyq725x5hmhs3h8v5macv8bfkginjghhwr9kli60vdb4skgjvp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150714.1735",
         "deps": []
@@ -31765,7 +31936,7 @@
         },
         "recipe": {
             "sha256": "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151027.627",
         "deps": []
@@ -31774,12 +31945,12 @@
         "fetch": {
             "tag": "fetchgit",
             "url": "http://llvm.org/git/llvm",
-            "sha256": "6def2eb038bf60d3520930449ba109763e1c430c6b4c7fba3f272c3c46311fe6",
-            "rev": "52707d211b073942a461af811dcc442456a3064b"
+            "sha256": "31e826259c8497fcbe810bae9a51780766a0b676448746fd8ceeff285369fafc",
+            "rev": "d3bcf04e8331314fbfec3f0af41e137b6bd242c7"
         },
         "recipe": {
             "sha256": "0j3zsd0shd7kbi65a2ha7kmr0zy3my05378swx6m5m9x7miyr4y7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150910.844",
         "deps": []
@@ -31794,7 +31965,7 @@
         },
         "recipe": {
             "sha256": "1b9yh8p2x1dg7dyqhjhnqqiiymyl6bwsam65j0lpvbdx8r4iw882",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141214.743",
         "deps": [
@@ -31807,12 +31978,12 @@
             "tag": "fetchFromGitHub",
             "owner": "apache",
             "repo": "thrift",
-            "sha256": "07wzips127pxd0s75l71jl9jc299v6r8npz7flb391z3lfryvbin",
-            "rev": "7be41c7ada9692e3c37fb8b4935991f6247320f6"
+            "sha256": "1rd947vs6md9rdchqrpwm8qq5gxiz547npvph7njlahbpbm4xgyj",
+            "rev": "6dde7f19254db71cf27df214a59d7156967237fc"
         },
         "recipe": {
             "sha256": "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140312.1548",
         "deps": []
@@ -31827,7 +31998,7 @@
         },
         "recipe": {
             "sha256": "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150404.423",
         "deps": []
@@ -31842,7 +32013,7 @@
         },
         "recipe": {
             "sha256": "0n37k23lkjgaj9wxnr41yk3mwvy62mc9im5l86czqmw5gy4l63ic",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151122.1010",
         "deps": []
@@ -31857,7 +32028,7 @@
         },
         "recipe": {
             "sha256": "011rzq38ffmq7f2nzwrq96wwz67p82p1f0p5nib4nwqa47xlx7kf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150619.1934",
         "deps": [
@@ -31874,7 +32045,7 @@
         },
         "recipe": {
             "sha256": "0djh61mrfgcm3767ll1l5apw6646j4fdcaripksrmvn5aqfn8rjj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150715.2133",
         "deps": [
@@ -31894,7 +32065,7 @@
         },
         "recipe": {
             "sha256": "0h5jaw577vgm3hfiwc2c0k1wn8zda8ps06vj6mqj952m8bqhf4i7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150413.1515",
         "deps": [
@@ -31912,7 +32083,7 @@
         },
         "recipe": {
             "sha256": "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140520.1508",
         "deps": [
@@ -31930,7 +32101,7 @@
         },
         "recipe": {
             "sha256": "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131111.1546",
         "deps": []
@@ -31945,7 +32116,7 @@
         },
         "recipe": {
             "sha256": "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151112.141",
         "deps": [
@@ -31962,7 +32133,7 @@
         },
         "recipe": {
             "sha256": "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150929.47",
         "deps": [
@@ -31981,7 +32152,7 @@
         },
         "recipe": {
             "sha256": "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140213.548",
         "deps": []
@@ -31996,7 +32167,7 @@
         },
         "recipe": {
             "sha256": "08s42689kd78h2fmw230ja5dd3c3b4lx5mzadncwq0lj91y86kd8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150603.2047",
         "deps": []
@@ -32006,12 +32177,12 @@
             "tag": "fetchFromGitHub",
             "owner": "skk-dev",
             "repo": "ddskk",
-            "sha256": "11qr5ami93rwgvc3pf9370rsxbnawdllsrizm1v53xsi98yfp812",
-            "rev": "83f1acd557d1b5561f6bc5a3abae7ab9ab4ea440"
+            "sha256": "0yrjrrm0rkrvr34jwxbl5bm8ahr7w5xh76k859qwgi2cbz6vr7q0",
+            "rev": "47980e6c4f9979ff0b2d656befa5366c57e4527b"
         },
         "recipe": {
             "sha256": "1gx34062h25gqsl3j1fjlklha19snvmfaw068q6bv6x9r92niqnf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151205.743",
         "deps": []
@@ -32026,7 +32197,7 @@
         },
         "recipe": {
             "sha256": "1g644406zm3db0fjyv704aa8dbd20v1apmysb3mmh2vldbch4iyh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150811.1329",
         "deps": [
@@ -32039,14 +32210,14 @@
             "tag": "fetchFromGitHub",
             "owner": "osv",
             "repo": "ac-html-bootstrap",
-            "sha256": "0c2d5yh0xndna2p1azhhss63q3vbn3lsi2f22nb792gr6al1j8za",
-            "rev": "3c1880294585054fe8345f25d002a7a4633b2fae"
+            "sha256": "0v33p6lnsq1nwyxfbgs6vg6fidfyqwxd5wls2yza95yxzl30m9r7",
+            "rev": "ea9f7e351e1f39e0c2da5f518948db5ee751d15b"
         },
         "recipe": {
             "sha256": "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150930.241",
+        "version": "20151222.1512",
         "deps": [
             "web-completion-data"
         ]
@@ -32061,7 +32232,7 @@
         },
         "recipe": {
             "sha256": "0qw0qf14l09mcnw7h0ccbw17psfpra76qfawkc10zpdb5a2167d0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151010.2057",
         "deps": []
@@ -32071,12 +32242,12 @@
             "tag": "fetchFromGitHub",
             "owner": "JuliaLang",
             "repo": "julia",
-            "sha256": "08rznffmfbfsr1i7bphkxxsadq25rqkidfni7ljxakf0zwl6x7yr",
-            "rev": "e83b7559df94b3050603847dbd6f3674058027e6"
+            "sha256": "0ng603klkc56577qcn4gcayrqc38g2fyargjzj0nk7gc8kkd443r",
+            "rev": "1380bfe231858b49f0395377ee0af1aa383bbf93"
         },
         "recipe": {
             "sha256": "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150912.1000",
         "deps": []
@@ -32091,7 +32262,7 @@
         },
         "recipe": {
             "sha256": "129kzjpi5nzagqkjfikx9i7k6489dy7d3pd7ggn59p4cnh3r2rhh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140211.149",
         "deps": [
@@ -32109,7 +32280,7 @@
         },
         "recipe": {
             "sha256": "0nnccm6w9i0qsgiif22hi1asr0xqdivk8fgg76mp26a2fv8d3dag",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150110.2303",
         "deps": []
@@ -32124,7 +32295,7 @@
         },
         "recipe": {
             "sha256": "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150924.1314",
         "deps": [
@@ -32143,7 +32314,7 @@
         },
         "recipe": {
             "sha256": "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151202.238",
         "deps": [
@@ -32163,7 +32334,7 @@
         },
         "recipe": {
             "sha256": "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140720.2327",
         "deps": [
@@ -32179,7 +32350,7 @@
         },
         "recipe": {
             "sha256": "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140415.2041",
         "deps": []
@@ -32194,7 +32365,7 @@
         },
         "recipe": {
             "sha256": "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150910.547",
         "deps": [
@@ -32211,7 +32382,7 @@
         },
         "recipe": {
             "sha256": "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110120.2218",
         "deps": []
@@ -32226,7 +32397,7 @@
         },
         "recipe": {
             "sha256": "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150802.1157",
         "deps": []
@@ -32241,7 +32412,7 @@
         },
         "recipe": {
             "sha256": "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151015.1331",
         "deps": [
@@ -32258,7 +32429,7 @@
         },
         "recipe": {
             "sha256": "1g547d58zf11qw0zz3fk5kmrzmfx1rhawyh5d2h8bll8hwygnrxf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.2055",
         "deps": [
@@ -32270,12 +32441,12 @@
         "fetch": {
             "tag": "fetchgit",
             "url": "git://orgmode.org/org-mode.git",
-            "sha256": "c1c1d1723bd8d8b0a1b45d89000f1fed977ceddf7de0acc66ebd1121bd1dbb62",
-            "rev": "73803c1cf9d0e4016cd1c36653b40573396bd9e7"
+            "sha256": "5f5c7580539162bd268e6e2703a47aea2a353984fe86158df72594d6105476d7",
+            "rev": "955bc57ded513be2cf2248a7d7a858c11a1110b3"
         },
         "recipe": {
             "sha256": "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151218.428",
         "deps": []
@@ -32290,7 +32461,7 @@
         },
         "recipe": {
             "sha256": "1xq1k9rq7k1zw90shbgiidwvcn0ys1d53q03b5mpvvfqhj4n0i1g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130610.843",
         "deps": []
@@ -32305,7 +32476,7 @@
         },
         "recipe": {
             "sha256": "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151120.535",
         "deps": []
@@ -32320,7 +32491,7 @@
         },
         "recipe": {
             "sha256": "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.830",
         "deps": []
@@ -32335,7 +32506,7 @@
         },
         "recipe": {
             "sha256": "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150412.1216",
         "deps": [
@@ -32352,7 +32523,7 @@
         },
         "recipe": {
             "sha256": "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.1128",
         "deps": [
@@ -32370,7 +32541,7 @@
         },
         "recipe": {
             "sha256": "1xrgpqlzp4lhh5h3sv7pg1nqzc9wcv1hs6ybv2h4x6jangicwfl2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141205.2205",
         "deps": []
@@ -32385,7 +32556,7 @@
         },
         "recipe": {
             "sha256": "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130303.155",
         "deps": []
@@ -32399,7 +32570,7 @@
         },
         "recipe": {
             "sha256": "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151027.1649",
         "deps": [
@@ -32415,7 +32586,7 @@
         },
         "recipe": {
             "sha256": "1vrv64768f7rk58mqr4pq1fjyi5n5kfqk90hzrwbvblkkrmilmfs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1855",
         "deps": []
@@ -32430,7 +32601,7 @@
         },
         "recipe": {
             "sha256": "0f8ajhj677r2kxszmad6h1j1b827ja0vaz2my1vx145y3gf160b8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150823.539",
         "deps": []
@@ -32445,7 +32616,7 @@
         },
         "recipe": {
             "sha256": "1rydl857zfpbvd7aziz6h7n3rrh584z2cbfxlss3wgfclzmbyhgf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131022.402",
         "deps": []
@@ -32460,7 +32631,7 @@
         },
         "recipe": {
             "sha256": "06hisgsn0czvzbq8m4dz86h4q75j54a0gxkg5shnr8s654d450bp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150607.1113",
         "deps": []
@@ -32475,7 +32646,7 @@
         },
         "recipe": {
             "sha256": "0lwl8pkmq0q4dvyflarggnn8vzpvk5hhcnk508r6xml2if1sg9zx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130612.42",
         "deps": [
@@ -32492,7 +32663,7 @@
         },
         "recipe": {
             "sha256": "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151122.1250",
         "deps": []
@@ -32507,7 +32678,7 @@
         },
         "recipe": {
             "sha256": "03lz12bbkjqbs82alc97k6s1pmk721qip3h9cifq8a5ww5cbq9ln",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150108.227",
         "deps": [
@@ -32525,7 +32696,7 @@
         },
         "recipe": {
             "sha256": "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150423.902",
         "deps": [
@@ -32543,7 +32714,7 @@
         },
         "recipe": {
             "sha256": "1k6fawblz0d7kz1y7sa3q43s7ci28jsmzkp9vnl1nf55p9xvv4cf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140227.1439",
         "deps": []
@@ -32558,7 +32729,7 @@
         },
         "recipe": {
             "sha256": "0hp1f7p6m1gfv1a3plavzkzn87dllb5g2xrgg3mch4qsgdbqx65i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150604.638",
         "deps": [
@@ -32579,7 +32750,7 @@
         },
         "recipe": {
             "sha256": "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.1312",
         "deps": [
@@ -32592,14 +32763,14 @@
             "tag": "fetchFromGitHub",
             "owner": "syohex",
             "repo": "emacs-helm-open-github",
-            "sha256": "0z20wrrzwbw7d6b1s0grzlc3nj9n7dhmv3yk2wk0m4s8y5gmwjd5",
-            "rev": "9f275e065dbdcaf10c7573984d1ac97041faddba"
+            "sha256": "1wkmbc7247f209krvw4dzja3z0wyny12x5yi1cn3fnfh5nx04851",
+            "rev": "4c5a47003b2efed1c3437e91121a77d082cf64c8"
         },
         "recipe": {
             "sha256": "121sszwvihbv688nq5lhdclvsjj8759glh42h82r4pcw30lxggxb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.846",
+        "version": "20151226.842",
         "deps": [
             "cl-lib",
             "gh",
@@ -32616,7 +32787,7 @@
         },
         "recipe": {
             "sha256": "0spqa3xn3p2lmvlc5hdn7prq4vb70nkyrryx1kavha9igzhlyaga",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141219.1117",
         "deps": []
@@ -32631,7 +32802,7 @@
         },
         "recipe": {
             "sha256": "04gs468qqhdc9avx7lgibr0f1i444714i7rifad37dfmim8qk759",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121008.1114",
         "deps": []
@@ -32646,7 +32817,7 @@
         },
         "recipe": {
             "sha256": "0xm4vk4aggyfw96cgya5cp97jzx5ha0xwpf2yfh7c3m8d9cca4y8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.202",
         "deps": [
@@ -32664,7 +32835,7 @@
         },
         "recipe": {
             "sha256": "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151113.255",
         "deps": [
@@ -32684,7 +32855,7 @@
         },
         "recipe": {
             "sha256": "1fdj3dpcdqx0db5q8dlxag6pr2qn4yiz1hmg3c7dkmh51n85ssw2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151028.720",
         "deps": []
@@ -32699,7 +32870,7 @@
         },
         "recipe": {
             "sha256": "0v8009pad0l41zh9r1wzcx1h6vpzhr5rgpq6rb002prxz2lcbd37",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151011.1023",
         "deps": [
@@ -32716,7 +32887,7 @@
         },
         "recipe": {
             "sha256": "1vzifi6zpkmsh1a3c2njrw7mpfdgyjvpbz3bj42j8cg3vwjnjznb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140108.934",
         "deps": []
@@ -32731,7 +32902,7 @@
         },
         "recipe": {
             "sha256": "1cj0pxcjngiipmyl0w1p0g4wrxgm2y98a8862x1lcbali9lqbrwj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131118.1316",
         "deps": [
@@ -32749,7 +32920,7 @@
         },
         "recipe": {
             "sha256": "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150719.1248",
         "deps": []
@@ -32759,12 +32930,12 @@
             "tag": "fetchFromGitHub",
             "owner": "editorconfig",
             "repo": "editorconfig-emacs",
-            "sha256": "0af6r0qn6gy3ww5cf3cvvbwyqpvx5xv08gxkjsj92z9h2x5rfz7f",
-            "rev": "301d67b26098d048ff7235c0878252e80becc7e0"
+            "sha256": "04sflhamh5b9gxllfhcqdim02x6cb9xid39al2lisb8z4xywch68",
+            "rev": "5132b7a9441af76196ba3e62d73a0bb415853e4f"
         },
         "recipe": {
             "sha256": "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.1035",
         "deps": [
@@ -32782,7 +32953,7 @@
         },
         "recipe": {
             "sha256": "01vmr64j6hcvdbzg945c5a2g4fiidl18dsk4px7mdf85cv45kzqm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150316.1418",
         "deps": [
@@ -32801,7 +32972,7 @@
         },
         "recipe": {
             "sha256": "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150911.446",
         "deps": [
@@ -32816,7 +32987,7 @@
         },
         "recipe": {
             "sha256": "1f2wy25iphk3hzjy39ls5j04173g7gaq2rdp2grkawfhwx0ld4pj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141226.1420",
         "deps": []
@@ -32831,7 +33002,7 @@
         },
         "recipe": {
             "sha256": "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.138",
         "deps": [
@@ -32843,12 +33014,12 @@
         "fetch": {
             "tag": "fetchgit",
             "url": "https://go.googlesource.com/tools",
-            "sha256": "e8768dadb61beb860223d8cc2b9a2e4da8e5ebaeb631f94d1a72aebb9ce1a30a",
-            "rev": "fa833fdef560f0fe9b40dbb37fd03030ac3d514b"
+            "sha256": "e9c11949d98b65c9d5f6e282f8bc4c4d85ee988c91f68fba22562a2e620e43d7",
+            "rev": "d6e83e534da905609e21e4086a0fbaed33f88d07"
         },
         "recipe": {
             "sha256": "1sc3iwxiydgs787a6pi778i0qzqv3bf498r47jwiw5b6mmib3fah",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151027.838",
         "deps": [
@@ -32865,7 +33036,7 @@
         },
         "recipe": {
             "sha256": "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151107.216",
         "deps": [
@@ -32887,7 +33058,7 @@
         },
         "recipe": {
             "sha256": "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151212.1448",
         "deps": [
@@ -32905,7 +33076,7 @@
         },
         "recipe": {
             "sha256": "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.2130",
         "deps": [
@@ -32922,7 +33093,7 @@
         },
         "recipe": {
             "sha256": "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150830.1054",
         "deps": []
@@ -32937,7 +33108,7 @@
         },
         "recipe": {
             "sha256": "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150702.330",
         "deps": [
@@ -32953,7 +33124,7 @@
         },
         "recipe": {
             "sha256": "1rnrm9jf9wvfrwyylhj0bfrz9140945lc87lrh21caf7q88fpvkw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130917.1348",
         "deps": []
@@ -32968,7 +33139,7 @@
         },
         "recipe": {
             "sha256": "0s3h4b3lpz4jsk222yyfdxh780dvykhaqgyv6r3ambz95vrmmpl4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151110.1252",
         "deps": []
@@ -32983,7 +33154,7 @@
         },
         "recipe": {
             "sha256": "1axydags80jkyhpzp3m4gyplwr9k3a13w6vmrrzcv161nln7jhhs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20111009.816",
         "deps": []
@@ -32998,7 +33169,7 @@
         },
         "recipe": {
             "sha256": "1ykiz5fviq2n2474izwp0vvqanpbmxg7lzh1xbpn281kwmp0mwin",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151001.129",
         "deps": []
@@ -33012,7 +33183,7 @@
         },
         "recipe": {
             "sha256": "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141104.1037",
         "deps": []
@@ -33027,7 +33198,7 @@
         },
         "recipe": {
             "sha256": "07flxggnf0lb1fnvprac1daplgx4bi5fnnkgfc58wnw805s12k32",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.1804",
         "deps": [
@@ -33044,7 +33215,7 @@
         },
         "recipe": {
             "sha256": "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150808.756",
         "deps": [
@@ -33064,7 +33235,7 @@
         },
         "recipe": {
             "sha256": "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150414.2032",
         "deps": [
@@ -33082,7 +33253,7 @@
         },
         "recipe": {
             "sha256": "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150101.719",
         "deps": [
@@ -33099,7 +33270,7 @@
         },
         "recipe": {
             "sha256": "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140717.2341",
         "deps": []
@@ -33114,7 +33285,7 @@
         },
         "recipe": {
             "sha256": "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151202.522",
         "deps": [
@@ -33131,7 +33302,7 @@
         },
         "recipe": {
             "sha256": "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151020.801",
         "deps": [
@@ -33150,7 +33321,7 @@
         },
         "recipe": {
             "sha256": "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150604.1224",
         "deps": [
@@ -33168,7 +33339,7 @@
         },
         "recipe": {
             "sha256": "1lg5z5d0d35sh21maiwmgzvc31iki9yg6x0awy5xrfsains7ykn9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121014.2319",
         "deps": [
@@ -33185,7 +33356,7 @@
         },
         "recipe": {
             "sha256": "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150902.2027",
         "deps": []
@@ -33200,7 +33371,7 @@
         },
         "recipe": {
             "sha256": "184b8x19cnvx8z4dr9alv62wchzc7vr7crzz8jiyqw9d544zs50h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150225.146",
         "deps": []
@@ -33215,7 +33386,7 @@
         },
         "recipe": {
             "sha256": "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150824.749",
         "deps": []
@@ -33230,7 +33401,7 @@
         },
         "recipe": {
             "sha256": "1hiyi3w6rvins8hfxd96bgpihxarmv192q96sadqcwshcqi14zmw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150408.1622",
         "deps": [
@@ -33247,7 +33418,7 @@
         },
         "recipe": {
             "sha256": "1mdphgsqg6n4hryr53rk42z58vfv0g5wkar5ipanr4h4iclkf5vd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140114.705",
         "deps": []
@@ -33262,7 +33433,7 @@
         },
         "recipe": {
             "sha256": "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150831.358",
         "deps": [
@@ -33281,7 +33452,7 @@
         },
         "recipe": {
             "sha256": "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140611.1150",
         "deps": []
@@ -33296,7 +33467,7 @@
         },
         "recipe": {
             "sha256": "0nqk6chg0ky98ap2higa74786prj7dbwx2a3l67m0llmdajw76qn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131228.6",
         "deps": [
@@ -33313,7 +33484,7 @@
         },
         "recipe": {
             "sha256": "091kipkb6z6x9ic4chprim9rvnmx4yj4419ijmvpn70w69aspnb5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141115.630",
         "deps": [
@@ -33330,7 +33501,7 @@
         },
         "recipe": {
             "sha256": "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151031.1159",
         "deps": [
@@ -33347,7 +33518,7 @@
         },
         "recipe": {
             "sha256": "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.1126",
         "deps": [
@@ -33364,7 +33535,7 @@
         },
         "recipe": {
             "sha256": "19p6f06qdjvh2vmgbabajvkfxpn13j899jrivw9mqyssz0cyvzgw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131208.1118",
         "deps": []
@@ -33377,7 +33548,7 @@
         },
         "recipe": {
             "sha256": "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1610",
         "deps": []
@@ -33392,7 +33563,7 @@
         },
         "recipe": {
             "sha256": "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140925.1008",
         "deps": []
@@ -33407,7 +33578,7 @@
         },
         "recipe": {
             "sha256": "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151117.827",
         "deps": []
@@ -33422,7 +33593,7 @@
         },
         "recipe": {
             "sha256": "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140825.627",
         "deps": [
@@ -33439,7 +33610,7 @@
         },
         "recipe": {
             "sha256": "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150618.2038",
         "deps": [
@@ -33456,7 +33627,7 @@
         },
         "recipe": {
             "sha256": "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150907.256",
         "deps": [
@@ -33468,14 +33639,14 @@
             "tag": "fetchFromGitHub",
             "owner": "kawabata",
             "repo": "ox-pandoc",
-            "sha256": "0c8hknfs4wapz2zy2nskv3r8gkmzs1smib9r3nlg6p84bs0wnkhr",
-            "rev": "c2ee3801e1df4e865afc9ce271771479ce2b248b"
+            "sha256": "0bawigwc6v5420642xlkyxdd0i82gicx69wqlnjf6lvhfvs990is",
+            "rev": "2605a0ed8ed3c86b78829589956bedf5eda447cc"
         },
         "recipe": {
             "sha256": "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150706.2009",
+        "version": "20151222.1753",
         "deps": [
             "dash",
             "emacs",
@@ -33493,7 +33664,7 @@
         },
         "recipe": {
             "sha256": "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141105.859",
         "deps": [
@@ -33508,14 +33679,14 @@
             "tag": "fetchFromGitHub",
             "owner": "bbatsov",
             "repo": "projectile",
-            "sha256": "01mwciy9bacx5vkxckp0hsxx0s00qss48kkcc2rhlypdcmmawvn7",
-            "rev": "05058b1c73799b07003ad0978f5ba9a231783be4"
+            "sha256": "1b6h07scpg9gvslsdvz996p67vyyhiiy3hnkh7sqm2pyv9zf7wq5",
+            "rev": "b9e76f90d3846837e53ca75b78917a11b905ab70"
         },
         "recipe": {
             "sha256": "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.1552",
+        "version": "20151224.1443",
         "deps": [
             "dash",
             "pkg-info"
@@ -33531,7 +33702,7 @@
         },
         "recipe": {
             "sha256": "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141024.522",
         "deps": []
@@ -33546,7 +33717,7 @@
         },
         "recipe": {
             "sha256": "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151024.313",
         "deps": [
@@ -33559,14 +33730,14 @@
             "tag": "fetchFromGitHub",
             "owner": "flycheck",
             "repo": "flycheck",
-            "sha256": "1szj58qd0wx6lvcb69mb7ccn2b0qsa7b028519137slrwmxipgp8",
-            "rev": "1404451f226153a06a1e7741fe6a3d10267bb3a4"
+            "sha256": "0n9bbcbv2ria9x1ysfz714xd04z6cdpcfkyhrscl9rywhccjx6zl",
+            "rev": "1d0c64869a93f830bd8b53ac3426a6682c0ec563"
         },
         "recipe": {
             "sha256": "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151216.902",
+        "version": "20151223.902",
         "deps": [
             "dash",
             "emacs",
@@ -33585,7 +33756,7 @@
         },
         "recipe": {
             "sha256": "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.2121",
         "deps": []
@@ -33600,7 +33771,7 @@
         },
         "recipe": {
             "sha256": "1ygmx0rjvxjl8hifkkwrkk9gpsmdsk6ndb6pg7y78p8hfp5jpyq3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150224.2037",
         "deps": [
@@ -33620,7 +33791,7 @@
         },
         "recipe": {
             "sha256": "1q4d63c7nr3g7q0smd55pp636vqa9lf1pkwjn9iq265369npvina",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140904.1317",
         "deps": [
@@ -33635,7 +33806,7 @@
         },
         "recipe": {
             "sha256": "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.854",
         "deps": []
@@ -33650,7 +33821,7 @@
         },
         "recipe": {
             "sha256": "16ckybqd0a8l75ascm3k4cdzp969lzq7m050aymdyjhwif6ld2r7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150924.1150",
         "deps": [
@@ -33667,7 +33838,7 @@
         },
         "recipe": {
             "sha256": "01dsqq2qdsbxny6j9dhvg770493awxjhk1m85c14ysgh6sl199rm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140125.1819",
         "deps": [
@@ -33684,7 +33855,7 @@
         },
         "recipe": {
             "sha256": "12h9r4kf9y2v601myhzzdw2c4jc5cb7s94r5dkzriq578digxphl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.622",
         "deps": [
@@ -33701,7 +33872,7 @@
         },
         "recipe": {
             "sha256": "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150916.2054",
         "deps": [
@@ -33709,6 +33880,23 @@
             "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",
@@ -33719,7 +33907,7 @@
         },
         "recipe": {
             "sha256": "05f9pdkqppnp7wafka2d2yj84gqchjd7vnrl5rcywy1l47gbxiw0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150331.1409",
         "deps": []
@@ -33734,7 +33922,7 @@
         },
         "recipe": {
             "sha256": "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150704.1009",
         "deps": []
@@ -33749,7 +33937,7 @@
         },
         "recipe": {
             "sha256": "0kx358m3p23r8m7z45454i62ijmdlf4mljlbqc20jkihfanr6wqd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150329.1733",
         "deps": []
@@ -33759,18 +33947,36 @@
             "tag": "fetchFromGitHub",
             "owner": "epost",
             "repo": "psc-ide-emacs",
-            "sha256": "0pz5d8xl2bc9k4isk39rbkw9wcmd83a4hpqv04fqcvjnrvawabww",
-            "rev": "44d9bc5e0cfadb4fd03b32c0c0b8ea01e5b1c1ae"
+            "sha256": "0g2z4dkzwxpzpqwjizjcz3v3rgihxpl1pk3wcmyv0mz05795if4r",
+            "rev": "c4bfcf3d7414c37e745d95f6e3a3672c0ca99620"
         },
         "recipe": {
             "sha256": "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151206.817",
+        "version": "20151220.1634",
         "deps": [
             "cl-lib",
             "company",
-            "dash"
+            "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": {
@@ -33783,7 +33989,7 @@
         },
         "recipe": {
             "sha256": "0p09w419kldgl913hgqfzyv2pck27vqq2i1xsx7g29biwgnp9hl9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150805.528",
         "deps": [
@@ -33800,7 +34006,7 @@
         },
         "recipe": {
             "sha256": "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140201.514",
         "deps": []
@@ -33815,7 +34021,7 @@
         },
         "recipe": {
             "sha256": "0ak3g152q3xxkiz1a4pl5y2vgbigbbmbc95fggirbcrh52zkzgk9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130821.1305",
         "deps": []
@@ -33830,7 +34036,7 @@
         },
         "recipe": {
             "sha256": "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150222.646",
         "deps": [
@@ -33848,7 +34054,7 @@
         },
         "recipe": {
             "sha256": "11scjjwwrpgaz6i4jq9y7m864nfak46vnbfb0w15625znz926jcs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150710.904",
         "deps": []
@@ -33863,7 +34069,7 @@
         },
         "recipe": {
             "sha256": "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150421.1536",
         "deps": [
@@ -33880,7 +34086,7 @@
         },
         "recipe": {
             "sha256": "0j5fr7qdvpd5b096h5a83fz8sh9wybdnsgix6v94gv8lkzdsqkr8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130728.1721",
         "deps": []
@@ -33895,7 +34101,7 @@
         },
         "recipe": {
             "sha256": "1w418jm6x3vcg2x31nzc8a3b8asx6gznl6m76ip8w98riz7vy02f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150915.333",
         "deps": [
@@ -33912,7 +34118,7 @@
         },
         "recipe": {
             "sha256": "0hfr27yiiblrd0p3zhpapbj4vijfdk7wqh406xnlwf2yvnfsqycd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130720.1016",
         "deps": []
@@ -33927,7 +34133,7 @@
         },
         "recipe": {
             "sha256": "1v01yr3lk6l0qn80i3r8fq3di0a8bmqjyhwx19hcgiap57xl80h8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110726.1141",
         "deps": []
@@ -33940,7 +34146,7 @@
         },
         "recipe": {
             "sha256": "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1532",
         "deps": [
@@ -33957,7 +34163,7 @@
         },
         "recipe": {
             "sha256": "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150215.34",
         "deps": [
@@ -33973,7 +34179,7 @@
         },
         "recipe": {
             "sha256": "06a6lwx61xindlchh3ps8khhxc6sr7i9d7i60rjw1h07nxmh0fli",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150829.2355",
         "deps": []
@@ -33988,7 +34194,7 @@
         },
         "recipe": {
             "sha256": "1cb2wvawp3wqslhgbmbw9xwcqgwfscqg0jfgqzi3nr42mjp9zgqj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140929.1637",
         "deps": []
@@ -34003,7 +34209,7 @@
         },
         "recipe": {
             "sha256": "1i1lbjracrgdxr52agxhxxgkra4w291dmz85s195lcx38rva7ib3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.733",
         "deps": [
@@ -34025,7 +34231,7 @@
         },
         "recipe": {
             "sha256": "0k5z2xqlrzp5lyvp2lr462x38kqdmqld845bvyvkfjd2k4yri71x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130216.714",
         "deps": []
@@ -34040,7 +34246,7 @@
         },
         "recipe": {
             "sha256": "07i2dr807np4fwq3ryxlw11vbc1sik1iv7x5740q258jyc9zfgll",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140714.1649",
         "deps": []
@@ -34055,7 +34261,7 @@
         },
         "recipe": {
             "sha256": "0fydq779b0y6hmh8srfdimr5rl9mk3sj08rbvlljxv3kqv5ajczj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151202.406",
         "deps": []
@@ -34070,7 +34276,7 @@
         },
         "recipe": {
             "sha256": "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150111.1908",
         "deps": [
@@ -34087,7 +34293,7 @@
         },
         "recipe": {
             "sha256": "17b9walfc5c9qfdvl9pcwb2gjikc3wxk1d3v878ckypmxd38vciq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141222.1835",
         "deps": []
@@ -34102,7 +34308,7 @@
         },
         "recipe": {
             "sha256": "05x2xyys5mf6k7ndh0l6ykyiygaznb4f8bx3npbhvihrsz9ilf8r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150802.406",
         "deps": []
@@ -34117,7 +34323,7 @@
         },
         "recipe": {
             "sha256": "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150703.326",
         "deps": [
@@ -34135,7 +34341,7 @@
         },
         "recipe": {
             "sha256": "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.1858",
         "deps": [
@@ -34148,14 +34354,14 @@
             "tag": "fetchFromGitHub",
             "owner": "danil",
             "repo": "ido-describe-bindings",
-            "sha256": "19chkraanp4fbg5a7mrrjycqd87y5z4a65psy5wdhrp30ykhm7iq",
-            "rev": "a4048d5d1a6aad93c0206dbe4f34f4edb21a04d2"
+            "sha256": "1xd86jx6j5livsdsplq5yawz1wmkflkvnjmccjjlcy8f5ncl80ax",
+            "rev": "2076b7e8a418008fb503357df2f0f99de3d9aa1d"
         },
         "recipe": {
             "sha256": "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150828.1438",
+        "version": "20151222.934",
         "deps": [
             "dash",
             "ido-vertical-mode"
@@ -34171,7 +34377,7 @@
         },
         "recipe": {
             "sha256": "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130419.1629",
         "deps": []
@@ -34186,7 +34392,7 @@
         },
         "recipe": {
             "sha256": "12lvfspqmyrapmbz3x997vf160927d325y50kxdx3s6p81r7n2n8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130612.852",
         "deps": []
@@ -34201,7 +34407,7 @@
         },
         "recipe": {
             "sha256": "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.612",
         "deps": [
@@ -34219,7 +34425,7 @@
         },
         "recipe": {
             "sha256": "0y7ccycfnpykgzr88968w7dl45qazf8b9zlf7ydw3ghkl4f6lbwl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151217.954",
         "deps": [
@@ -34236,7 +34442,7 @@
         },
         "recipe": {
             "sha256": "09dsmrqax4wfcw8fd5jf07bjxm5dizpc2qvjkqwg74j2n352wv27",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120817.1906",
         "deps": []
@@ -34251,7 +34457,7 @@
         },
         "recipe": {
             "sha256": "1937j1xm20vfcqm9ig4nvciqfkz7rpw0nsfhlg69gkmv0nqszdr3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140225.346",
         "deps": [
@@ -34268,7 +34474,7 @@
         },
         "recipe": {
             "sha256": "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141216.1609",
         "deps": [
@@ -34286,7 +34492,7 @@
         },
         "recipe": {
             "sha256": "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141024.2150",
         "deps": []
@@ -34301,7 +34507,7 @@
         },
         "recipe": {
             "sha256": "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151112.1825",
         "deps": [
@@ -34318,7 +34524,7 @@
         },
         "recipe": {
             "sha256": "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.1115",
         "deps": []
@@ -34333,7 +34539,7 @@
         },
         "recipe": {
             "sha256": "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151209.2117",
         "deps": [
@@ -34350,7 +34556,7 @@
         },
         "recipe": {
             "sha256": "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150324.348",
         "deps": [
@@ -34367,7 +34573,7 @@
         },
         "recipe": {
             "sha256": "06llf365k8m81ljmlajqvxlh84qg6h0flp3m6gb0zx71xilvw186",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151010.507",
         "deps": [
@@ -34386,7 +34592,7 @@
         },
         "recipe": {
             "sha256": "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1832",
         "deps": []
@@ -34400,7 +34606,7 @@
         },
         "recipe": {
             "sha256": "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130508.1703",
         "deps": []
@@ -34415,7 +34621,7 @@
         },
         "recipe": {
             "sha256": "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.36",
         "deps": [
@@ -34432,7 +34638,7 @@
         },
         "recipe": {
             "sha256": "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.651",
         "deps": [
@@ -34449,7 +34655,7 @@
         },
         "recipe": {
             "sha256": "1y4n4c2imnm3f1q129bvbi4gzk0iazd8qq959gvq9j9fl1aziiz1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140310.436",
         "deps": [
@@ -34467,7 +34673,7 @@
         },
         "recipe": {
             "sha256": "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150315.805",
         "deps": [
@@ -34479,14 +34685,14 @@
             "tag": "fetchFromGitHub",
             "owner": "emacs-berlin",
             "repo": "general-close",
-            "sha256": "1nz6rlp0d6knx2f8703yjmnyiqy7sdg7y52r6xn5g4904fn4ndf4",
-            "rev": "77aac6f98a7c136c88794b0e3d50915a027e185f"
+            "sha256": "1l3ps28a1wdrg2fgvvkdxdadfgpplijs4ig1yqq8yi7k13k046p4",
+            "rev": "e12d26ffc59f62aeee31ad16a823cb4a390d85c8"
         },
         "recipe": {
             "sha256": "17v0aprfvxbygx5517a8hrl88qm5lb9k7523yd0ps5p9l5x96964",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150922.213",
+        "version": "20151222.343",
         "deps": []
     },
     "date-at-point": {
@@ -34499,7 +34705,7 @@
         },
         "recipe": {
             "sha256": "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150108.618",
         "deps": []
@@ -34514,7 +34720,7 @@
         },
         "recipe": {
             "sha256": "0cfs7gvjxsx2027dbzh4yypz500nmk503ikiiprbww8jyvc8grk7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.1549",
         "deps": [
@@ -34535,7 +34741,7 @@
         },
         "recipe": {
             "sha256": "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140605.1346",
         "deps": [
@@ -34552,7 +34758,7 @@
         },
         "recipe": {
             "sha256": "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120808.622",
         "deps": []
@@ -34567,7 +34773,7 @@
         },
         "recipe": {
             "sha256": "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150726.356",
         "deps": [
@@ -34586,7 +34792,7 @@
         },
         "recipe": {
             "sha256": "1y6pyc6g8j42hs103yynjsdkkxvcq0q4xsz4r93rqwsr3za3wcmc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150215.1518",
         "deps": [
@@ -34603,7 +34809,7 @@
         },
         "recipe": {
             "sha256": "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150619.18",
         "deps": [
@@ -34620,7 +34826,7 @@
         },
         "recipe": {
             "sha256": "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150915.2222",
         "deps": []
@@ -34635,7 +34841,7 @@
         },
         "recipe": {
             "sha256": "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141121.1405",
         "deps": [
@@ -34653,7 +34859,7 @@
         },
         "recipe": {
             "sha256": "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.22",
         "deps": []
@@ -34667,7 +34873,7 @@
         },
         "recipe": {
             "sha256": "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151212.1406",
         "deps": []
@@ -34680,7 +34886,7 @@
         },
         "recipe": {
             "sha256": "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150616.1522",
         "deps": [
@@ -34697,7 +34903,7 @@
         },
         "recipe": {
             "sha256": "1abx2rw09xxp122ff7i9sry5djd4l6vn4lfzxs92rknjzkyc40pb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141122.842",
         "deps": [
@@ -34714,7 +34920,7 @@
         },
         "recipe": {
             "sha256": "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150831.2007",
         "deps": [
@@ -34732,7 +34938,7 @@
         },
         "recipe": {
             "sha256": "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130718.435",
         "deps": []
@@ -34747,7 +34953,7 @@
         },
         "recipe": {
             "sha256": "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151112.1547",
         "deps": [
@@ -34767,7 +34973,7 @@
         },
         "recipe": {
             "sha256": "19y8aln7wix9p506ajvfkl641147c5mdmjm98jnq68cx2r4wp6zz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150106.1506",
         "deps": []
@@ -34782,7 +34988,7 @@
         },
         "recipe": {
             "sha256": "0ada2gcl8bw9nn0fz8g9lbqy8a8w1554q03fzd7lv8qla33ri3wx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141028.1727",
         "deps": [
@@ -34800,7 +35006,7 @@
         },
         "recipe": {
             "sha256": "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.603",
         "deps": []
@@ -34815,7 +35021,7 @@
         },
         "recipe": {
             "sha256": "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151015.605",
         "deps": [
@@ -34833,7 +35039,7 @@
         },
         "recipe": {
             "sha256": "1i7dvxgj00p4n2fh8irgdfsjl2dpvfjjnkkv0cw71441f79p79mf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150826.1051",
         "deps": [
@@ -34851,7 +35057,7 @@
         },
         "recipe": {
             "sha256": "07g6jwymmwkx26p3as3r370viz1cqq360cagw9ji6i0hvgrr66a0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141025.1112",
         "deps": []
@@ -34866,7 +35072,7 @@
         },
         "recipe": {
             "sha256": "0ynnmqw0vsf7wyhp9m5a05dfb19vkj8dnj5glhjdzjvg30dhjp3a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141231.1401",
         "deps": [
@@ -34884,7 +35090,7 @@
         },
         "recipe": {
             "sha256": "02whx8g8r02mzng7d7bnbkz5n7gyzp5hcnmvd6a3lq106c0h7w9k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150821.2304",
         "deps": []
@@ -34899,7 +35105,7 @@
         },
         "recipe": {
             "sha256": "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141228.540",
         "deps": [
@@ -34917,7 +35123,7 @@
         },
         "recipe": {
             "sha256": "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150422.833",
         "deps": []
@@ -34932,7 +35138,7 @@
         },
         "recipe": {
             "sha256": "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150325.1315",
         "deps": []
@@ -34947,7 +35153,7 @@
         },
         "recipe": {
             "sha256": "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150804.1210",
         "deps": []
@@ -34962,7 +35168,7 @@
         },
         "recipe": {
             "sha256": "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150512.202",
         "deps": [
@@ -34982,7 +35188,7 @@
         },
         "recipe": {
             "sha256": "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150817.954",
         "deps": [
@@ -34996,14 +35202,14 @@
             "tag": "fetchFromGitHub",
             "owner": "aaron-em",
             "repo": "rcirc-styles.el",
-            "sha256": "18b74bdkly0zqfi7q7b4sn7rpzhhczap4rl5r5i8vrawwc03bswb",
-            "rev": "a1a166ad34e6096d6b5dde9ea4312b3104899a75"
+            "sha256": "0x0nf8qk2fb7p9577456slgszhnh2f2vqaazz20fyaxv1rjfadxw",
+            "rev": "6a65ad9f910d716a218ee42035fd9e9c93998a79"
         },
         "recipe": {
             "sha256": "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150720.2031",
+        "version": "20151220.1157",
         "deps": [
             "cl-lib"
         ]
@@ -35018,7 +35224,7 @@
         },
         "recipe": {
             "sha256": "1a70j3aglrwmaw9g8m99sxad2vs53y4swxh97gqjsgx1rrx03g52",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150526.1905",
         "deps": []
@@ -35031,7 +35237,7 @@
         },
         "recipe": {
             "sha256": "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151209.304",
         "deps": []
@@ -35046,7 +35252,7 @@
         },
         "recipe": {
             "sha256": "1wkca66q4k94h9njsy15n83wjzn90rcbmv44x0hdwqj92yxjf3y7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120412.803",
         "deps": []
@@ -35061,7 +35267,7 @@
         },
         "recipe": {
             "sha256": "0zhlm8lfri3zkhj62cycvdhkkgrn72lqb0dalh8qgr049bdv816y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141024.1842",
         "deps": []
@@ -35076,7 +35282,7 @@
         },
         "recipe": {
             "sha256": "0cw1rr56hdngvhmx59j76hvkfzgybasn0fwhd6vwm709jqiiiwiz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100321.1114",
         "deps": []
@@ -35091,7 +35297,7 @@
         },
         "recipe": {
             "sha256": "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151125.107",
         "deps": [
@@ -35108,7 +35314,7 @@
         },
         "recipe": {
             "sha256": "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150824.1611",
         "deps": []
@@ -35123,7 +35329,7 @@
         },
         "recipe": {
             "sha256": "1kw88fvxil9l80w8zn16az7avqplyf2m0l7kp431wb5b1b1508jl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130608.2140",
         "deps": [
@@ -35140,7 +35346,7 @@
         },
         "recipe": {
             "sha256": "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151107.2247",
         "deps": []
@@ -35150,14 +35356,14 @@
             "tag": "fetchFromGitHub",
             "owner": "ergoemacs",
             "repo": "ergoemacs-mode",
-            "sha256": "0h46k3wjcrizb45j8xcr5chk30lvzn2v9892k4m4xcgp6jdhzycm",
-            "rev": "6b105ec09b45d8f67549b7c23ecf4cca26e27a40"
+            "sha256": "0pwky3r2s43iw4gq0cq343fja2795qd8z9qbfi1vdrz18rp57s0j",
+            "rev": "742b5d39d6cfb0991933c169976cfb7b8e5e7e93"
         },
         "recipe": {
             "sha256": "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.930",
+        "version": "20151221.833",
         "deps": [
             "emacs",
             "undo-tree"
@@ -35173,7 +35379,7 @@
         },
         "recipe": {
             "sha256": "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.627",
         "deps": [
@@ -35190,7 +35396,7 @@
         },
         "recipe": {
             "sha256": "1lfsc8ayiz2v3dfn8c0mmfch8vpzqyddxw8kscan2lzl2lcj50h0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140919.2056",
         "deps": [
@@ -35208,7 +35414,7 @@
         },
         "recipe": {
             "sha256": "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140406.2020",
         "deps": [
@@ -35224,7 +35430,7 @@
         },
         "recipe": {
             "sha256": "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150828.914",
         "deps": []
@@ -35239,7 +35445,7 @@
         },
         "recipe": {
             "sha256": "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150831.341",
         "deps": [
@@ -35258,26 +35464,11 @@
         },
         "recipe": {
             "sha256": "0iq1nlj5czi4nblrszfv3grkl1fni7blh8bhcfccidms8v9r3mdm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150515.1607",
         "deps": []
     },
-    "nemerle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rsdn",
-            "repo": "nemerle",
-            "sha256": "0sybgk7pbqx6l3q1jk5x562m3rn3lg5i21qw8h522hfp7pk6i7p5",
-            "rev": "d57f26b57601a8092f0a9c95470931fbdeb0afa5"
-        },
-        "recipe": {
-            "sha256": "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "20130328.946",
-        "deps": []
-    },
     "tango-plus-theme": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -35288,7 +35479,7 @@
         },
         "recipe": {
             "sha256": "1bx9qcwvybgd0rg8a9rag8xvb5ljrwfnm5nvq793ncvbdvq6vrh5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140425.1711",
         "deps": []
@@ -35303,7 +35494,7 @@
         },
         "recipe": {
             "sha256": "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140618.58",
         "deps": [
@@ -35320,7 +35511,7 @@
         },
         "recipe": {
             "sha256": "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150424.1505",
         "deps": []
@@ -35335,7 +35526,7 @@
         },
         "recipe": {
             "sha256": "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151004.1230",
         "deps": []
@@ -35345,14 +35536,14 @@
             "tag": "fetchFromGitHub",
             "owner": "syohex",
             "repo": "emacs-terraform-mode",
-            "sha256": "00yvgpw16i6kncxrs4vvky131c8gwmvf43vjkhblai2cag6s6bfq",
-            "rev": "06b06b415f05f73d1d8bb1a8ba236e8ffe45793b"
+            "sha256": "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7",
+            "rev": "6157690efce03ff20b16b85e2be6b0964efec2fb"
         },
         "recipe": {
             "sha256": "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151006.945",
+        "version": "20151226.657",
         "deps": [
             "cl-lib",
             "hcl-mode"
@@ -35368,7 +35559,7 @@
         },
         "recipe": {
             "sha256": "0zsir6chjvn5i1irmf5aj6mmb401c553r5wykq796sz7jnjhrjg0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151006.514",
         "deps": []
@@ -35383,7 +35574,7 @@
         },
         "recipe": {
             "sha256": "0kh0n5674ksswjzi9gji2qmx8v8g0axx8xbi0m3zby9nwcpv4qzs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131228.814",
         "deps": [
@@ -35399,7 +35590,7 @@
         },
         "recipe": {
             "sha256": "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140913.1458",
         "deps": []
@@ -35414,7 +35605,7 @@
         },
         "recipe": {
             "sha256": "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141023.831",
         "deps": []
@@ -35429,7 +35620,7 @@
         },
         "recipe": {
             "sha256": "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150918.1417",
         "deps": []
@@ -35444,7 +35635,7 @@
         },
         "recipe": {
             "sha256": "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150722.1024",
         "deps": [
@@ -35464,7 +35655,7 @@
         },
         "recipe": {
             "sha256": "0wnk36z9g7lksmynd04hb2m6rx45wpxnxj1lhrlpjnzsrknhf4k3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150928.457",
         "deps": []
@@ -35477,7 +35668,7 @@
         },
         "recipe": {
             "sha256": "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131210.2131",
         "deps": []
@@ -35492,7 +35683,7 @@
         },
         "recipe": {
             "sha256": "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130409.707",
         "deps": []
@@ -35507,7 +35698,7 @@
         },
         "recipe": {
             "sha256": "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151124.936",
         "deps": [
@@ -35527,7 +35718,7 @@
         },
         "recipe": {
             "sha256": "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121020.151",
         "deps": [
@@ -35544,7 +35735,7 @@
         },
         "recipe": {
             "sha256": "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140227.51",
         "deps": [
@@ -35563,7 +35754,7 @@
         },
         "recipe": {
             "sha256": "1nd23vjij5h5gk5l7hbd5ks9ljisn054wp138jx2v6i51izxvh2v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131104.1634",
         "deps": []
@@ -35578,7 +35769,7 @@
         },
         "recipe": {
             "sha256": "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.345",
         "deps": [
@@ -35595,7 +35786,7 @@
         },
         "recipe": {
             "sha256": "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20090428.1431",
         "deps": []
@@ -35610,7 +35801,7 @@
         },
         "recipe": {
             "sha256": "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140809.524",
         "deps": [
@@ -35622,14 +35813,14 @@
             "tag": "fetchFromGitHub",
             "owner": "magit",
             "repo": "magit-svn",
-            "sha256": "0gzlis72xan2njk0cx0x6dbw1cz883l3lmn2hv117ch7b5v0dfns",
-            "rev": "04ade0b554a7c3e326860989ccc0da03ea6f9bcf"
+            "sha256": "0r3nkrisyjawjwbm74yi6fqiwcqzlfkypsdscfhii0q50ky8plph",
+            "rev": "9b2f8c14e83ee5851a63bd23b5f19422b00c0ff5"
         },
         "recipe": {
             "sha256": "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151118.257",
+        "version": "20151219.747",
         "deps": [
             "emacs",
             "magit"
@@ -35645,7 +35836,7 @@
         },
         "recipe": {
             "sha256": "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130315.755",
         "deps": []
@@ -35658,7 +35849,7 @@
         },
         "recipe": {
             "sha256": "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1620",
         "deps": []
@@ -35673,7 +35864,7 @@
         },
         "recipe": {
             "sha256": "1bch447lllikip1xd90kdgssgc67sl04a70fxqkqlrc1bs6gkkws",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150614.326",
         "deps": [
@@ -35696,7 +35887,7 @@
         },
         "recipe": {
             "sha256": "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150929.11",
         "deps": []
@@ -35709,7 +35900,7 @@
         },
         "recipe": {
             "sha256": "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151104.731",
         "deps": []
@@ -35724,7 +35915,7 @@
         },
         "recipe": {
             "sha256": "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.2048",
         "deps": []
@@ -35739,7 +35930,7 @@
         },
         "recipe": {
             "sha256": "07diik27gr82n11a8k62v1jxq8rhi16f02ybk548f6cn7iqgp2ml",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.1058",
         "deps": [
@@ -35759,7 +35950,7 @@
         },
         "recipe": {
             "sha256": "0pnhhv33rvlmb3823xpy9v5h6q99fa7fn38djbwry4rymi4jmlih",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151106.154",
         "deps": [
@@ -35776,7 +35967,7 @@
         },
         "recipe": {
             "sha256": "1rwiwx3n7gkpfihbf6ndl1lxza4zi2rlj5av6lfp5qypbw9wddkf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131017.1632",
         "deps": [
@@ -35793,7 +35984,7 @@
         },
         "recipe": {
             "sha256": "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150609.849",
         "deps": [
@@ -35813,7 +36004,7 @@
         },
         "recipe": {
             "sha256": "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150223.450",
         "deps": []
@@ -35828,7 +36019,7 @@
         },
         "recipe": {
             "sha256": "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140611.37",
         "deps": []
@@ -35843,7 +36034,7 @@
         },
         "recipe": {
             "sha256": "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131231.925",
         "deps": []
@@ -35856,7 +36047,7 @@
         },
         "recipe": {
             "sha256": "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151127.1240",
         "deps": []
@@ -35871,7 +36062,7 @@
         },
         "recipe": {
             "sha256": "13jcbkasvcczf7qnrh89ncqp6az6hm1s0ycrv7msva145n5bk1kr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150513.2129",
         "deps": []
@@ -35886,7 +36077,7 @@
         },
         "recipe": {
             "sha256": "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150720.1318",
         "deps": [
@@ -35904,7 +36095,7 @@
         },
         "recipe": {
             "sha256": "1nhyj38qyn1x6a5rbrwhcxwfwzyqqjm3dvksdnmam6vfwn3s2r31",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151104.2028",
         "deps": []
@@ -35919,7 +36110,7 @@
         },
         "recipe": {
             "sha256": "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150902.1235",
         "deps": []
@@ -35934,7 +36125,7 @@
         },
         "recipe": {
             "sha256": "1715vnjr5cjiq8gjcd3idnpnijg5cg3sw3f8gr5x2ixcrip1hx3a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150801.1101",
         "deps": [
@@ -35952,7 +36143,7 @@
         },
         "recipe": {
             "sha256": "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110816.1646",
         "deps": []
@@ -35967,7 +36158,7 @@
         },
         "recipe": {
             "sha256": "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150831.831",
         "deps": [
@@ -35982,14 +36173,14 @@
             "tag": "fetchFromGitHub",
             "owner": "Malabarba",
             "repo": "speed-of-thought-clojure",
-            "sha256": "19zh8gijrvggwqaxxd9w2dbxvysjdyz8zvvnvbdys2xz6xwyq2ik",
-            "rev": "8396cdb4c479ef0c12d3786bc8356746e7ffb354"
+            "sha256": "0s6nfszyk0qprdpd55yfcn6xv1fym43yra0j4ys6wf65lai9kr2p",
+            "rev": "f2f7ed52dba57752804810992c35f991c9f7dfc4"
         },
         "recipe": {
             "sha256": "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150914.1856",
+        "version": "20151225.1913",
         "deps": [
             "cider",
             "clojure-mode",
@@ -36005,7 +36196,7 @@
         },
         "recipe": {
             "sha256": "1cb6pm69db0jbksmc4mkawf643i74is9v7ka34pv3mb21nj095qp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150710.2153",
         "deps": []
@@ -36020,7 +36211,7 @@
         },
         "recipe": {
             "sha256": "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120918.817",
         "deps": []
@@ -36035,7 +36226,7 @@
         },
         "recipe": {
             "sha256": "0xjmz18m2dslh6yq5z32r43zq3svfxn8mhrfbmihglyv2mkwxw44",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141006.748",
         "deps": []
@@ -36050,7 +36241,7 @@
         },
         "recipe": {
             "sha256": "150fxj2phj5axnh5i8ws5fv2qzzmpyisch452wgxb604p56j7vy8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131026.1930",
         "deps": []
@@ -36065,7 +36256,7 @@
         },
         "recipe": {
             "sha256": "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140818.957",
         "deps": []
@@ -36080,7 +36271,7 @@
         },
         "recipe": {
             "sha256": "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150714.1059",
         "deps": [
@@ -36097,7 +36288,7 @@
         },
         "recipe": {
             "sha256": "0h7zpskcgkswr110vckfdbxggz5b3g9grk1j1cbd98pmrpgfqrvp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151106.28",
         "deps": []
@@ -36112,7 +36303,7 @@
         },
         "recipe": {
             "sha256": "1iws3f8vkwrflcj6ni8nmf1wcw1jrlnssm76kzzhag77ry3iswgx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151207.1113",
         "deps": []
@@ -36125,7 +36316,7 @@
         },
         "recipe": {
             "sha256": "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20080412.955",
         "deps": []
@@ -36140,7 +36331,7 @@
         },
         "recipe": {
             "sha256": "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140922.2256",
         "deps": [
@@ -36157,7 +36348,7 @@
         },
         "recipe": {
             "sha256": "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151011.859",
         "deps": []
@@ -36172,7 +36363,7 @@
         },
         "recipe": {
             "sha256": "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150716.959",
         "deps": [
@@ -36191,7 +36382,7 @@
         },
         "recipe": {
             "sha256": "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.746",
         "deps": []
@@ -36206,7 +36397,7 @@
         },
         "recipe": {
             "sha256": "17i556xwq6yaxv9v18l1abcpbaz6hygsa4vf4b68fc98vcy7396a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.2141",
         "deps": [
@@ -36224,7 +36415,7 @@
         },
         "recipe": {
             "sha256": "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131117.1607",
         "deps": [
@@ -36243,7 +36434,7 @@
         },
         "recipe": {
             "sha256": "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.1045",
         "deps": [
@@ -36260,7 +36451,7 @@
         },
         "recipe": {
             "sha256": "0jd6dsk93nvwi5yia3623hfc4v6zz4s2n8m1wx9bw8x6kv3h3qbq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151119.1545",
         "deps": []
@@ -36275,7 +36466,7 @@
         },
         "recipe": {
             "sha256": "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150417.739",
         "deps": [
@@ -36290,7 +36481,7 @@
         },
         "recipe": {
             "sha256": "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150602.1427",
         "deps": []
@@ -36305,7 +36496,7 @@
         },
         "recipe": {
             "sha256": "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150830.1427",
         "deps": [
@@ -36322,7 +36513,7 @@
         },
         "recipe": {
             "sha256": "0jy16m6injqznx4gmxzvhys480pclw9g07z4qll2dna37177ww9d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131116.744",
         "deps": [
@@ -36340,7 +36531,7 @@
         },
         "recipe": {
             "sha256": "1r4jcfzrhdpclblfrmi4qbl8dnhc2d7d4c1425xnslg7bhwd2vxn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151020.1301",
         "deps": [
@@ -36359,7 +36550,7 @@
         },
         "recipe": {
             "sha256": "1r6j6rkwfv7fv7kp73gh1bdz3y5ffwk5f2wyv4mpxs885cfbsm8v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130729.2050",
         "deps": []
@@ -36374,7 +36565,7 @@
         },
         "recipe": {
             "sha256": "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.2121",
         "deps": [
@@ -36393,7 +36584,7 @@
         },
         "recipe": {
             "sha256": "06rfqn7sqvmgpvwhfmk17qqs4q0frfzhm597z3p1q7kys2035kiv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.1050",
         "deps": []
@@ -36408,7 +36599,7 @@
         },
         "recipe": {
             "sha256": "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.2135",
         "deps": [
@@ -36425,7 +36616,7 @@
         },
         "recipe": {
             "sha256": "1gd685r86h0kr36msw81gfgwv7d35hihz6h0jkc6vd22wf6qc3ly",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140903.1006",
         "deps": []
@@ -36440,7 +36631,7 @@
         },
         "recipe": {
             "sha256": "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": []
@@ -36455,7 +36646,7 @@
         },
         "recipe": {
             "sha256": "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141030.726",
         "deps": [
@@ -36473,7 +36664,7 @@
         },
         "recipe": {
             "sha256": "0i49z50bpi7fx0dm5jywlndnq9hb0dm5a906k4017w8y7sfpfl6c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.116",
         "deps": [
@@ -36490,7 +36681,7 @@
         },
         "recipe": {
             "sha256": "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150723.638",
         "deps": [
@@ -36508,7 +36699,7 @@
         },
         "recipe": {
             "sha256": "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150108.35",
         "deps": [
@@ -36527,7 +36718,7 @@
         },
         "recipe": {
             "sha256": "114z5bwhkza03yvfa4nmicaih2jdq83lh6micxjimpddsc8fjgi0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150918.644",
         "deps": [
@@ -36545,7 +36736,7 @@
         },
         "recipe": {
             "sha256": "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150423.1558",
         "deps": [
@@ -36562,7 +36753,7 @@
         },
         "recipe": {
             "sha256": "14cshv5xb57ch5g3m3hfhawnnabdnbacp4kx40d0pw6jxw677gqd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151016.2259",
         "deps": [
@@ -36581,7 +36772,7 @@
         },
         "recipe": {
             "sha256": "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151118.416",
         "deps": []
@@ -36596,7 +36787,7 @@
         },
         "recipe": {
             "sha256": "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151012.729",
         "deps": [
@@ -36613,7 +36804,7 @@
         },
         "recipe": {
             "sha256": "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.259",
         "deps": [
@@ -36630,11 +36821,28 @@
         },
         "recipe": {
             "sha256": "179wd9g0smm76k92n7j2vgg8gz5wn9lczrns5ggq2yhbc77j0gn4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -36645,7 +36853,7 @@
         },
         "recipe": {
             "sha256": "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121123.1835",
         "deps": [
@@ -36662,7 +36870,7 @@
         },
         "recipe": {
             "sha256": "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150713.916",
         "deps": [
@@ -36674,14 +36882,14 @@
             "tag": "fetchFromGitHub",
             "owner": "flycheck",
             "repo": "flycheck-rust",
-            "sha256": "080xvb83mcg5snk3avlhppr13srd2lba73298ygy18ziizpv0zig",
-            "rev": "e802d78a509bd8927464d29e1a8ba8ea355f6ea1"
+            "sha256": "08ar85p5llk0lxlm2rd7rfc8s449vrknsrzzxqg8kvakgpd0nx7q",
+            "rev": "e03c895ef1ce514f7cefcd86f10e6bde97ff1c73"
         },
         "recipe": {
             "sha256": "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151215.346",
+        "version": "20151225.913",
         "deps": [
             "dash",
             "emacs",
@@ -36698,7 +36906,7 @@
         },
         "recipe": {
             "sha256": "1dkny9y3x49dv1vjwz78x2qhb6kdq3fa8qh1xkm30jyapvgiwdg2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131117.730",
         "deps": []
@@ -36713,7 +36921,7 @@
         },
         "recipe": {
             "sha256": "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151119.1249",
         "deps": [
@@ -36730,7 +36938,7 @@
         },
         "recipe": {
             "sha256": "19yfbrlfqikix2lnnlbpzm6yakjhl84ix0zra2ycpvgg2pl88r0g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130527.321",
         "deps": []
@@ -36745,7 +36953,7 @@
         },
         "recipe": {
             "sha256": "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131125.2338",
         "deps": [
@@ -36764,7 +36972,7 @@
         },
         "recipe": {
             "sha256": "0bja213l6mvh8ap5d04x8dik1z9px5jr52zpw1py7shw5asvp5s2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.153",
         "deps": [
@@ -36781,7 +36989,7 @@
         },
         "recipe": {
             "sha256": "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130312.1337",
         "deps": [
@@ -36798,7 +37006,7 @@
         },
         "recipe": {
             "sha256": "00npvryds5wd3d5a13r9prlvw6vvjlag8d32x5xf9bfmmvs0fgqh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140223.1158",
         "deps": [
@@ -36816,7 +37024,7 @@
         },
         "recipe": {
             "sha256": "1n0bdr9z2s1ikhmfz642k94gjzb88anwlb61mh27ay8wqdgm74c4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150824.2110",
         "deps": [
@@ -36833,7 +37041,7 @@
         },
         "recipe": {
             "sha256": "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150916.2233",
         "deps": [
@@ -36850,7 +37058,7 @@
         },
         "recipe": {
             "sha256": "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121104.1259",
         "deps": [
@@ -36867,7 +37075,7 @@
         },
         "recipe": {
             "sha256": "0hrinplk607wcc2ibn05pl8ghikv9f3zvymncp6nz95jw9brdapf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.1441",
         "deps": [
@@ -36886,7 +37094,7 @@
         },
         "recipe": {
             "sha256": "0swwbfaypc78cg4ak24cc92kgxmr1x9vcpaw3jz4zgpm2wzbgmrq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141201.1858",
         "deps": [
@@ -36903,7 +37111,7 @@
         },
         "recipe": {
             "sha256": "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140120.1252",
         "deps": [
@@ -36923,7 +37131,7 @@
         },
         "recipe": {
             "sha256": "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151117.2129",
         "deps": []
@@ -36938,7 +37146,7 @@
         },
         "recipe": {
             "sha256": "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151116.1349",
         "deps": [
@@ -36955,7 +37163,7 @@
         },
         "recipe": {
             "sha256": "0ivh7f021lbmbaj6gs4y8m99s63js57w04q7cwx7v4i32cpas7r9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131123.931",
         "deps": [
@@ -36972,7 +37180,7 @@
         },
         "recipe": {
             "sha256": "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150804.1504",
         "deps": [
@@ -36994,7 +37202,7 @@
         },
         "recipe": {
             "sha256": "15vnvch0qsaram22d44k617bqhr9rrf8qc86sf20yvdyy3gi5j12",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.1306",
         "deps": [
@@ -37012,7 +37220,7 @@
         },
         "recipe": {
             "sha256": "1izq6s33p74dy4wzfnjii8wjs723bm5ggl0w6hkvzgbmyjc01hxv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141006.2055",
         "deps": [
@@ -37029,7 +37237,7 @@
         },
         "recipe": {
             "sha256": "016jp1rqrf1baxlxbi3476m88a0l3r405dh6pmly519wm2k8pipw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130617.1515",
         "deps": []
@@ -37043,7 +37251,7 @@
         },
         "recipe": {
             "sha256": "1a9qmz99h99gpd0sxqb71c08wr8pm3bzsg3p4cvf3vcirvav9lq6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120312.1525",
         "deps": []
@@ -37053,14 +37261,14 @@
             "tag": "fetchFromGitHub",
             "owner": "marsmining",
             "repo": "ox-twbs",
-            "sha256": "0pms1xj7kkmk7c6vd9xjc2bggdji3ipbphqrxddarz3pck2ji9vr",
-            "rev": "20b97120eed058a03312157c6646c4569c0168ac"
+            "sha256": "026g48sgqwnqs5zmrabhiv3l8052l4c1vsbsf6bdxv4a6yp0l654",
+            "rev": "cfe67353d148e65a7676f1609d8cc22a4c8fbc78"
         },
         "recipe": {
             "sha256": "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151025.1248",
+        "version": "20151223.1320",
         "deps": []
     },
     "mediawiki": {
@@ -37073,7 +37281,7 @@
         },
         "recipe": {
             "sha256": "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150711.1934",
         "deps": []
@@ -37088,7 +37296,7 @@
         },
         "recipe": {
             "sha256": "0c0a8plqrlsw8lhmyj9c1lfkj2b48cjkbw9pna8qcizvwgym9089",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121006.1525",
         "deps": []
@@ -37103,7 +37311,7 @@
         },
         "recipe": {
             "sha256": "1pxiqqh5x4wsayqgwplzvsbalbj44zvby7x0pijdvwcnsh74znj8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150705.800",
         "deps": [
@@ -37120,7 +37328,7 @@
         },
         "recipe": {
             "sha256": "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151021.549",
         "deps": []
@@ -37135,7 +37343,7 @@
         },
         "recipe": {
             "sha256": "13xgdw8px58sxpl7nyhkcdxwqdpp13i8wghvlb3l4471plw3vqgj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140104.1259",
         "deps": [
@@ -37152,7 +37360,7 @@
         },
         "recipe": {
             "sha256": "0cnbhjw951f8sci63cvzcc65d0ffdx3rb8l1g38qql5rzkam48fn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151008.924",
         "deps": [
@@ -37170,7 +37378,7 @@
         },
         "recipe": {
             "sha256": "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150411.616",
         "deps": [
@@ -37187,7 +37395,7 @@
         },
         "recipe": {
             "sha256": "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151125.1544",
         "deps": [
@@ -37205,7 +37413,7 @@
         },
         "recipe": {
             "sha256": "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150525.414",
         "deps": [
@@ -37225,7 +37433,7 @@
         },
         "recipe": {
             "sha256": "1mvbfq062qj8vmgzk6rymg3idlfc1makfp1scmjvpw98h30j2a0a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140723.1346",
         "deps": []
@@ -37240,7 +37448,7 @@
         },
         "recipe": {
             "sha256": "0pd2574a6dkhrfr0jf5gvv34ganp6ddylyb6cfpg2d4znwbc2r2w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140310.817",
         "deps": []
@@ -37255,7 +37463,7 @@
         },
         "recipe": {
             "sha256": "0qh6pzjn98jlpxcm9zf25ga0y3d3v53275a9zgswyhz33mafd7pd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150220.49",
         "deps": [
@@ -37272,7 +37480,7 @@
         },
         "recipe": {
             "sha256": "0kg91ma9k3p5ps467jjz2lw13rv1l8ivwc3zpg6c1rl474ds0qqv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140715.1927",
         "deps": [
@@ -37291,7 +37499,7 @@
         },
         "recipe": {
             "sha256": "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140809.732",
         "deps": [
@@ -37309,7 +37517,7 @@
         },
         "recipe": {
             "sha256": "0glmnj77vya8ivjin4qja7lis67wyibzy9k6z8b54z7mqf9ikx06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110509.1126",
         "deps": []
@@ -37324,7 +37532,7 @@
         },
         "recipe": {
             "sha256": "1fpiml7lvbl4s2xw4wk2y10iifvfza24kd9j8qvi1bgd85qkx42q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140814.521",
         "deps": []
@@ -37339,7 +37547,7 @@
         },
         "recipe": {
             "sha256": "11jq6055bvpwvrm0b8cgab25wa2mcyylpz4j56h1nqj7cnhb6ppj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150615.916",
         "deps": []
@@ -37352,7 +37560,7 @@
         },
         "recipe": {
             "sha256": "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120108.645",
         "deps": []
@@ -37367,7 +37575,7 @@
         },
         "recipe": {
             "sha256": "0di8gxsa9r8mzja4akhz0wpgrhlidqyn1s1ix5szplwxklwf2r2f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150921.1633",
         "deps": [
@@ -37386,7 +37594,7 @@
         },
         "recipe": {
             "sha256": "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141212.1532",
         "deps": []
@@ -37401,7 +37609,7 @@
         },
         "recipe": {
             "sha256": "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151212.1440",
         "deps": [
@@ -37420,7 +37628,7 @@
         },
         "recipe": {
             "sha256": "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130423.1745",
         "deps": [
@@ -37438,7 +37646,7 @@
         },
         "recipe": {
             "sha256": "0yzvgnpkj2fhl01id36nc5pj8vyb05bllraiz3lwwcc66y98h9n0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140324.648",
         "deps": []
@@ -37453,7 +37661,7 @@
         },
         "recipe": {
             "sha256": "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151101.601",
         "deps": [
@@ -37474,7 +37682,7 @@
         },
         "recipe": {
             "sha256": "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151103.901",
         "deps": []
@@ -37489,7 +37697,7 @@
         },
         "recipe": {
             "sha256": "1x1ncldl9njil9hhvzj5ac1l5aiyfm0f7j0d7lw8ady7xx2cy26m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130214.1342",
         "deps": []
@@ -37504,7 +37712,7 @@
         },
         "recipe": {
             "sha256": "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.1348",
         "deps": [
@@ -37521,7 +37729,7 @@
         },
         "recipe": {
             "sha256": "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151104.1437",
         "deps": []
@@ -37535,9 +37743,9 @@
         },
         "recipe": {
             "sha256": "003lykwd3ya0xwlahmm35nx9p6mk8vylq57yxrmgdcc64630bdpf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20140410.1923",
+        "version": "20130808.2150",
         "deps": [
             "xml-rpc"
         ]
@@ -37552,7 +37760,7 @@
         },
         "recipe": {
             "sha256": "18fsbh78c5408zg5bk44gxdynp6kn8253xdg7ap2pr3mjknq9kld",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120331.320",
         "deps": []
@@ -37567,7 +37775,7 @@
         },
         "recipe": {
             "sha256": "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140717.2229",
         "deps": [
@@ -37585,7 +37793,7 @@
         },
         "recipe": {
             "sha256": "0kr8mj3i4fd2x6ymaikzmj1m4q0s4lfvnafcpi7jch0za0qixjcq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151017.1620",
         "deps": [
@@ -37602,7 +37810,7 @@
         },
         "recipe": {
             "sha256": "0h87yd56nhxpahrcpk6hin142hzv3sdr5bvz0injbv8a2lwnny3b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130717.44",
         "deps": [
@@ -37619,7 +37827,7 @@
         },
         "recipe": {
             "sha256": "031wxz10k1q4bi5hywhcw1vzi41d5pv5hc09x8jk9s5nzyssvc0y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140103.2316",
         "deps": []
@@ -37632,7 +37840,7 @@
         },
         "recipe": {
             "sha256": "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130704.932",
         "deps": []
@@ -37647,7 +37855,7 @@
         },
         "recipe": {
             "sha256": "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140127.1512",
         "deps": [
@@ -37664,7 +37872,7 @@
         },
         "recipe": {
             "sha256": "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151124.1441",
         "deps": []
@@ -37679,7 +37887,7 @@
         },
         "recipe": {
             "sha256": "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151128.430",
         "deps": [
@@ -37697,7 +37905,7 @@
         },
         "recipe": {
             "sha256": "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150223.754",
         "deps": [
@@ -37715,7 +37923,7 @@
         },
         "recipe": {
             "sha256": "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150906.1208",
         "deps": [
@@ -37736,7 +37944,7 @@
         },
         "recipe": {
             "sha256": "06pc50q9ggin20cbfafxd53x35ac3kh85dap0nbws7514f473m7b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140115.415",
         "deps": [
@@ -37756,7 +37964,7 @@
         },
         "recipe": {
             "sha256": "01d7735ininlsjkql7dy57irgwgk4k9br8bl18wq51vgkg90i5k5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150923.213",
         "deps": []
@@ -37771,7 +37979,7 @@
         },
         "recipe": {
             "sha256": "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141108.1411",
         "deps": [
@@ -37788,7 +37996,7 @@
         },
         "recipe": {
             "sha256": "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131119.1645",
         "deps": []
@@ -37803,7 +38011,7 @@
         },
         "recipe": {
             "sha256": "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.1858",
         "deps": [
@@ -37821,7 +38029,7 @@
         },
         "recipe": {
             "sha256": "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.2106",
         "deps": [
@@ -37837,7 +38045,7 @@
         },
         "recipe": {
             "sha256": "0in5ybgwmghlpa5d7wz0477ba6n14f1mwp5dxcl4y11f1lsq041r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20111208.1222",
         "deps": []
@@ -37852,7 +38060,7 @@
         },
         "recipe": {
             "sha256": "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150719.720",
         "deps": [
@@ -37869,7 +38077,7 @@
         },
         "recipe": {
             "sha256": "0f3sw41b4wl0aajq0ap66942rb2015d9iks0ss016jgzashw7zsp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150601.1609",
         "deps": []
@@ -37884,7 +38092,7 @@
         },
         "recipe": {
             "sha256": "1nwcdv5ibirxx3sqadh6mnpj40ni3wna7wnjh343mx38dk2dzncf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141127.1204",
         "deps": []
@@ -37899,7 +38107,7 @@
         },
         "recipe": {
             "sha256": "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140117.337",
         "deps": [
@@ -37920,7 +38128,7 @@
         },
         "recipe": {
             "sha256": "00wj61maib77qldzq06l9v0pbvp9jih75w1xw0ry9mij0r6ca8ii",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140311.431",
         "deps": []
@@ -37935,7 +38143,7 @@
         },
         "recipe": {
             "sha256": "16k5y3h2ip96k071vhx83avg4r4nplnd973b1271vvxbx2bly735",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150518.900",
         "deps": []
@@ -37950,7 +38158,7 @@
         },
         "recipe": {
             "sha256": "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150908.2155",
         "deps": [
@@ -37963,14 +38171,14 @@
             "tag": "fetchFromGitHub",
             "owner": "abingham",
             "repo": "emacs-ycmd",
-            "sha256": "09h7k4dir6rpcaarv8k69szssy8iyj67g44zpbgph9yp9cvfm9yx",
-            "rev": "b801275e0cc9e0a70d78c61e3fb8ed6b3bbb0c93"
+            "sha256": "1lydq43xn51m4dwvv3qzrcsqw7dwbhxz4rinqx4m9y81caqakssx",
+            "rev": "3005b49176ff3315ba4cc7893fff42ce034d6e80"
         },
         "recipe": {
             "sha256": "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151129.625",
+        "version": "20151223.906",
         "deps": [
             "dash",
             "deferred",
@@ -37989,7 +38197,7 @@
         },
         "recipe": {
             "sha256": "17rmsidsbb4p08vr07mfn25m17wnpadcwr4nxvp79glp5a0wyyib",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150505.1211",
         "deps": [
@@ -38006,7 +38214,7 @@
         },
         "recipe": {
             "sha256": "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.1514",
         "deps": [
@@ -38021,7 +38229,7 @@
         },
         "recipe": {
             "sha256": "0d1ilall8c1y4w014wks9yx4fz743hvx5lc8jqxxlrq7pmqyqdxk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1539",
         "deps": []
@@ -38036,7 +38244,7 @@
         },
         "recipe": {
             "sha256": "0wz15p58g4mxvwbpy9k60gixs1g4jw7pay5pbxnlggc39x1py8nf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141030.1534",
         "deps": [
@@ -38053,7 +38261,7 @@
         },
         "recipe": {
             "sha256": "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150330.1248",
         "deps": []
@@ -38063,14 +38271,14 @@
             "tag": "fetchFromGitHub",
             "owner": "iqbalansari",
             "repo": "emacs-emojify",
-            "sha256": "0zd47b4i03ypbydiaap20vpr79gybmsk26q2xh4krci311n8mmgb",
-            "rev": "ad0bbe452c223c95a85262e16c7e0e7d2d18e2de"
+            "sha256": "0nrf6p4h66i17nz850kpdrnk5h5ra4l3icjjrq34sxvmsssp6zhp",
+            "rev": "fec788f09ab1c131b89f296ebd3e73df97e96cfe"
         },
         "recipe": {
             "sha256": "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151214.2155",
+        "version": "20151220.2152",
         "deps": [
             "emacs",
             "ht",
@@ -38087,7 +38295,7 @@
         },
         "recipe": {
             "sha256": "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.2046",
         "deps": [
@@ -38108,7 +38316,7 @@
         },
         "recipe": {
             "sha256": "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150808.1705",
         "deps": [
@@ -38121,14 +38329,14 @@
             "tag": "fetchFromGitHub",
             "owner": "jschaf",
             "repo": "esup",
-            "sha256": "1hvf022ag23rmsk7whz8mnlswk5d89249pmc0p3pnaycykw8imxp",
-            "rev": "733cec953d88657f3fcf0b3d9efe48f95821be86"
+            "sha256": "0xfip7awlrd935ijyw4pz0mjg0wyqifp74w4psxm8cy7hymly450",
+            "rev": "bba1baf15c12e8fdaa36afa20943e311c7fdc12d"
         },
         "recipe": {
             "sha256": "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151203.2111",
+        "version": "20151225.1946",
         "deps": [
             "cl-lib",
             "emacs"
@@ -38144,7 +38352,7 @@
         },
         "recipe": {
             "sha256": "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151027.1719",
         "deps": [
@@ -38161,7 +38369,7 @@
         },
         "recipe": {
             "sha256": "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150726.1112",
         "deps": []
@@ -38174,7 +38382,7 @@
         },
         "recipe": {
             "sha256": "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151101.1224",
         "deps": [
@@ -38192,7 +38400,7 @@
         },
         "recipe": {
             "sha256": "17vmg47xwk6yjlbcsswirl8s2q565k291ajzjglnz7qg2fwx6spi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150904.937",
         "deps": [
@@ -38209,7 +38417,7 @@
         },
         "recipe": {
             "sha256": "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151113.719",
         "deps": []
@@ -38222,7 +38430,7 @@
         },
         "recipe": {
             "sha256": "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150418.1902",
         "deps": []
@@ -38237,7 +38445,7 @@
         },
         "recipe": {
             "sha256": "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150504.344",
         "deps": [
@@ -38254,7 +38462,7 @@
         },
         "recipe": {
             "sha256": "1hrpgh03mp7yynqamgzkw7fa70c5pmyjfmfblkfhspnsif8j4v29",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150408.2202",
         "deps": []
@@ -38269,7 +38477,7 @@
         },
         "recipe": {
             "sha256": "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150213.946",
         "deps": [
@@ -38287,7 +38495,7 @@
         },
         "recipe": {
             "sha256": "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151124.1709",
         "deps": []
@@ -38302,7 +38510,7 @@
         },
         "recipe": {
             "sha256": "19l6si3sx2i542r5lyr9axby9hblx76m77f17vnsjf32n3r0qgma",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151115.1205",
         "deps": []
@@ -38317,7 +38525,7 @@
         },
         "recipe": {
             "sha256": "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150611.45",
         "deps": [
@@ -38337,7 +38545,7 @@
         },
         "recipe": {
             "sha256": "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150823.211",
         "deps": [
@@ -38355,7 +38563,7 @@
         },
         "recipe": {
             "sha256": "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151207.1140",
         "deps": [
@@ -38372,7 +38580,7 @@
         },
         "recipe": {
             "sha256": "01h5bsqllgn6gs0wpl0y2h041007mn3ldjswkz6f3mayrgl4c6yf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140716.2132",
         "deps": []
@@ -38387,7 +38595,7 @@
         },
         "recipe": {
             "sha256": "07b549dqyh1gk226d7zbls1mw6q4mas7kbfwkansmyykax0r2zyr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150919.1459",
         "deps": [
@@ -38404,7 +38612,7 @@
         },
         "recipe": {
             "sha256": "0fwd34cim29dg802ibsfd120px9sj54d4wzp3ggmjjzwkl9ky7dx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151103.421",
         "deps": [
@@ -38421,7 +38629,7 @@
         },
         "recipe": {
             "sha256": "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140611.1100",
         "deps": [
@@ -38439,7 +38647,7 @@
         },
         "recipe": {
             "sha256": "0y040ghb0y6aq0nchqr09vapz6h6112rkwxkqsx0v7xmqrqfjvhh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151113.1353",
         "deps": [
@@ -38456,7 +38664,7 @@
         },
         "recipe": {
             "sha256": "0sk80a08ny9vqw94klqfgii297qm633000wlcldha76ip8viikdv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130419.458",
         "deps": []
@@ -38471,7 +38679,7 @@
         },
         "recipe": {
             "sha256": "1a24rv1jbb883vwhjkw6qxv3h3qy039iqkhkx3jkq1ydidr9f0hv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141108.1357",
         "deps": []
@@ -38486,7 +38694,7 @@
         },
         "recipe": {
             "sha256": "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150728.1431",
         "deps": [
@@ -38505,7 +38713,7 @@
         },
         "recipe": {
             "sha256": "186lph964swg7rs5gvby3p1d0znq9x3xzsmirfb3cdbazvz6hhxi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141215.2347",
         "deps": [
@@ -38522,7 +38730,7 @@
         },
         "recipe": {
             "sha256": "0v999jvinljkvhbn205p36a6jfzppn0xvflvzr8mid1hnqlrpjhf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.1010",
         "deps": [
@@ -38540,7 +38748,7 @@
         },
         "recipe": {
             "sha256": "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141109.1006",
         "deps": [
@@ -38556,7 +38764,7 @@
         },
         "recipe": {
             "sha256": "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1604",
         "deps": []
@@ -38571,7 +38779,7 @@
         },
         "recipe": {
             "sha256": "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151117.1120",
         "deps": [
@@ -38588,8 +38796,8 @@
             "rev": "2b99fc4d372b017483b7596c4577bf5f15479772"
         },
         "recipe": {
-            "sha256": "1v9fsyaby77fr30nnhr7dmlrmrlyz2grkhzg62illln66b9m5nlr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150903.2140",
         "deps": [
@@ -38606,7 +38814,7 @@
         },
         "recipe": {
             "sha256": "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1634",
         "deps": [
@@ -38623,7 +38831,7 @@
         },
         "recipe": {
             "sha256": "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.607",
         "deps": [
@@ -38642,28 +38850,13 @@
         },
         "recipe": {
             "sha256": "1kzvi6zymfgirr41l8r2kazfz1y4xkigbp5qa1fafcdmw81anmdh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.101",
         "deps": [
             "emacs"
         ]
     },
-    "mozc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "google",
-            "repo": "mozc",
-            "sha256": "0ijx66xx0nv4xwf91403qc1s8mksnpkl5d5pv8gwck0dr2abz2nd",
-            "rev": "b499f9e8adac54f03d310ea17c3751c321084f91"
-        },
-        "recipe": {
-            "sha256": "0nslh4xyqpvzdxcgrd1bzaqcdz77bghizh6n2w6wk46cflir8xba",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "20150815.503",
-        "deps": []
-    },
     "drill-instructor-AZIK-force": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -38674,7 +38867,7 @@
         },
         "recipe": {
             "sha256": "1bb698r11m58csd2rm17fmiw691p25npphzqgjiiqbn4vx35ja7f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151122.2314",
         "deps": [
@@ -38691,7 +38884,7 @@
         },
         "recipe": {
             "sha256": "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151125.1333",
         "deps": []
@@ -38706,7 +38899,7 @@
         },
         "recipe": {
             "sha256": "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151005.651",
         "deps": []
@@ -38721,7 +38914,7 @@
         },
         "recipe": {
             "sha256": "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151108.624",
         "deps": [
@@ -38729,6 +38922,23 @@
             "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",
@@ -38737,7 +38947,7 @@
         },
         "recipe": {
             "sha256": "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1843",
         "deps": []
@@ -38752,7 +38962,7 @@
         },
         "recipe": {
             "sha256": "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140221.1753",
         "deps": [
@@ -38769,7 +38979,7 @@
         },
         "recipe": {
             "sha256": "1wjd6kfnknhw9lc2p9iipaxfm9phpkqqmjw43bhc70ybsq1xaln7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120728.913",
         "deps": []
@@ -38784,7 +38994,7 @@
         },
         "recipe": {
             "sha256": "0y2pm18nnyzm9wjc0j15v46nf3xi7a0wvspfzi360qv08i54skqv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151021.931",
         "deps": [
@@ -38801,7 +39011,7 @@
         },
         "recipe": {
             "sha256": "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140510.1206",
         "deps": [
@@ -38819,7 +39029,7 @@
         },
         "recipe": {
             "sha256": "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.943",
         "deps": [
@@ -38837,7 +39047,7 @@
         },
         "recipe": {
             "sha256": "07988f2xyp76xjs25b3rdblhmijs2piriz4p0q92jw69bdvkl14c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151115.307",
         "deps": [
@@ -38858,7 +39068,7 @@
         },
         "recipe": {
             "sha256": "0a8abz54mb60mfr0bl9ry8yawq99vx9hjl4fm2sivns58qjgfy73",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150319.1407",
         "deps": [
@@ -38876,7 +39086,7 @@
         },
         "recipe": {
             "sha256": "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131230.1551",
         "deps": [
@@ -38893,7 +39103,7 @@
         },
         "recipe": {
             "sha256": "0771l3x6109ki914nwpfz3fj7pbvpcg9vf485mrccq2wlxymr5dr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141017.1823",
         "deps": []
@@ -38908,7 +39118,7 @@
         },
         "recipe": {
             "sha256": "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141101.1234",
         "deps": [
@@ -38927,7 +39137,7 @@
         },
         "recipe": {
             "sha256": "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.853",
         "deps": [
@@ -38947,7 +39157,7 @@
         },
         "recipe": {
             "sha256": "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151018.2352",
         "deps": [
@@ -38968,7 +39178,7 @@
         },
         "recipe": {
             "sha256": "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.1514",
         "deps": []
@@ -38983,7 +39193,7 @@
         },
         "recipe": {
             "sha256": "0hasxq39phgyc259dgxskhqxjsp0yi98vx1bs8ynvwa26la4ddzh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141027.1257",
         "deps": []
@@ -38998,7 +39208,7 @@
         },
         "recipe": {
             "sha256": "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150801.1525",
         "deps": []
@@ -39011,7 +39221,7 @@
         },
         "recipe": {
             "sha256": "171gzfciz78l6b653acgfailxpwmh8m1dm0dzpg0b1k0ny3aiwf6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110405.1020",
         "deps": []
@@ -39026,7 +39236,7 @@
         },
         "recipe": {
             "sha256": "0jgvs9is59q45wh2a7k5sb6vj179ixqgj5dlndj9r6fh59qgrzdk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150419.45",
         "deps": [
@@ -39039,12 +39249,12 @@
             "tag": "fetchFromGitHub",
             "owner": "editorconfig",
             "repo": "editorconfig-emacs",
-            "sha256": "0af6r0qn6gy3ww5cf3cvvbwyqpvx5xv08gxkjsj92z9h2x5rfz7f",
-            "rev": "301d67b26098d048ff7235c0878252e80becc7e0"
+            "sha256": "04sflhamh5b9gxllfhcqdim02x6cb9xid39al2lisb8z4xywch68",
+            "rev": "5132b7a9441af76196ba3e62d73a0bb415853e4f"
         },
         "recipe": {
             "sha256": "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.1035",
         "deps": [
@@ -39061,7 +39271,7 @@
         },
         "recipe": {
             "sha256": "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150316.501",
         "deps": [
@@ -39079,7 +39289,7 @@
         },
         "recipe": {
             "sha256": "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150124.1809",
         "deps": [
@@ -39097,7 +39307,7 @@
         },
         "recipe": {
             "sha256": "1ny5wixa9x4fq5jvhs01jmyvwkfvwwi9aamrcqsl42s9sx6ygz7a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151007.401",
         "deps": [
@@ -39114,7 +39324,7 @@
         },
         "recipe": {
             "sha256": "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150219.731",
         "deps": [
@@ -39131,7 +39341,7 @@
         },
         "recipe": {
             "sha256": "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.1035",
         "deps": []
@@ -39144,7 +39354,7 @@
         },
         "recipe": {
             "sha256": "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.707",
         "deps": []
@@ -39159,7 +39369,7 @@
         },
         "recipe": {
             "sha256": "1yah8kpqkk9ygm73iy51fzwc8q5nw0xlwqir2qld1fc5y1lkb7dk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141009.524",
         "deps": []
@@ -39174,7 +39384,7 @@
         },
         "recipe": {
             "sha256": "1whzbs2gg2ar24kw29ffv94dgvrlfy2v4zdn0g7ksjjmmdr8ahh4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150816.2229",
         "deps": []
@@ -39189,7 +39399,7 @@
         },
         "recipe": {
             "sha256": "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141201.323",
         "deps": [
@@ -39206,7 +39416,7 @@
         },
         "recipe": {
             "sha256": "0nlbyzym8l8g9w2xvykpcl5r449v30gal2k1dnz74rq4y8w4rh7n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151005.2030",
         "deps": [
@@ -39224,7 +39434,7 @@
         },
         "recipe": {
             "sha256": "1r85yxr864df5akqknl3hsrmzikr4085bqr6ijrbdj27nz00vl61",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141127.228",
         "deps": []
@@ -39239,7 +39449,7 @@
         },
         "recipe": {
             "sha256": "10zkyaxy52ixh26hzm9v1y0gakcn5sdwz4ny8v1vcmjqjphnk799",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151201.2238",
         "deps": [
@@ -39260,7 +39470,7 @@
         },
         "recipe": {
             "sha256": "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150924.606",
         "deps": []
@@ -39275,7 +39485,7 @@
         },
         "recipe": {
             "sha256": "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151207.1116",
         "deps": [
@@ -39295,7 +39505,7 @@
         },
         "recipe": {
             "sha256": "16xn9d33nylbb4pr65i8x4rbf5ncd4vxhmcbd136k5b6hj62mg7i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150405.216",
         "deps": []
@@ -39305,14 +39515,14 @@
             "tag": "fetchFromGitHub",
             "owner": "skeeto",
             "repo": "javadoc-lookup",
-            "sha256": "10x10d0y8lr2a4kxq6pmvl5a1nzkfayg9qlzwh5v5is17wxr7399",
-            "rev": "e580d85b2ae37900672b6b2fd3381919b47a5a2f"
+            "sha256": "0ljpqgp2w3lr61n2vr748n3wyshlqnnbin0643jffa319l99z35r",
+            "rev": "0d5316407c9ec183040ca5c6ab71091b9444276f"
         },
         "recipe": {
             "sha256": "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150425.1203",
+        "version": "20151222.1310",
         "deps": [
             "cl-lib"
         ]
@@ -39327,7 +39537,7 @@
         },
         "recipe": {
             "sha256": "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140311.1708",
         "deps": []
@@ -39337,14 +39547,14 @@
             "tag": "fetchFromGitHub",
             "owner": "10sr",
             "repo": "git-ps1-mode-el",
-            "sha256": "1hbpcsyivvdjf16znbhzykn9hci73jl77n4wrxy4v8vhkdajgkd1",
-            "rev": "18f143cfcc7163606daefdaae8ab6b8d81536aa0"
+            "sha256": "13k11acls6r65gms1hkmnhnbw7hkc1f7ijdb0lwipqdn4h361pjg",
+            "rev": "c4910224204c94aabd59ab2cf05f309302bcbedd"
         },
         "recipe": {
             "sha256": "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150421.2301",
+        "version": "20151220.1031",
         "deps": []
     },
     "evil-textobj-anyblock": {
@@ -39357,7 +39567,7 @@
         },
         "recipe": {
             "sha256": "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151017.1617",
         "deps": [
@@ -39375,7 +39585,7 @@
         },
         "recipe": {
             "sha256": "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20101130.648",
         "deps": []
@@ -39390,7 +39600,7 @@
         },
         "recipe": {
             "sha256": "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.1153",
         "deps": []
@@ -39405,7 +39615,7 @@
         },
         "recipe": {
             "sha256": "02hbwchwx2bcwdxz7gz555699l7n9wisfikax1j6idn167n4wdpi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150921.1744",
         "deps": [
@@ -39422,7 +39632,7 @@
         },
         "recipe": {
             "sha256": "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150817.507",
         "deps": [
@@ -39439,7 +39649,7 @@
         },
         "recipe": {
             "sha256": "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.2135",
         "deps": [
@@ -39451,14 +39661,14 @@
             "tag": "fetchFromGitHub",
             "owner": "wasamasa",
             "repo": "shackle",
-            "sha256": "1v8pm8rfqkfbx8ifj2ra78h64zxcl15rpwgaw99xl88j388xyfsl",
-            "rev": "7542039876325d9b2051b77a0cbe15986154ac1a"
+            "sha256": "0yy162sz7vwj0i9w687a5x1c2fq31vc3i6gqhbywspviczdp4q1y",
+            "rev": "4069e0cbff0d172de2cd7d588de971d8b02915c6"
         },
         "recipe": {
             "sha256": "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151213.816",
+        "version": "20151220.1432",
         "deps": [
             "cl-lib"
         ]
@@ -39473,7 +39683,7 @@
         },
         "recipe": {
             "sha256": "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.1935",
         "deps": [
@@ -39490,7 +39700,7 @@
         },
         "recipe": {
             "sha256": "1j64w6dnxmq0rfycci9wfy2z5lbddsggf486pknxfgwwqgvns90l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151009.121",
         "deps": [
@@ -39507,7 +39717,7 @@
         },
         "recipe": {
             "sha256": "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141231.1537",
         "deps": []
@@ -39522,7 +39732,7 @@
         },
         "recipe": {
             "sha256": "08jzx329mrr3c2pifs3hb4i79dsw606b0iviagaaja8s808m40cd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150113.242",
         "deps": [
@@ -39539,7 +39749,7 @@
         },
         "recipe": {
             "sha256": "0dazkpnzzr0imb2a01qq8l60jxhhlknzjx7wccnbm7d2rk3338m6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140225.344",
         "deps": [
@@ -39556,7 +39766,7 @@
         },
         "recipe": {
             "sha256": "0mfmxmsqr2byj56psx4h08cjc2j3aac3xqr04yd47k2mlivnyrxp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150202.1",
         "deps": [
@@ -39574,7 +39784,7 @@
         },
         "recipe": {
             "sha256": "07zr38gzqb3ds9mpf94c1vhl1rqd0cjh4g4j2bz86q16c0rnmp7m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131007.2153",
         "deps": []
@@ -39589,7 +39799,7 @@
         },
         "recipe": {
             "sha256": "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151031.2121",
         "deps": [
@@ -39606,7 +39816,7 @@
         },
         "recipe": {
             "sha256": "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150620.1944",
         "deps": []
@@ -39621,7 +39831,7 @@
         },
         "recipe": {
             "sha256": "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130309.345",
         "deps": [
@@ -39633,12 +39843,12 @@
             "tag": "fetchFromGitHub",
             "owner": "abingham",
             "repo": "emacs-ycmd",
-            "sha256": "09h7k4dir6rpcaarv8k69szssy8iyj67g44zpbgph9yp9cvfm9yx",
-            "rev": "b801275e0cc9e0a70d78c61e3fb8ed6b3bbb0c93"
+            "sha256": "1lydq43xn51m4dwvv3qzrcsqw7dwbhxz4rinqx4m9y81caqakssx",
+            "rev": "3005b49176ff3315ba4cc7893fff42ce034d6e80"
         },
         "recipe": {
             "sha256": "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150727.231",
         "deps": [
@@ -39658,7 +39868,7 @@
         },
         "recipe": {
             "sha256": "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150524.1205",
         "deps": [
@@ -39675,7 +39885,7 @@
         },
         "recipe": {
             "sha256": "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151003.2033",
         "deps": []
@@ -39690,7 +39900,7 @@
         },
         "recipe": {
             "sha256": "0byzrz74yvk12m8dl47kkmkziwrrql193q72qx974zbqdj8h2sph",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130508.1344",
         "deps": []
@@ -39705,7 +39915,7 @@
         },
         "recipe": {
             "sha256": "1aml1f2lgn530i86218nrc1pk3zw5n3qd2gw4gylwi7g75i0cqn1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150923.341",
         "deps": []
@@ -39715,14 +39925,14 @@
             "tag": "fetchFromGitHub",
             "owner": "stan-dev",
             "repo": "stan-mode",
-            "sha256": "09xgwrgb4a348fchcn24k51lh8cq1sj6lzfx8v76gkkhp7sn3l1r",
-            "rev": "58826c65f3351eb69bf999f3364afe50dc31645e"
+            "sha256": "1k0jidh177s9lk4k9vphivq8dapd2qzajim2s835pn72j6k675vg",
+            "rev": "e981ca7fee98431162b21ec6b79c82100ce4b276"
         },
         "recipe": {
             "sha256": "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150728.2254",
+        "version": "20151222.2258",
         "deps": [
             "stan-mode",
             "yasnippet"
@@ -39738,7 +39948,7 @@
         },
         "recipe": {
             "sha256": "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151004.915",
         "deps": [
@@ -39757,7 +39967,7 @@
         },
         "recipe": {
             "sha256": "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140707.626",
         "deps": []
@@ -39772,7 +39982,7 @@
         },
         "recipe": {
             "sha256": "0jzsvkcvy2mkfmri4bzgrlgw2y0z3hxz44md83s5zmw09mshkahf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130217.443",
         "deps": []
@@ -39787,7 +39997,7 @@
         },
         "recipe": {
             "sha256": "19yjx0qqpmrdwagp3d6lwwv7dcb745m9ccq3m29sin74f5p4svsi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.916",
         "deps": [
@@ -39804,7 +40014,7 @@
         },
         "recipe": {
             "sha256": "1wna7ld670r6ljdg5yx0ga0grbq1ma8q92gkari0d5czr7s9lggv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120715.409",
         "deps": []
@@ -39819,7 +40029,7 @@
         },
         "recipe": {
             "sha256": "0w4q74w769n88zb2q7x326cxji42278lf95wnpslgjybnaxycgw7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120505.908",
         "deps": []
@@ -39834,7 +40044,7 @@
         },
         "recipe": {
             "sha256": "16z15yh78837k548xk5widdmy6fv03vym6q54i40knmgf5cllsl8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150121.2324",
         "deps": [
@@ -39852,7 +40062,7 @@
         },
         "recipe": {
             "sha256": "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151209.714",
         "deps": [
@@ -39871,7 +40081,7 @@
         },
         "recipe": {
             "sha256": "0wkmsg3pdw98gyp3q508wsqkzw821qsqi796ynm53zd7a4jfap4p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130809.447",
         "deps": []
@@ -39886,7 +40096,7 @@
         },
         "recipe": {
             "sha256": "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151028.28",
         "deps": []
@@ -39901,7 +40111,7 @@
         },
         "recipe": {
             "sha256": "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150530.351",
         "deps": [
@@ -39921,7 +40131,7 @@
         },
         "recipe": {
             "sha256": "0qk73s09sasm438w29j5z2bmlb60p1mgbv2ch43rgq8c6kjzg6h6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150116.706",
         "deps": [
@@ -39939,7 +40149,7 @@
         },
         "recipe": {
             "sha256": "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151031.1955",
         "deps": [
@@ -39956,7 +40166,7 @@
         },
         "recipe": {
             "sha256": "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151212.1609",
         "deps": [
@@ -39973,7 +40183,7 @@
         },
         "recipe": {
             "sha256": "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150101.604",
         "deps": [
@@ -39990,7 +40200,7 @@
         },
         "recipe": {
             "sha256": "19wjwah2n8ri6gyrsbzxnrvxwr5cj48sxrar1226n9miqvgj5whx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130328.715",
         "deps": []
@@ -40005,7 +40215,7 @@
         },
         "recipe": {
             "sha256": "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141012.511",
         "deps": [
@@ -40022,7 +40232,7 @@
         },
         "recipe": {
             "sha256": "0wgr90m2pazc514slgdl1lin4mr3xxizasc82k7qinvdvdja515x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151018.407",
         "deps": [
@@ -40040,7 +40250,7 @@
         },
         "recipe": {
             "sha256": "17g4nih9kz2483ylp651lwfxkvmaj7wpinpgnifwbciyrplfvx2j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140311.541",
         "deps": [
@@ -40059,7 +40269,7 @@
         },
         "recipe": {
             "sha256": "1rm91xccvdsqghdnrnjvyp8xfvrw5ac677vzzz24rz9dssh2mz9b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.936",
         "deps": [
@@ -40081,7 +40291,7 @@
         },
         "recipe": {
             "sha256": "0z7zvain9n0rm6bvrh3j7z275l32fmp46p4b33mizqd1y86w89nx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.754",
         "deps": [
@@ -40093,14 +40303,14 @@
             "tag": "fetchFromGitHub",
             "owner": "for-GET",
             "repo": "know-your-http-well",
-            "sha256": "0hkjdmaab50dk07g1825w4x9dpavyqvkm7kp4fvgi3lk2j2a67q7",
-            "rev": "139fe4e1c2d2a43f500366b8ed61d613330ec438"
+            "sha256": "08q43k4450kgygyvqv18gwcmmb7y9x445401048lbixc4cp6p3cg",
+            "rev": "e208d856ce1b036d2dc1454813c6fc81f0269def"
         },
         "recipe": {
             "sha256": "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151119.1331",
+        "version": "20151220.813",
         "deps": []
     },
     "homebrew-mode": {
@@ -40113,7 +40323,7 @@
         },
         "recipe": {
             "sha256": "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.851",
         "deps": [
@@ -40132,7 +40342,7 @@
         },
         "recipe": {
             "sha256": "07arn3k89cqxab5x5lczv8bpgrbirmlw9p6c37fgrl3df6f46h4h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150508.704",
         "deps": []
@@ -40146,9 +40356,9 @@
         },
         "recipe": {
             "sha256": "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151009.1045",
+        "version": "20150911.658",
         "deps": []
     },
     "indent-guide": {
@@ -40161,7 +40371,7 @@
         },
         "recipe": {
             "sha256": "029fj9rr9vfmkysi6lzpwra92j6ppw675qpj3sinfq7fqqlicvp7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151119.917",
         "deps": []
@@ -40170,14 +40380,14 @@
         "fetch": {
             "tag": "fetchgit",
             "url": "git://jblevins.org/git/deft.git",
-            "sha256": "3073db99375de84c335c93d44d520c1a2ed471fb1a7c7f1febef014a6e2d16c1",
-            "rev": "a3e25d94424e2acd516d818e83d74c56e884b0a4"
+            "sha256": "15c3ec6fcfae63201652394205fee951f3c1db8d3c6fc5f48c306b9b775c8e63",
+            "rev": "2dd64ddc798a009e62289d65abfa621735461b7a"
         },
         "recipe": {
             "sha256": "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151008.1022",
+        "version": "20151222.725",
         "deps": []
     },
     "autodisass-java-bytecode": {
@@ -40190,7 +40400,7 @@
         },
         "recipe": {
             "sha256": "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151005.1112",
         "deps": []
@@ -40205,7 +40415,7 @@
         },
         "recipe": {
             "sha256": "192gvmhcz1anl80hpmcjwwd08dljyrap9sk6qj0y85mcnaafm882",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150619.1620",
         "deps": [
@@ -40223,7 +40433,7 @@
         },
         "recipe": {
             "sha256": "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151110.1310",
         "deps": [
@@ -40238,14 +40448,14 @@
             "tag": "fetchFromGitHub",
             "owner": "masutaka",
             "repo": "emacs-helm-bundle-show",
-            "sha256": "1w0x4bn9x16pd7s1j4max6268qd4r16709sya646sbqdkk41rcxj",
-            "rev": "6dffd602a4cc5d85eade7de3be99a22b246fc437"
+            "sha256": "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30",
+            "rev": "b34523aa8a7f82ed9a1bf3643c35b65866a7877a"
         },
         "recipe": {
             "sha256": "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151207.241",
+        "version": "20151221.630",
         "deps": [
             "helm"
         ]
@@ -40255,12 +40465,12 @@
             "tag": "fetchFromGitHub",
             "owner": "Sarcasm",
             "repo": "irony-mode",
-            "sha256": "00zb52qhyfzpn180x6m2ds8gfcxgcn4jiqb2kvdcrsmrv2w40fgc",
-            "rev": "eb4bf86f5984b399ccc000ad635d1de8915b179d"
+            "sha256": "0lsi3vzpfh62bh9lknswwsxczvns0j78psk1w5yqdjrnnd1fb6sw",
+            "rev": "64d16007f3e5066ed3b49adcb291044c01cb42d6"
         },
         "recipe": {
             "sha256": "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151217.1258",
         "deps": [
@@ -40278,7 +40488,7 @@
         },
         "recipe": {
             "sha256": "0af263zq4xxaxhpypn769q8h1dla0ygpnd6l8xc13zlni6jjwdsg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120120.516",
         "deps": []
@@ -40293,26 +40503,11 @@
         },
         "recipe": {
             "sha256": "07idndxw8vgfrk5zfmjjhmixza35mqxwjhsrbjrq5yy72i5ivznp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131112.1052",
         "deps": []
     },
-    "elisp-sandbox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joelmccracken",
-            "repo": "elisp-sandbox",
-            "sha256": "1pwx0cksgf9qyd6nl1540jmp3p0adgz2sk38r5s8gbli3x109hy3",
-            "rev": "ddd669266ca36d7e4ebba73eb1ab42523787e042"
-        },
-        "recipe": {
-            "sha256": "1bazm1cf9ghh9b7jzqqgyfcalnrfg7vmxqbn4fiy2c76gbzlr2bp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "20131116.1242",
-        "deps": []
-    },
     "swiper-helm": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -40323,7 +40518,7 @@
         },
         "recipe": {
             "sha256": "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151116.530",
         "deps": [
@@ -40337,14 +40532,14 @@
             "tag": "fetchFromGitHub",
             "owner": "xwl",
             "repo": "cal-china-x",
-            "sha256": "039913cn4xafh533cc6zi2l5260cxvv5iv40l8ydk8zw36vm1gws",
-            "rev": "b6186a729899ae141c546dd3efde461160d8b172"
+            "sha256": "0l9izmif064jcz8hrmxjvi09i4kayxnw5az2x6w2w9d11j0zbgma",
+            "rev": "b8b3f94571ce6f7f53fda45516aa70632c9647ac"
         },
         "recipe": {
             "sha256": "06mh2p14m2axci8vy1hr7jpy53jj215z0djyn8h7zpr0k62ajhka",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151122.1547",
+        "version": "20151226.804",
         "deps": [
             "cl-lib"
         ]
@@ -40359,7 +40554,7 @@
         },
         "recipe": {
             "sha256": "1pax3kpmvg170mpvfrjbpj9czq0xykmfbany2f7vbn96jb5xfmsb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150623.2250",
         "deps": []
@@ -40374,7 +40569,7 @@
         },
         "recipe": {
             "sha256": "0x7smxs91ffriyxx2df61fh1abpl39gqy4m62k77h7xb6fg7af6m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150713.2131",
         "deps": [
@@ -40392,7 +40587,7 @@
         },
         "recipe": {
             "sha256": "04cf18z26d64l0sv8qkbxjixi2wbw23awd5fznvg1cs8ixss01j9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140117.413",
         "deps": []
@@ -40407,7 +40602,7 @@
         },
         "recipe": {
             "sha256": "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140524.358",
         "deps": [
@@ -40424,7 +40619,7 @@
         },
         "recipe": {
             "sha256": "075sbypas8xlhsw8wg3mgi3fn5yf7xb3klyjgyy8wfkgdz0269f8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150716.1246",
         "deps": []
@@ -40438,7 +40633,7 @@
         },
         "recipe": {
             "sha256": "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150623.1234",
         "deps": []
@@ -40453,7 +40648,7 @@
         },
         "recipe": {
             "sha256": "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140508.1541",
         "deps": []
@@ -40466,7 +40661,7 @@
         },
         "recipe": {
             "sha256": "1l14p6wkzfhlqxnd9fpw123vg9q5k20ld7rciyzbfdb99pk9z02i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140417.2134",
         "deps": []
@@ -40481,7 +40676,7 @@
         },
         "recipe": {
             "sha256": "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151021.257",
         "deps": [
@@ -40498,7 +40693,7 @@
         },
         "recipe": {
             "sha256": "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150508.2130",
         "deps": []
@@ -40513,7 +40708,7 @@
         },
         "recipe": {
             "sha256": "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141109.452",
         "deps": [
@@ -40533,7 +40728,7 @@
         },
         "recipe": {
             "sha256": "16w453v4g7ww93bydim62p785x7w4vssp9l5liy0h3ppfmgvmxhp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140710.426",
         "deps": []
@@ -40548,7 +40743,7 @@
         },
         "recipe": {
             "sha256": "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150107.1600",
         "deps": []
@@ -40563,7 +40758,7 @@
         },
         "recipe": {
             "sha256": "1nym2wlr50wk62cbagq1qyjczzf56nb6i9dfzcwikdck8p4p2dr7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140113.1624",
         "deps": []
@@ -40573,14 +40768,14 @@
             "tag": "fetchFromGitHub",
             "owner": "jorgenschaefer",
             "repo": "emacs-buttercup",
-            "sha256": "03zmxfql9hb31n2qf3vs4kv69kffrazlmzji8hkcf86i2wa4hqrf",
-            "rev": "14718c0087b7b2b5e0ff8a1a377a9e4d9f310c60"
+            "sha256": "02r6n7563yc8gads38pq2yqsfv6p8wi6gi1f36mmz4h2gc872m1b",
+            "rev": "238bfa84538e95bfeb3430feb5bd9be4f4f4b906"
         },
         "recipe": {
             "sha256": "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150927.506",
+        "version": "20151223.806",
         "deps": []
     },
     "jdee": {
@@ -40588,12 +40783,12 @@
             "tag": "fetchFromGitHub",
             "owner": "jdee-emacs",
             "repo": "jdee",
-            "sha256": "1p8dzsxlm3rd425ahkjdpv1gbxiw8bg22lakgq8lfdv4mxi389ap",
-            "rev": "f3d1204c448d5406c3c51c01518afcf914d8f1fa"
+            "sha256": "1vfh2wmn3lbq6lly0g7r1npmghn5idfvy9rx8im2gk04cdmiqkxx",
+            "rev": "7a4fa853e7d6af835bad236bc7eb0b28408e01f2"
         },
         "recipe": {
             "sha256": "1yn8vszj0hs2jwwd4x55f11hs2wrxjjvxpngsj7lkcwax04kkvq3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151218.1443",
         "deps": [
@@ -40609,7 +40804,7 @@
         },
         "recipe": {
             "sha256": "04b6q328hj0w33z4c50nqyark0pn5sqi0s8096m9di4rjwxaw0ma",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140212.502",
         "deps": []
@@ -40624,7 +40819,7 @@
         },
         "recipe": {
             "sha256": "07nqscmfa6iykll1m6gyiqca1g5ncx3rx468iyf2ahygpvqvnbxa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140115.956",
         "deps": [
@@ -40639,7 +40834,7 @@
         },
         "recipe": {
             "sha256": "06q7q3j9qvqbp25cx9as2ckmgcz2myfvi2n34jp60v3ayhna79r4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.700",
         "deps": []
@@ -40654,7 +40849,7 @@
         },
         "recipe": {
             "sha256": "0s7g1fbnc5hgz8gqmp1lynj5g7vvxisj7scxx5wil9qpn2zyggq1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150820.339",
         "deps": [
@@ -40671,7 +40866,7 @@
         },
         "recipe": {
             "sha256": "1cgzygkysjyrsdr6jwqkxlnisxccsvh4kxgn19rk4n61ms7bafvf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.514",
         "deps": []
@@ -40684,7 +40879,7 @@
         },
         "recipe": {
             "sha256": "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150823.1911",
         "deps": []
@@ -40699,7 +40894,7 @@
         },
         "recipe": {
             "sha256": "1jblrbw4rq2jwpb8d1dyna0fiv52b9va3sj881cb17rqx200y3nd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.1539",
         "deps": []
@@ -40712,7 +40907,7 @@
         },
         "recipe": {
             "sha256": "181kns2rg4rc0pyyxw305qc06d10v025ad7v2m037y72vfwb0igx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150801.1120",
         "deps": []
@@ -40727,7 +40922,7 @@
         },
         "recipe": {
             "sha256": "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.102",
         "deps": [
@@ -40744,7 +40939,7 @@
         },
         "recipe": {
             "sha256": "0wdhmp226wmrjvjgpbz8ihvhxxv3rrxh97sdqm3mgsav3n071n6k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151204.2249",
         "deps": [
@@ -40763,7 +40958,7 @@
         },
         "recipe": {
             "sha256": "0cl2qbry56nb4prbsczffx8h35x91pgicw5pld0ndw3pxid9h2da",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.30",
         "deps": [
@@ -40780,7 +40975,7 @@
         },
         "recipe": {
             "sha256": "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150508.1033",
         "deps": [
@@ -40798,7 +40993,7 @@
         },
         "recipe": {
             "sha256": "0bg2p7pk4jlpqc7lg48mxd6zkwnx15r0r7lmsxgx9dv1ilfwrmgn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.846",
         "deps": [
@@ -40816,7 +41011,7 @@
         },
         "recipe": {
             "sha256": "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.1342",
         "deps": [
@@ -40833,7 +41028,7 @@
         },
         "recipe": {
             "sha256": "0q88xmi7jbrx47nvbbmwggbm6i7agzpnv5y7cpdh73lg165xsz2h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140204.1354",
         "deps": []
@@ -40848,7 +41043,7 @@
         },
         "recipe": {
             "sha256": "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150709.1423",
         "deps": [
@@ -40864,7 +41059,7 @@
         },
         "recipe": {
             "sha256": "0gzmiwxmzcrl5mf0s7vs09p2wl7slq8xbl6ynl76iwzwjxjizahk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131228.1209",
         "deps": []
@@ -40879,7 +41074,7 @@
         },
         "recipe": {
             "sha256": "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150717.848",
         "deps": [
@@ -40901,7 +41096,7 @@
         },
         "recipe": {
             "sha256": "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151011.815",
         "deps": []
@@ -40916,7 +41111,7 @@
         },
         "recipe": {
             "sha256": "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.1515",
         "deps": []
@@ -40931,7 +41126,7 @@
         },
         "recipe": {
             "sha256": "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150508.2211",
         "deps": [
@@ -40948,7 +41143,7 @@
         },
         "recipe": {
             "sha256": "1p3ch1ab06v038h130fsxpbq45d1yadl67i2ih4l4fh3xah5997m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.2346",
         "deps": [
@@ -40966,7 +41161,7 @@
         },
         "recipe": {
             "sha256": "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150625.1723",
         "deps": [
@@ -40984,7 +41179,7 @@
         },
         "recipe": {
             "sha256": "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.623",
         "deps": [
@@ -41001,7 +41196,7 @@
         },
         "recipe": {
             "sha256": "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150330.1542",
         "deps": [
@@ -41017,7 +41212,7 @@
         },
         "recipe": {
             "sha256": "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20080905.54",
         "deps": []
@@ -41031,7 +41226,7 @@
         },
         "recipe": {
             "sha256": "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130418.1439",
         "deps": [
@@ -41048,7 +41243,7 @@
         },
         "recipe": {
             "sha256": "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150521.1556",
         "deps": []
@@ -41063,7 +41258,7 @@
         },
         "recipe": {
             "sha256": "0mf2ra3p5976qn4ryc2s20vi0nrzwcg3xvsgppsc0bsirjw2l0fh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130811.351",
         "deps": []
@@ -41078,7 +41273,7 @@
         },
         "recipe": {
             "sha256": "0dcpl5n7wwsk62ddgfrkq5dkm91569y4i4f0yqa61pdmzhgllx7d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140715.1101",
         "deps": []
@@ -41093,7 +41288,7 @@
         },
         "recipe": {
             "sha256": "1pbsg7zrz447siwd8pasw2hz5z21wa1xpqs5nrylhbghsk076ld3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151216.209",
         "deps": [
@@ -41111,7 +41306,7 @@
         },
         "recipe": {
             "sha256": "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151014.42",
         "deps": [
@@ -41129,7 +41324,7 @@
         },
         "recipe": {
             "sha256": "0jayhjvs5pkacw8r7z7fy0i732a1zpkcmirkzjpx3wqk0bs5fga6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140722.15",
         "deps": []
@@ -41144,7 +41339,7 @@
         },
         "recipe": {
             "sha256": "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140610.34",
         "deps": [
@@ -41162,7 +41357,7 @@
         },
         "recipe": {
             "sha256": "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151129.504",
         "deps": []
@@ -41177,7 +41372,7 @@
         },
         "recipe": {
             "sha256": "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141031.133",
         "deps": []
@@ -41190,7 +41385,7 @@
         },
         "recipe": {
             "sha256": "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1605",
         "deps": []
@@ -41205,7 +41400,7 @@
         },
         "recipe": {
             "sha256": "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120510.1900",
         "deps": []
@@ -41220,7 +41415,7 @@
         },
         "recipe": {
             "sha256": "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.912",
         "deps": [
@@ -41238,7 +41433,7 @@
         },
         "recipe": {
             "sha256": "0zzfzh8sf2dkz8h3kidv7zmwz2c2qq9n9qz2mab2lk0y44njzwhn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150315.742",
         "deps": [
@@ -41255,7 +41450,7 @@
         },
         "recipe": {
             "sha256": "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150727.1725",
         "deps": []
@@ -41270,7 +41465,7 @@
         },
         "recipe": {
             "sha256": "0lj3idwv4fxz8pi8mnxkbhwhzaa1gs6ib4nzly3fc6yiix9ampkz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120928.2054",
         "deps": []
@@ -41280,14 +41475,14 @@
             "tag": "fetchFromGitHub",
             "owner": "dominikh",
             "repo": "go-mode.el",
-            "sha256": "14h5fgh4bksll4h61pkximydddpww1pq7kr9j2f8akr06gmwcdfl",
-            "rev": "15d227ae1cf8d55ae4395108bccc8ad6ca7d1eba"
+            "sha256": "0wsh3rgay1k6ncayhqnnsnl5v2xwl60k6qyanmps0jgyshdv67zj",
+            "rev": "dccb56c1b1b85c3d7b3184a6606024077d4e1775"
         },
         "recipe": {
             "sha256": "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151214.1129",
+        "version": "20151226.1424",
         "deps": []
     },
     "xtest": {
@@ -41300,7 +41495,7 @@
         },
         "recipe": {
             "sha256": "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141214.1106",
         "deps": [
@@ -41317,7 +41512,7 @@
         },
         "recipe": {
             "sha256": "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150514.1620",
         "deps": []
@@ -41330,7 +41525,7 @@
         },
         "recipe": {
             "sha256": "19h3syk4kjmcy7jy9nlsbq6gyxwl4xsi84dy66a3cpvmknm25kyg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140901.1335",
         "deps": []
@@ -41345,7 +41540,7 @@
         },
         "recipe": {
             "sha256": "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130828.919",
         "deps": []
@@ -41360,7 +41555,7 @@
         },
         "recipe": {
             "sha256": "13pgxwwigb0h709xrs2h1l957n4vcjz59qkrs8aa12czcg291599",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151217.803",
         "deps": [
@@ -41371,6 +41566,21 @@
             "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",
@@ -41380,7 +41590,7 @@
         },
         "recipe": {
             "sha256": "0zhs4psa9b9yf9hxm19q5znsny11cdp23pya3rrlmj39j4jfn73j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151114.1741",
         "deps": []
@@ -41395,7 +41605,7 @@
         },
         "recipe": {
             "sha256": "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150912.308",
         "deps": [
@@ -41412,7 +41622,7 @@
         },
         "recipe": {
             "sha256": "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131113.2018",
         "deps": []
@@ -41427,7 +41637,7 @@
         },
         "recipe": {
             "sha256": "0qvb990dgq4v75lwnd661wxszbdbhlgxpsyv4zaj6h10gp1vi214",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140619.326",
         "deps": []
@@ -41437,14 +41647,14 @@
             "tag": "fetchFromGitHub",
             "owner": "magit",
             "repo": "magit",
-            "sha256": "0hy9a1rjl3vs6ysb2913li1zim7wcziaiv609g7dadfyl89c2d4v",
-            "rev": "6b595ac224f512cf672c56600e136714875a940f"
+            "sha256": "1wgy1rkaanqf382m7ijy90gpaiz2049mrmwlvwkr3hw3vgkffar8",
+            "rev": "c650d164a94adcd123ed28da7d413aee76cc9fe7"
         },
         "recipe": {
             "sha256": "0kcx8pqzvl7xgx7f8q7xck83ghkx6cjsa2nczxj1virap1nkfhkw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151215.1708",
+        "version": "20151226.639",
         "deps": [
             "async",
             "dash",
@@ -41459,14 +41669,14 @@
             "tag": "fetchFromGitHub",
             "owner": "capitaomorte",
             "repo": "sly",
-            "sha256": "0qmayk1691wpa8bczxaarp17q3g1rpkkh12v90814h9kjnd05wx6",
-            "rev": "247c4125ec42e75cbcf0e680bb3c975302ad266e"
+            "sha256": "11qdkhpz0h2idm0arrql5r7wh1nf40b34vnvwrwgdaqwq49xfrr4",
+            "rev": "762b53a1b1eecb0b7a9c8030d529e23e73b18791"
         },
         "recipe": {
             "sha256": "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.522",
+        "version": "20151222.931",
         "deps": [
             "emacs"
         ]
@@ -41481,7 +41691,7 @@
         },
         "recipe": {
             "sha256": "1pplc456771hi52ap1p87y7pabxlvm6raszcxjvnxff3xzw56pig",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100517.120",
         "deps": []
@@ -41496,7 +41706,7 @@
         },
         "recipe": {
             "sha256": "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151120.1744",
         "deps": [
@@ -41514,7 +41724,7 @@
         },
         "recipe": {
             "sha256": "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141227.448",
         "deps": []
@@ -41529,7 +41739,7 @@
         },
         "recipe": {
             "sha256": "03q09jxmhwqy7g09navj08z9ir0rbh7w26c1av7hwhmq4i6xwg8a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150116.554",
         "deps": [
@@ -41547,7 +41757,7 @@
         },
         "recipe": {
             "sha256": "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150727.424",
         "deps": [
@@ -41565,7 +41775,7 @@
         },
         "recipe": {
             "sha256": "0p62yifbrknjn8z0613wy2aaknj44liyrgbknhpa0qn0d4fcrp4h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140911.1608",
         "deps": []
@@ -41580,7 +41790,7 @@
         },
         "recipe": {
             "sha256": "05jhga9n6gh1bmj8gda14sb703gn7jgjlvy55mlr5kdb2z3rqw1n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140421.1611",
         "deps": [
@@ -41597,7 +41807,7 @@
         },
         "recipe": {
             "sha256": "005yy2f8vghvwdcwakz5sr9n1gzk6cfyglm6d8b74y90d8fng0r6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141124.413",
         "deps": [
@@ -41609,14 +41819,14 @@
             "tag": "fetchFromGitHub",
             "owner": "jkitchin",
             "repo": "org-ref",
-            "sha256": "0clz78kcvibiic3igy0dik5bv0jvmngr7jnq2g93lq0dbxcy1d3f",
-            "rev": "d7bee0742f4f2807e5a464120cac4ae4d7768aff"
+            "sha256": "0ggr0ln67gffyl3czcjw1hck7m7wibmbgb7q2kn8ps9cc90ngc1a",
+            "rev": "fa0e03e8c194c5d2e95fe51a59802a68b7039a86"
         },
         "recipe": {
-            "sha256": "0sxhq603zq55lfq2z7jdfka7d5jphgnn2xfhw8n6ihzynx0lsjzx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.503",
+        "version": "20151226.1700",
         "deps": [
             "dash",
             "emacs",
@@ -41636,7 +41846,7 @@
         },
         "recipe": {
             "sha256": "0j4djylz6mrq14qmbm35k3gvvsw6i9qc4gd9ma4fykiqzkdjsg7j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140319.1700",
         "deps": [
@@ -41653,7 +41863,7 @@
         },
         "recipe": {
             "sha256": "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.957",
         "deps": [
@@ -41671,7 +41881,7 @@
         },
         "recipe": {
             "sha256": "06cyr2330asy2dlx81g3h9gq0yhd4pbnmzfvmla7amh4pfnjg14v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20100703.658",
         "deps": []
@@ -41686,7 +41896,7 @@
         },
         "recipe": {
             "sha256": "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140308.525",
         "deps": [
@@ -41703,7 +41913,7 @@
         },
         "recipe": {
             "sha256": "0k54886bh7zxsfnvga3wg3bsij4bixxrah2rrkq1lj0k8ay7nfxh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120718.2238",
         "deps": []
@@ -41718,7 +41928,7 @@
         },
         "recipe": {
             "sha256": "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130719.456",
         "deps": []
@@ -41733,7 +41943,7 @@
         },
         "recipe": {
             "sha256": "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.1007",
         "deps": [
@@ -41751,7 +41961,7 @@
         },
         "recipe": {
             "sha256": "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151208.1028",
         "deps": [
@@ -41770,7 +41980,7 @@
         },
         "recipe": {
             "sha256": "00y07pd438v7ldkn5f1w84cpxa1mvcnzjkj6sf5l5pm97xqiz7j2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151023.500",
         "deps": []
@@ -41785,7 +41995,7 @@
         },
         "recipe": {
             "sha256": "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.238",
         "deps": [
@@ -41802,7 +42012,7 @@
         },
         "recipe": {
             "sha256": "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151217.859",
         "deps": [
@@ -41821,7 +42031,7 @@
         },
         "recipe": {
             "sha256": "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151128.1302",
         "deps": [
@@ -41839,7 +42049,7 @@
         },
         "recipe": {
             "sha256": "1n56j5nicac94jl7kp8fbqxmd115vbhzklzgfz5jbib2ab8y60jc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151122.347",
         "deps": [
@@ -41857,7 +42067,7 @@
         },
         "recipe": {
             "sha256": "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141215.623",
         "deps": []
@@ -41872,7 +42082,7 @@
         },
         "recipe": {
             "sha256": "05dl28a4npnnzzipypfcqb21sdww715lwji2xnsabx3fb1h1w5jl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130819.427",
         "deps": []
@@ -41887,7 +42097,7 @@
         },
         "recipe": {
             "sha256": "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141205.2308",
         "deps": [
@@ -41904,7 +42114,7 @@
         },
         "recipe": {
             "sha256": "0fmxlrq5ls6fpbk5fv67aan8gg1c61i1chfw5lhf496pwqzq901d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.1435",
         "deps": [
@@ -41922,7 +42132,7 @@
         },
         "recipe": {
             "sha256": "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151113.323",
         "deps": [
@@ -41940,7 +42150,7 @@
         },
         "recipe": {
             "sha256": "1nn5vx1rspfsijwhilnjhiy0mjw154ds3lwxvkpwxpchygirlyxj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150715.1532",
         "deps": [
@@ -41960,7 +42170,7 @@
         },
         "recipe": {
             "sha256": "19lbbzqflqda5b0alqfzdhpbgqssghqb4n4viq8x4l1fac8mby6h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150819.1148",
         "deps": [
@@ -41978,7 +42188,7 @@
         },
         "recipe": {
             "sha256": "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151012.508",
         "deps": [
@@ -41996,7 +42206,7 @@
         },
         "recipe": {
             "sha256": "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110206.1430",
         "deps": []
@@ -42011,7 +42221,7 @@
         },
         "recipe": {
             "sha256": "1kadmxmqhc60cb5k14943rad1gbril2hlcnqxnsy4h3j2ykmcdyy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120629.1313",
         "deps": []
@@ -42026,7 +42236,7 @@
         },
         "recipe": {
             "sha256": "197r0sfbmwygvzsiv0bjjfsngwp79qi365z762y8gbf8f3hjp45i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121202.1103",
         "deps": []
@@ -42041,7 +42251,7 @@
         },
         "recipe": {
             "sha256": "0ji3nsxwbxmmygd6plpbc1lkw6i5zw4y6x3r5n2ah3ds4vjr7cnv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141222.1016",
         "deps": []
@@ -42054,7 +42264,7 @@
         },
         "recipe": {
             "sha256": "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.707",
         "deps": []
@@ -42069,7 +42279,7 @@
         },
         "recipe": {
             "sha256": "16rgff1d0s65alh328lr93zc06zmgbzgwx1rf3k3l4d10ki4cc27",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151010.307",
         "deps": [
@@ -42084,7 +42294,7 @@
         },
         "recipe": {
             "sha256": "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130607.514",
         "deps": [
@@ -42101,7 +42311,7 @@
         },
         "recipe": {
             "sha256": "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151118.1139",
         "deps": []
@@ -42116,7 +42326,7 @@
         },
         "recipe": {
             "sha256": "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140303.657",
         "deps": [
@@ -42134,7 +42344,7 @@
         },
         "recipe": {
             "sha256": "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151114.1306",
         "deps": [
@@ -42147,14 +42357,14 @@
             "tag": "fetchFromGitHub",
             "owner": "skeeto",
             "repo": "elfeed",
-            "sha256": "1z0i4cb09xq37y77zdans29lsqwk2asc9ix6cca9bf8rdwiq665b",
-            "rev": "8a38a4c81496d40d3b7c45a6df5e41258a52843c"
+            "sha256": "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j",
+            "rev": "9fd3cf8833e26bf41f52a7e2149734858d2eeb96"
         },
         "recipe": {
             "sha256": "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151130.1724",
+        "version": "20151222.1322",
         "deps": [
             "elfeed",
             "emacs",
@@ -42166,14 +42376,14 @@
             "tag": "fetchFromGitHub",
             "owner": "raghavgautam",
             "repo": "osx-lib",
-            "sha256": "1s2bv4sypf910wq62d5nfzdlmp54y1igqx8l7gzm1c6fnaz4fway",
-            "rev": "ca4b85dbebff97c3a0630d7f1140b1418cec2671"
+            "sha256": "1rha3qcv8k1y91w9p70fw0jfwyssiwxn85xz4jq1gd3nha126zw1",
+            "rev": "18ad53b6a3f9895f25dc2413bf448ded0fb6fdff"
         },
         "recipe": {
             "sha256": "12wvki8jhzqsanxv5yqzjmfx6ifwz9ab9zh6r8nss86bk8864ix4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151214.1857",
+        "version": "20151221.2148",
         "deps": [
             "emacs"
         ]
@@ -42188,7 +42398,7 @@
         },
         "recipe": {
             "sha256": "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140510.1731",
         "deps": [
@@ -42205,7 +42415,7 @@
         },
         "recipe": {
             "sha256": "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150425.1507",
         "deps": [
@@ -42223,7 +42433,7 @@
         },
         "recipe": {
             "sha256": "02dzyycn5znbibbz50b243bh1kcccp8xwknjqwljk00gpf196vzf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130804.610",
         "deps": []
@@ -42238,7 +42448,7 @@
         },
         "recipe": {
             "sha256": "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.1953",
         "deps": [
@@ -42256,7 +42466,7 @@
         },
         "recipe": {
             "sha256": "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150621.2341",
         "deps": []
@@ -42271,7 +42481,7 @@
         },
         "recipe": {
             "sha256": "11875pwlx2rm8d86541na9g3yiq0j472vg63mryqv6pzq3n8q6jx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141124.1119",
         "deps": []
@@ -42286,7 +42496,7 @@
         },
         "recipe": {
             "sha256": "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151031.1845",
         "deps": [
@@ -42304,7 +42514,7 @@
         },
         "recipe": {
             "sha256": "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150604.226",
         "deps": []
@@ -42319,7 +42529,7 @@
         },
         "recipe": {
             "sha256": "048888y07bzmi9x5i43fg6bgqbzdqi3nfjfnn6zr29jvlx366r5z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20110508.231",
         "deps": []
@@ -42334,7 +42544,7 @@
         },
         "recipe": {
             "sha256": "1ygh104vr65s7frlkzyhrfi6shrbvp2b2j3ynj5dip253v85xki5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.430",
         "deps": []
@@ -42349,7 +42559,7 @@
         },
         "recipe": {
             "sha256": "1w60pb7szai1kh06jd3qvgpzq3z1ci4a77ysnpqjfk326s6zv7hl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150630.338",
         "deps": []
@@ -42359,12 +42569,12 @@
             "tag": "fetchFromGitHub",
             "owner": "magit",
             "repo": "magit",
-            "sha256": "0hy9a1rjl3vs6ysb2913li1zim7wcziaiv609g7dadfyl89c2d4v",
-            "rev": "6b595ac224f512cf672c56600e136714875a940f"
+            "sha256": "1wgy1rkaanqf382m7ijy90gpaiz2049mrmwlvwkr3hw3vgkffar8",
+            "rev": "c650d164a94adcd123ed28da7d413aee76cc9fe7"
         },
         "recipe": {
             "sha256": "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.618",
         "deps": [
@@ -42383,7 +42593,7 @@
         },
         "recipe": {
             "sha256": "00nc18w4nsi6vicpbqqpr4xcdh48g95vnay3kirb2xp5hc2rw3x8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150106.851",
         "deps": [
@@ -42401,7 +42611,7 @@
         },
         "recipe": {
             "sha256": "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151116.2200",
         "deps": [
@@ -42419,7 +42629,7 @@
         },
         "recipe": {
             "sha256": "1yvkw65la4w12c4w6l9ai73lzng170wv4b8gry99m2bakw3wr8m8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140224.959",
         "deps": [
@@ -42438,7 +42648,7 @@
         },
         "recipe": {
             "sha256": "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150421.703",
         "deps": [
@@ -42455,7 +42665,7 @@
         },
         "recipe": {
             "sha256": "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.2321",
         "deps": [
@@ -42473,7 +42683,7 @@
         },
         "recipe": {
             "sha256": "0bazwq21mah4qrzwaji6w13m91l6v9dqh9svxrd13ij8yycr184b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150920.758",
         "deps": []
@@ -42488,7 +42698,7 @@
         },
         "recipe": {
             "sha256": "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140616.315",
         "deps": []
@@ -42503,7 +42713,7 @@
         },
         "recipe": {
             "sha256": "0nb9r407h08yxxdihxqx0c645bcz6qywbh2l654s3zfzdsqi1aj4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131004.1830",
         "deps": []
@@ -42518,7 +42728,7 @@
         },
         "recipe": {
             "sha256": "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130718.929",
         "deps": [
@@ -42536,7 +42746,7 @@
         },
         "recipe": {
             "sha256": "03kqws8dzm0ay5k86f4v7g2g2ygwk4fzmz2vyzhzhbsj8hrniq9p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141107.1006",
         "deps": [
@@ -42545,14 +42755,15 @@
     },
     "meacupla-theme": {
         "fetch": {
-            "tag": "fetchgit",
-            "url": "https://gitlab.com/jtecca/meacupla-theme.git",
-            "sha256": "fb8399ef9c3975b9c536e6b458d5cd151da9a1d355bfd0b2219d4f05d380d48c",
+            "tag": "fetchFromGitLab",
+            "owner": "jtecca",
+            "repo": "meacupla-theme",
+            "sha256": "136lh39hakwx46rd1gsmsfhsj78mrpamid766v2vjx9rkkprk0zv",
             "rev": "f57542222a3a43af9aae665e05a84a61637ab22a"
         },
         "recipe": {
             "sha256": "09q88q2xghj5vn5y3mjrcparfwdzavkgjyg2ay55h7wf5f2zpw2d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151027.1717",
         "deps": []
@@ -42567,7 +42778,7 @@
         },
         "recipe": {
             "sha256": "1wnawz1m6x95iyzac453p55h7hlr5q0ry5437aqqx0bw7gdwg3dp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140908.1552",
         "deps": [
@@ -42585,7 +42796,7 @@
         },
         "recipe": {
             "sha256": "0f8b3i83vzxzfa91p4ahlqz6njql18xy5nk265sjxpy9zr898rsa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151102.1155",
         "deps": [
@@ -42602,7 +42813,7 @@
         },
         "recipe": {
             "sha256": "0247fpvxki5jhxw6swv7pcw0qwxrqnp75acnfss2lf984vggzhxi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140812.1913",
         "deps": []
@@ -42617,7 +42828,7 @@
         },
         "recipe": {
             "sha256": "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150227.1156",
         "deps": []
@@ -42632,7 +42843,7 @@
         },
         "recipe": {
             "sha256": "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151127.133",
         "deps": []
@@ -42645,7 +42856,7 @@
         },
         "recipe": {
             "sha256": "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150805.1752",
         "deps": []
@@ -42660,7 +42871,7 @@
         },
         "recipe": {
             "sha256": "0zlf22wg9adkhycsasv6bfim2h0cknsvihyi1q2l2l4pjdp9ypqj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141219.518",
         "deps": [
@@ -42678,7 +42889,7 @@
         },
         "recipe": {
             "sha256": "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151028.2236",
         "deps": []
@@ -42693,7 +42904,7 @@
         },
         "recipe": {
             "sha256": "10sxm7v94yxa92mqbwj3shqjs6f3zbxjvwgbvg9m2fh3b7xj617w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130623.1833",
         "deps": []
@@ -42706,7 +42917,7 @@
         },
         "recipe": {
             "sha256": "055qj2pc32l824vyjl2w2j8c3rpd9g4x0sazi8svqf923lgcs5s8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141029.1049",
         "deps": []
@@ -42721,7 +42932,7 @@
         },
         "recipe": {
             "sha256": "14wyiyyi2rram2sz3habvmygy5a5m2jfi6x9fqcyfr3vpcjn1k4i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150331.2339",
         "deps": [
@@ -42741,7 +42952,7 @@
         },
         "recipe": {
             "sha256": "1gkaq549svflx8qyqrk0ccb52b7wp17wmd5jgzkw1109bpc4k6jc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151213.150",
         "deps": [
@@ -42758,7 +42969,7 @@
         },
         "recipe": {
             "sha256": "0srdh3yx7j6xs7rgpzmsyzz6ds00kq887rs2sfa0nvk0j0ga6baf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151016.1045",
         "deps": []
@@ -42772,7 +42983,7 @@
         },
         "recipe": {
             "sha256": "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.1353",
         "deps": []
@@ -42787,7 +42998,7 @@
         },
         "recipe": {
             "sha256": "06jd7wh4yzryz0yjwa4a0xddz7srl5mif8ff1wvcpxsb66m2zbvh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141014.1857",
         "deps": []
@@ -42802,7 +43013,7 @@
         },
         "recipe": {
             "sha256": "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141222.852",
         "deps": []
@@ -42817,7 +43028,7 @@
         },
         "recipe": {
             "sha256": "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141119.627",
         "deps": []
@@ -42832,7 +43043,7 @@
         },
         "recipe": {
             "sha256": "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140316.1837",
         "deps": [
@@ -42849,7 +43060,7 @@
         },
         "recipe": {
             "sha256": "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150420.621",
         "deps": []
@@ -42863,7 +43074,7 @@
         },
         "recipe": {
             "sha256": "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150415.1426",
         "deps": []
@@ -42878,7 +43089,7 @@
         },
         "recipe": {
             "sha256": "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151018.35",
         "deps": []
@@ -42893,7 +43104,7 @@
         },
         "recipe": {
             "sha256": "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150629.1312",
         "deps": [
@@ -42910,7 +43121,7 @@
         },
         "recipe": {
             "sha256": "0z4d8y8jlsjw20b31akkaikh5xl0c05lj77d2i1xbgzam4iixma0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150131.1557",
         "deps": []
@@ -42925,7 +43136,7 @@
         },
         "recipe": {
             "sha256": "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140225.1144",
         "deps": []
@@ -42940,7 +43151,7 @@
         },
         "recipe": {
             "sha256": "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130407.848",
         "deps": []
@@ -42955,7 +43166,7 @@
         },
         "recipe": {
             "sha256": "0h058mvb6x53zywpwg85dzhaynlgq577yyqhrn5qqyqjg1n8lhc1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140317.2318",
         "deps": [
@@ -42972,7 +43183,7 @@
         },
         "recipe": {
             "sha256": "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150914.747",
         "deps": []
@@ -42987,7 +43198,7 @@
         },
         "recipe": {
             "sha256": "19r7abbpm31b0azf2v3xn0rjagg9h01i8g72qapp8dhqb4d9n9r0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151020.1340",
         "deps": [
@@ -43004,7 +43215,7 @@
         },
         "recipe": {
             "sha256": "1ssjbdprbn34nsfx1xjc382l2195rbh8mybpn31d4kcjx6fqf78h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.1551",
         "deps": []
@@ -43019,7 +43230,7 @@
         },
         "recipe": {
             "sha256": "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140422.1055",
         "deps": []
@@ -43034,7 +43245,7 @@
         },
         "recipe": {
             "sha256": "000hikpsmqpbb6v13az2dv319d0f7jjpkkpgi4vzv59z6cdlrlp3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141027.941",
         "deps": [
@@ -43051,7 +43262,7 @@
         },
         "recipe": {
             "sha256": "0478jlg76h0mrjwk2b1kdj16s1q1b03b7ygacai45jh89bc025fh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.946",
         "deps": [
@@ -43070,7 +43281,7 @@
         },
         "recipe": {
             "sha256": "0bvr877mc79s1shr82b33ipspz09jzc3809c6pkbw0jqpfid44cc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.745",
         "deps": []
@@ -43085,7 +43296,7 @@
         },
         "recipe": {
             "sha256": "1h0143h39dq61afswlzlgpknk0gv574x91ar6klqmnaf1snab59g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150129.446",
         "deps": []
@@ -43100,7 +43311,7 @@
         },
         "recipe": {
             "sha256": "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150603.804",
         "deps": [
@@ -43119,7 +43330,7 @@
         },
         "recipe": {
             "sha256": "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150702.1137",
         "deps": [
@@ -43139,7 +43350,7 @@
         },
         "recipe": {
             "sha256": "153qavpcwvk2g15w5a814xjsnsv54xksx4iz6yjffvvzq14a08ry",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151121.744",
         "deps": []
@@ -43154,7 +43365,7 @@
         },
         "recipe": {
             "sha256": "0ij7k27zj22sl7inx141l4dg0ymywnvyabjvaqzc0xjdj0cky5c5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151018.1723",
         "deps": [
@@ -43171,7 +43382,7 @@
         },
         "recipe": {
             "sha256": "0k85j9bcqp0gbzdh44q5a9wlkv5mc0g0m42ziq1bzmp6993wkmy2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.940",
         "deps": []
@@ -43186,7 +43397,7 @@
         },
         "recipe": {
             "sha256": "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151118.300",
         "deps": []
@@ -43201,7 +43412,7 @@
         },
         "recipe": {
             "sha256": "1s59hab35hwnspyklxbhi0js0sgdn0rc7y33dqjk0psjcikqymg1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150115.1301",
         "deps": [
@@ -43220,7 +43431,7 @@
         },
         "recipe": {
             "sha256": "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140331.1829",
         "deps": []
@@ -43235,7 +43446,7 @@
         },
         "recipe": {
             "sha256": "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.318",
         "deps": [
@@ -43258,7 +43469,7 @@
         },
         "recipe": {
             "sha256": "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151025.730",
         "deps": []
@@ -43273,7 +43484,7 @@
         },
         "recipe": {
             "sha256": "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150803.1037",
         "deps": [
@@ -43290,7 +43501,7 @@
         },
         "recipe": {
             "sha256": "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150822.650",
         "deps": [
@@ -43309,7 +43520,7 @@
         },
         "recipe": {
             "sha256": "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150910.727",
         "deps": [
@@ -43328,7 +43539,7 @@
         },
         "recipe": {
             "sha256": "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151206.2305",
         "deps": []
@@ -43343,7 +43554,7 @@
         },
         "recipe": {
             "sha256": "0bj2gs96ivm5x8l7gwvfckyalr1amh4cb1v2dbl323zmrqddhgkd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140101.1754",
         "deps": []
@@ -43358,7 +43569,7 @@
         },
         "recipe": {
             "sha256": "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141124.1332",
         "deps": [
@@ -43375,7 +43586,7 @@
         },
         "recipe": {
             "sha256": "1k7936wxgslr29511dz9az38i9vi35rcxk68gzv35v9lpj89lalh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131202.1308",
         "deps": [
@@ -43392,7 +43603,7 @@
         },
         "recipe": {
             "sha256": "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151108.20",
         "deps": [
@@ -43410,7 +43621,7 @@
         },
         "recipe": {
             "sha256": "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150429.1314",
         "deps": [
@@ -43426,7 +43637,7 @@
         },
         "recipe": {
             "sha256": "1y8xz04spn7a4fjnfv82hamk1mrc3a1iilf5nrl40nlg2xgp1h63",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150123.1800",
         "deps": []
@@ -43441,7 +43652,7 @@
         },
         "recipe": {
             "sha256": "1l3h0qhv0ad9l933d47as8y3h9x94zw315ax4qsgiw3046nzkdwv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150729.1715",
         "deps": [
@@ -43459,7 +43670,7 @@
         },
         "recipe": {
             "sha256": "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151108.400",
         "deps": []
@@ -43474,7 +43685,7 @@
         },
         "recipe": {
             "sha256": "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141009.808",
         "deps": [
@@ -43491,7 +43702,7 @@
         },
         "recipe": {
             "sha256": "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.858",
         "deps": []
@@ -43506,7 +43717,7 @@
         },
         "recipe": {
             "sha256": "1k983f0lj42rxr5szpq9l9harykfn8jr13y3y6fav86zzd1fb8j0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150119.1021",
         "deps": [
@@ -43523,7 +43734,7 @@
         },
         "recipe": {
             "sha256": "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151118.732",
         "deps": [
@@ -43541,7 +43752,7 @@
         },
         "recipe": {
             "sha256": "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151215.1125",
         "deps": [
@@ -43558,7 +43769,7 @@
         },
         "recipe": {
             "sha256": "1c1d5xq4alamlwyqxjx557aykz5dw87acp0lyglsrzzkdynbwlb1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131207.1132",
         "deps": [
@@ -43575,7 +43786,7 @@
         },
         "recipe": {
             "sha256": "1lxiqw7k8cpq0v6p5whgxgzqrbx3sd9174r0d4qlkrpn6rcp44vv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151013.814",
         "deps": [
@@ -43592,7 +43803,7 @@
         },
         "recipe": {
             "sha256": "1vv65sa0pwl407mbxcp653kycgx8jz87n6wshias1dp9lv21pj6v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150911.2110",
         "deps": []
@@ -43607,7 +43818,7 @@
         },
         "recipe": {
             "sha256": "141q4x6rilidpnsm9s78qks9i1v6ng0ydhbzqi39xcaccfyyjb69",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140407.1714",
         "deps": []
@@ -43622,7 +43833,7 @@
         },
         "recipe": {
             "sha256": "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151217.2046",
         "deps": [
@@ -43640,7 +43851,7 @@
         },
         "recipe": {
             "sha256": "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151210.1216",
         "deps": [
@@ -43657,7 +43868,7 @@
         },
         "recipe": {
             "sha256": "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150226.811",
         "deps": []
@@ -43672,7 +43883,7 @@
         },
         "recipe": {
             "sha256": "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141123.1520",
         "deps": []
@@ -43687,7 +43898,7 @@
         },
         "recipe": {
             "sha256": "0a10lq0xsfyp052iw4xjbhsdkbyg25x2gk68gys4k7p6l92la0k5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151023.2031",
         "deps": []
@@ -43702,7 +43913,7 @@
         },
         "recipe": {
             "sha256": "029sk90xz9fhv2s56f5hp0aks1d6ybz517009vv4892bbzkpjv1w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150301.1828",
         "deps": [
@@ -43719,7 +43930,7 @@
         },
         "recipe": {
             "sha256": "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150604.1257",
         "deps": [
@@ -43737,7 +43948,7 @@
         },
         "recipe": {
             "sha256": "1pak8qn0qvbzyclhzvr5ka3pl370i4kiykypfkwbfgvqqwczhl3n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141226.1336",
         "deps": [
@@ -43754,7 +43965,7 @@
         },
         "recipe": {
             "sha256": "1rnmphl7ml5ryjl5ka2l58hddir8b34iz1rm905wdwh164piljva",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140409.252",
         "deps": [
@@ -43771,7 +43982,7 @@
         },
         "recipe": {
             "sha256": "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150530.1137",
         "deps": []
@@ -43786,7 +43997,7 @@
         },
         "recipe": {
             "sha256": "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140729.1345",
         "deps": [
@@ -43803,7 +44014,7 @@
         },
         "recipe": {
             "sha256": "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130906.634",
         "deps": []
@@ -43813,11 +44024,11 @@
             "tag": "fetchsvn",
             "url": "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format",
             "sha256": "1rzax55darnj4h8i3qyrm2rqdwcvqggsz7kv6gi2i174fbdkbzfr",
-            "rev": "256039"
+            "rev": "256472"
         },
         "recipe": {
             "sha256": "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151116.638",
         "deps": [
@@ -43834,7 +44045,7 @@
         },
         "recipe": {
             "sha256": "0f46m5pc40i531dzfnhkcn192dcs1q20y083c1c0wg2zhjcdr5iy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150130.425",
         "deps": []
@@ -43849,7 +44060,7 @@
         },
         "recipe": {
             "sha256": "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150425.751",
         "deps": [
@@ -43866,7 +44077,7 @@
         },
         "recipe": {
             "sha256": "1gq6yi51h1h7ivrm1xr6nfrpabx8ylbk0waaw04gnw3bb54dmmvc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150923.340",
         "deps": [
@@ -43885,7 +44096,7 @@
         },
         "recipe": {
             "sha256": "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140916.954",
         "deps": []
@@ -43900,7 +44111,7 @@
         },
         "recipe": {
             "sha256": "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150810.439",
         "deps": [
@@ -43920,7 +44131,7 @@
         },
         "recipe": {
             "sha256": "0ppcabddcpwshfd04x42nbrbkagbyi1bg4vslysnlxn4kaxjs7pm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140906.1225",
         "deps": []
@@ -43935,7 +44146,7 @@
         },
         "recipe": {
             "sha256": "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151031.29",
         "deps": [
@@ -43953,7 +44164,7 @@
         },
         "recipe": {
             "sha256": "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140109.1010",
         "deps": []
@@ -43968,7 +44179,7 @@
         },
         "recipe": {
             "sha256": "0lzg478ax6idzh6m5sf2ds4gbv096y0c0gn15dai19f58bs63xzr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150918.1541",
         "deps": []
@@ -43983,7 +44194,7 @@
         },
         "recipe": {
             "sha256": "0yis27362jc63jkzdndz1wpysmf1b51rrbv3swvi6b36da5i6b54",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20091203.1213",
         "deps": []
@@ -43993,12 +44204,12 @@
             "tag": "fetchFromGitHub",
             "owner": "NixOS",
             "repo": "nix",
-            "sha256": "0nfwz0p5jakf0nfxmvnqwny38cfh92nx0n7l42bj22m8hcr1gb5d",
-            "rev": "a9faa7bbce963ddb894699a7cc6ea8a3876e4d9f"
+            "sha256": "067dpzww3w3q065bqpzywgfxq09zn0fk56v917aanb6va2rddq0r",
+            "rev": "52120123a5505199c342afb42f1a48b9cb2628ed"
         },
         "recipe": {
             "sha256": "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151026.515",
         "deps": []
@@ -44013,7 +44224,7 @@
         },
         "recipe": {
             "sha256": "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140514.23",
         "deps": [
@@ -44031,7 +44242,7 @@
         },
         "recipe": {
             "sha256": "18p18bly15a8xjc34k11jbvxlmr127sll0vh5ma2p787x6a3mc7c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130711.2011",
         "deps": [
@@ -44048,7 +44259,7 @@
         },
         "recipe": {
             "sha256": "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140331.1330",
         "deps": [
@@ -44065,7 +44276,7 @@
         },
         "recipe": {
             "sha256": "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141202.2256",
         "deps": []
@@ -44080,7 +44291,7 @@
         },
         "recipe": {
             "sha256": "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141114.1514",
         "deps": []
@@ -44090,14 +44301,14 @@
             "tag": "fetchFromGitHub",
             "owner": "10sr",
             "repo": "shell-split-string-el",
-            "sha256": "00c06y5c9iscgddrqgd1fh0y53xvjz07ylwzaaa9x0dbvx386ihl",
-            "rev": "4ad4caaea6b1c247df2f3171569d633c0d8fdefe"
+            "sha256": "16srngml5xmpaxb0wzhx91jil0r0dmn673bwai3lzxrkmjnl748l",
+            "rev": "19f6f999c33cc66a4c91bacdcc3697c25d97bf5a"
         },
         "recipe": {
             "sha256": "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20150202.2236",
+        "version": "20151224.408",
         "deps": []
     },
     "evil-visual-mark-mode": {
@@ -44110,7 +44321,7 @@
         },
         "recipe": {
             "sha256": "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150202.1200",
         "deps": [
@@ -44128,7 +44339,7 @@
         },
         "recipe": {
             "sha256": "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150319.1655",
         "deps": []
@@ -44143,13 +44354,30 @@
         },
         "recipe": {
             "sha256": "15z5lgh5x1ykz5p31i994fig8v05s7ckkgw6p9jifn11sn1a39nb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -44160,7 +44388,7 @@
         },
         "recipe": {
             "sha256": "02v8kh2g6a2fpxy911630zsg985hyakvqbd6v2xyfbz0vnd6i1lf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20091211.1755",
         "deps": []
@@ -44173,7 +44401,7 @@
         },
         "recipe": {
             "sha256": "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1600",
         "deps": []
@@ -44188,7 +44416,7 @@
         },
         "recipe": {
             "sha256": "0ld8k53823786y6f0dqcp0hlqlnmy323vdkanjfs5wg5ib60az1m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141014.2129",
         "deps": [
@@ -44205,7 +44433,7 @@
         },
         "recipe": {
             "sha256": "1vqcnkh3g6dwi2hwfkb534q0j19pkqzqk3yb7ah8ck4z4ln4ppfk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150908.1233",
         "deps": [
@@ -44223,7 +44451,7 @@
         },
         "recipe": {
             "sha256": "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150402.942",
         "deps": []
@@ -44238,7 +44466,7 @@
         },
         "recipe": {
             "sha256": "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150414.436",
         "deps": []
@@ -44253,7 +44481,7 @@
         },
         "recipe": {
             "sha256": "1awnilb8bk0izp6yw0187ybh9slf1hc51014xvvmj90darxby79a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150531.1448",
         "deps": [
@@ -44271,7 +44499,7 @@
         },
         "recipe": {
             "sha256": "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151018.120",
         "deps": [
@@ -44288,7 +44516,7 @@
         },
         "recipe": {
             "sha256": "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.1649",
         "deps": [
@@ -44303,7 +44531,7 @@
         },
         "recipe": {
             "sha256": "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150816.2153",
         "deps": []
@@ -44318,7 +44546,7 @@
         },
         "recipe": {
             "sha256": "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151130.957",
         "deps": []
@@ -44333,7 +44561,7 @@
         },
         "recipe": {
             "sha256": "18v571kp440n5g1d7pj86rr8dgbbm324f9vblkdbdvn13c5dczf5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140907.1549",
         "deps": []
@@ -44348,7 +44576,7 @@
         },
         "recipe": {
             "sha256": "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150722.1406",
         "deps": [
@@ -44360,14 +44588,14 @@
             "tag": "fetchFromGitHub",
             "owner": "xahlee",
             "repo": "xah-elisp-mode",
-            "sha256": "0h46wdi6kijp8q9n7q0dvv1p9bya396pk3ywy2bkkhv20j9zsd1b",
-            "rev": "003d1dbb1edd692fee317d1852bf6bf03662bdd3"
+            "sha256": "05a29y4mds2vhgkvlnyjby240pmnq4yq9cx92iqbvhdi984dcm28",
+            "rev": "c05ab4d78d1eb37ec7635e79f8c49a14c61b69b0"
         },
         "recipe": {
             "sha256": "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151116.1612",
+        "version": "20151219.1522",
         "deps": []
     },
     "epl": {
@@ -44380,7 +44608,7 @@
         },
         "recipe": {
             "sha256": "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150517.633",
         "deps": [
@@ -44397,7 +44625,7 @@
         },
         "recipe": {
             "sha256": "1biq4p2w8rqcbvr09gxbchjqlaixjf1fzv7xv8lpv81dlhi7dgz6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140218.807",
         "deps": []
@@ -44412,7 +44640,7 @@
         },
         "recipe": {
             "sha256": "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151211.1517",
         "deps": [
@@ -44435,7 +44663,7 @@
         },
         "recipe": {
             "sha256": "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131027.1129",
         "deps": [
@@ -44452,7 +44680,7 @@
         },
         "recipe": {
             "sha256": "0fy05af9aq9791ij4j9pscdk5j44pbg0kmhpqli41qiazjw7v2va",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.406",
         "deps": []
@@ -44462,14 +44690,14 @@
             "tag": "fetchFromGitHub",
             "owner": "edvorg",
             "repo": "req-package",
-            "sha256": "13hglddg4x0l5kmqplxb1ygqa4k4vxgabvjk8q8zjvkm8rwylwjh",
-            "rev": "ad4cff69412abb3ecc1ebd15946943c0cab6529a"
+            "sha256": "05a88r2jp169x99abz9wrr1i8ch0bg3dlmaalxwqfmlzci0lksx2",
+            "rev": "e52f0b0a8cfc28ae1d13c83fdcf3998a9973e7e5"
         },
         "recipe": {
             "sha256": "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151205.1042",
+        "version": "20151220.254",
         "deps": [
             "dash",
             "ht",
@@ -44487,7 +44715,7 @@
         },
         "recipe": {
             "sha256": "0zmwlsm98m9vbjk9mldfj2nf6cip7mlvb71j33ddix76yqggp4qg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140107.418",
         "deps": []
@@ -44501,7 +44729,7 @@
         },
         "recipe": {
             "sha256": "1hqv2xqnhwnbj4sqcbdial4987yj1y3ry7niaaz2hh0f5qzrzwa8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121025.601",
         "deps": []
@@ -44516,7 +44744,7 @@
         },
         "recipe": {
             "sha256": "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150720.1559",
         "deps": []
@@ -44530,7 +44758,7 @@
         },
         "recipe": {
             "sha256": "06s7mrbfbkk6baf8j1vc26nb2bg3ma1n7d297zqz8ay90cv81y76",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141227.1244",
         "deps": []
@@ -44545,7 +44773,7 @@
         },
         "recipe": {
             "sha256": "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151111.201",
         "deps": [
@@ -44563,7 +44791,7 @@
         },
         "recipe": {
             "sha256": "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151021.533",
         "deps": []
@@ -44578,7 +44806,7 @@
         },
         "recipe": {
             "sha256": "038j5jkcckmhlq3vz4h07s5y2scljh1fdn9r614hiyxwgk48lc35",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130422.811",
         "deps": []
@@ -44593,7 +44821,7 @@
         },
         "recipe": {
             "sha256": "0c6q1d864qc78sqk9iadjpd01xc7myipgnf89pqa2z75yprndvyn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141116.1802",
         "deps": []
@@ -44606,7 +44834,7 @@
         },
         "recipe": {
             "sha256": "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140129.232",
         "deps": [
@@ -44624,7 +44852,7 @@
         },
         "recipe": {
             "sha256": "1y5qxslxl0d93f387nyj8zngz5nh1p4rzdfx0lnbvya6shfaxaf6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150205.1511",
         "deps": []
@@ -44639,7 +44867,7 @@
         },
         "recipe": {
             "sha256": "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130525.934",
         "deps": [
@@ -44656,7 +44884,7 @@
         },
         "recipe": {
             "sha256": "05vlajmirbp62rpbdwa2bimpzyl9xc331gg0lhn2rkivc0hma2ar",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140531.417",
         "deps": [
@@ -44674,7 +44902,7 @@
         },
         "recipe": {
             "sha256": "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140724.145",
         "deps": [
@@ -44692,7 +44920,7 @@
         },
         "recipe": {
             "sha256": "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140306.1233",
         "deps": []
@@ -44705,7 +44933,7 @@
         },
         "recipe": {
             "sha256": "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150508.1745",
         "deps": []
@@ -44720,7 +44948,7 @@
         },
         "recipe": {
             "sha256": "0aahpplmiwmp6a06y6hl4zvv8lvzkmakmaazlckl5r3rqbsf24cb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150222.1440",
         "deps": []
@@ -44733,7 +44961,7 @@
         },
         "recipe": {
             "sha256": "1fik32635caq3r5f9k62qbj2dkwczz2z1v28mc7bcj7jv2p93nvh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151029.855",
         "deps": []
@@ -44748,7 +44976,7 @@
         },
         "recipe": {
             "sha256": "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151127.1135",
         "deps": [
@@ -44765,7 +44993,7 @@
         },
         "recipe": {
             "sha256": "15kgn0wrnbh666kchijdlssf2gp7spgbymr2nwgv6k730cb4mfa8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140129.204",
         "deps": [
@@ -44783,7 +45011,7 @@
         },
         "recipe": {
             "sha256": "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151209.714",
         "deps": [
@@ -44804,7 +45032,7 @@
         },
         "recipe": {
             "sha256": "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150220.505",
         "deps": [
@@ -44822,7 +45050,7 @@
         },
         "recipe": {
             "sha256": "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140525.547",
         "deps": [
@@ -44840,7 +45068,7 @@
         },
         "recipe": {
             "sha256": "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140314.1308",
         "deps": [
@@ -44857,7 +45085,7 @@
         },
         "recipe": {
             "sha256": "1nam7xzw8hrykz73q9x24szpjv2kpkp48lcmzf02kzj3cg6l76qm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130220.603",
         "deps": []
@@ -44872,7 +45100,7 @@
         },
         "recipe": {
             "sha256": "0b2lflji955z90xl9iz2y1vm04yljghbw4948gh5vv5p7mwibgf2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120622.937",
         "deps": []
@@ -44887,7 +45115,7 @@
         },
         "recipe": {
             "sha256": "1drafwf4kqp83jp47j2ddl2n4a92zf1589fnp6c72hmjqcxv3l28",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140128.1601",
         "deps": []
@@ -44902,7 +45130,7 @@
         },
         "recipe": {
             "sha256": "0g3wqv1yw3jycq30mcj3w4sn9nj6i6gyd2ljzimf547ggcai536a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150515.947",
         "deps": []
@@ -44917,7 +45145,7 @@
         },
         "recipe": {
             "sha256": "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150428.1621",
         "deps": []
@@ -44932,7 +45160,7 @@
         },
         "recipe": {
             "sha256": "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131117.1802",
         "deps": []
@@ -44945,7 +45173,7 @@
         },
         "recipe": {
             "sha256": "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20121128.243",
         "deps": []
@@ -44955,14 +45183,14 @@
             "tag": "fetchFromGitHub",
             "owner": "magit",
             "repo": "magit",
-            "sha256": "0hy9a1rjl3vs6ysb2913li1zim7wcziaiv609g7dadfyl89c2d4v",
-            "rev": "6b595ac224f512cf672c56600e136714875a940f"
+            "sha256": "1wgy1rkaanqf382m7ijy90gpaiz2049mrmwlvwkr3hw3vgkffar8",
+            "rev": "c650d164a94adcd123ed28da7d413aee76cc9fe7"
         },
         "recipe": {
             "sha256": "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151214.705",
+        "version": "20151223.1541",
         "deps": [
             "async",
             "dash",
@@ -44979,7 +45207,7 @@
         },
         "recipe": {
             "sha256": "0dygdd24flbgqp049sl4p8rymvv8h881hz9lvz8hnfwq687yyclx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140123.316",
         "deps": []
@@ -44994,7 +45222,7 @@
         },
         "recipe": {
             "sha256": "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150713.1550",
         "deps": [
@@ -45006,14 +45234,14 @@
             "tag": "fetchFromGitHub",
             "owner": "milkypostman",
             "repo": "melpa",
-            "sha256": "0mcxx69bspym4i9ky2ms9alj3a2015853s8qg86gwzyr49v0xfvz",
-            "rev": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "1linipac2qg8905qmgyr8lgjgv30mlwyib52r0k3kjpha6wcmniq",
+            "rev": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "recipe": {
             "sha256": "1m245q81c2jifgqxwd2fi35jrcbf6v9a1a5zy815861avq3fg9g0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151211.1644",
+        "version": "20151224.1137",
         "deps": [
             "cl-lib"
         ]
@@ -45028,7 +45256,7 @@
         },
         "recipe": {
             "sha256": "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150508.1757",
         "deps": []
@@ -45043,7 +45271,7 @@
         },
         "recipe": {
             "sha256": "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151014.151",
         "deps": [
@@ -45062,7 +45290,7 @@
         },
         "recipe": {
             "sha256": "0dql9qsl5gj51i3l2grl7nhw0ign8h4xa4jnhwn196j71c0rdwwp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131015.725",
         "deps": [
@@ -45079,7 +45307,7 @@
         },
         "recipe": {
             "sha256": "1300ch6f8mkz45na1hdffglhw0cdrrxmwnbd3g4m3sl5z4midian",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150827.2151",
         "deps": [
@@ -45094,7 +45322,7 @@
         },
         "recipe": {
             "sha256": "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.707",
         "deps": []
@@ -45109,7 +45337,7 @@
         },
         "recipe": {
             "sha256": "0vp8am2x11abxganw90025w9qxnqjdkj015592glbbzpa6338nfl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140126.301",
         "deps": []
@@ -45124,7 +45352,7 @@
         },
         "recipe": {
             "sha256": "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140112.559",
         "deps": []
@@ -45139,7 +45367,7 @@
         },
         "recipe": {
             "sha256": "1yilsdsyxlzmh64dpzirzga9c7lhp1phps9cdgp2898zpnzaclay",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130419.2254",
         "deps": []
@@ -45153,7 +45381,7 @@
         },
         "recipe": {
             "sha256": "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150314.944",
         "deps": []
@@ -45168,7 +45396,7 @@
         },
         "recipe": {
             "sha256": "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151118.1500",
         "deps": []
@@ -45183,7 +45411,7 @@
         },
         "recipe": {
             "sha256": "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151203.147",
         "deps": [
@@ -45202,7 +45430,7 @@
         },
         "recipe": {
             "sha256": "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150924.1111",
         "deps": [
@@ -45219,7 +45447,7 @@
         },
         "recipe": {
             "sha256": "1ng81b5f8w2s9mm9s7h5kwyx8fdwndnlsbzx50slmqyaz2ad15mx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150421.1522",
         "deps": [
@@ -45238,7 +45466,7 @@
         },
         "recipe": {
             "sha256": "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130122.1522",
         "deps": []
@@ -45253,7 +45481,7 @@
         },
         "recipe": {
             "sha256": "0rvdb1lx9xn9drqw0sw9ih759n10g7k0af39w6n8g0wfr67p96w1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151001.221",
         "deps": []
@@ -45263,14 +45491,14 @@
             "tag": "fetchFromGitHub",
             "owner": "tmalsburg",
             "repo": "helm-bibtex",
-            "sha256": "1nvc4ha9wj5j47qg7hdbv1xpjy8a8idc9vc2myl3xa33ywllwdwi",
-            "rev": "bfcd5064dcc7c0ac62c46985832b2a73082f96e0"
+            "sha256": "1z38lssfjxan65p6y4lw1yyrnv41da2rmhmr43rnqv9rl1k68x8d",
+            "rev": "0475ffd145e2de5ee78691a364d2a0361c6483e2"
         },
         "recipe": {
             "sha256": "1rsplnh18w1fqr6da79vj8x9q2lyss9sssy8pfz3hfw7p6qi6zkg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151125.1758",
+        "version": "20151223.52",
         "deps": [
             "cl-lib",
             "dash",
@@ -45290,7 +45518,7 @@
         },
         "recipe": {
             "sha256": "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141219.1046",
         "deps": []
@@ -45303,7 +45531,7 @@
         },
         "recipe": {
             "sha256": "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150104.1748",
         "deps": []
@@ -45318,7 +45546,7 @@
         },
         "recipe": {
             "sha256": "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150218.55",
         "deps": [
@@ -45336,7 +45564,7 @@
         },
         "recipe": {
             "sha256": "1gf3vs3vrp5kbq4ixnj7adazmnqixi63qswgc2512p10gf7inf8p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150405.214",
         "deps": [
@@ -45353,7 +45581,7 @@
         },
         "recipe": {
             "sha256": "1a8qqwdc0gw6m1xsnwrj3xldp05p7pabyj6l4bccpg3vf5wbgkn5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151130.958",
         "deps": []
@@ -45368,7 +45596,7 @@
         },
         "recipe": {
             "sha256": "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150328.1928",
         "deps": []
@@ -45383,7 +45611,7 @@
         },
         "recipe": {
             "sha256": "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151105.240",
         "deps": [
@@ -45400,7 +45628,7 @@
         },
         "recipe": {
             "sha256": "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150516.1633",
         "deps": []
@@ -45415,7 +45643,7 @@
         },
         "recipe": {
             "sha256": "0rb4f4llc4z502znmmc0hfi7n07lp01msx4y1iyqijvqzlq2i93y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140401.203",
         "deps": []
@@ -45430,7 +45658,7 @@
         },
         "recipe": {
             "sha256": "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151202.2204",
         "deps": [
@@ -45447,7 +45675,7 @@
         },
         "recipe": {
             "sha256": "1q42pvrpmd525887iicd3m5gw4w2a78xb72v7fjfl30ay1kir4bm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141203.932",
         "deps": [
@@ -45465,7 +45693,7 @@
         },
         "recipe": {
             "sha256": "0cnj7b0s8vc83sh9sai1cldw54krk5qbz1qmlvvd1whryf2pc95c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141204.1156",
         "deps": []
@@ -45479,7 +45707,7 @@
         },
         "recipe": {
             "sha256": "1sif2ayb8fq5vjz9lpkaq40aw9wiciz84yipab2qczszlgw1l1hb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150930.1117",
         "deps": []
@@ -45494,7 +45722,7 @@
         },
         "recipe": {
             "sha256": "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140827.32",
         "deps": [
@@ -45512,7 +45740,7 @@
         },
         "recipe": {
             "sha256": "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151209.1400",
         "deps": [
@@ -45531,7 +45759,7 @@
         },
         "recipe": {
             "sha256": "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141128.1611",
         "deps": [
@@ -45547,7 +45775,7 @@
         },
         "recipe": {
             "sha256": "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130328.527",
         "deps": []
@@ -45562,7 +45790,7 @@
         },
         "recipe": {
             "sha256": "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151101.56",
         "deps": [
@@ -45579,7 +45807,7 @@
         },
         "recipe": {
             "sha256": "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151025.1420",
         "deps": []
@@ -45589,12 +45817,12 @@
             "tag": "fetchFromGitHub",
             "owner": "cython",
             "repo": "cython",
-            "sha256": "1kz96n6p4kspzhgaa30l3hzv5b37vf32ww715r30g68188ngcjmg",
-            "rev": "0c62e665c02b438be331e445bbde2f1c6bd9dff0"
+            "sha256": "1s26yr506b4v9bfrmqp2wyjdhxkc63nhis5azi9yhd0hg56nlyaq",
+            "rev": "20f028eb00b6b52083975aaa6738852b8840b497"
         },
         "recipe": {
             "sha256": "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140705.1429",
         "deps": []
@@ -45609,7 +45837,7 @@
         },
         "recipe": {
             "sha256": "15z8l3adw8il0simk8phjgksh0v88cffb6gg3hv8a7nf5bla43my",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140330.1056",
         "deps": []
@@ -45624,7 +45852,7 @@
         },
         "recipe": {
             "sha256": "0069hwy5cyrsv5b1yvjhmjasywbmc8x3daq9hkzidy3a2fmqgqv3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150921.1950",
         "deps": [
@@ -45642,7 +45870,7 @@
         },
         "recipe": {
             "sha256": "0n8m325jcjhz8g75ysb9whsd12gpxw8598y5065j7c7gxjzv45l1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140723.37",
         "deps": []
@@ -45652,14 +45880,14 @@
             "tag": "fetchFromGitHub",
             "owner": "clojure-emacs",
             "repo": "cider",
-            "sha256": "0gm9pqxi9jz615ws6vic58fq0620pa1zr3xgvx6mh7k1y2jfbljz",
-            "rev": "a80215f160c2243722039a2b484823042dfab63d"
+            "sha256": "16f17jl94g5zvjayigkbr70mslg1mrk666aqjwiwqc8mg71h05h7",
+            "rev": "d191f8b364558cafec147d96d3e0415e18ad28bd"
         },
         "recipe": {
             "sha256": "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151217.1352",
+        "version": "20151227.936",
         "deps": [
             "clojure-mode",
             "emacs",
@@ -45677,7 +45905,7 @@
         },
         "recipe": {
             "sha256": "1iirrpa4rnz7rm85yjg60vdfca1ipxbk3qkld8lgwwm242pvvkw3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130130.1551",
         "deps": []
@@ -45690,7 +45918,7 @@
         },
         "recipe": {
             "sha256": "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20051013.1256",
         "deps": []
@@ -45705,7 +45933,7 @@
         },
         "recipe": {
             "sha256": "10sfbri5hv5hyx9jc1bzlk4qmzfmpfgfy8wkjkpv7lv2x0axqd8a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150124.1116",
         "deps": [
@@ -45722,7 +45950,7 @@
         },
         "recipe": {
             "sha256": "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150729.2235",
         "deps": [
@@ -45741,7 +45969,7 @@
         },
         "recipe": {
             "sha256": "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20120211.857",
         "deps": []
@@ -45754,7 +45982,7 @@
         },
         "recipe": {
             "sha256": "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.700",
         "deps": []
@@ -45769,7 +45997,7 @@
         },
         "recipe": {
             "sha256": "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150427.547",
         "deps": [
@@ -45777,24 +46005,6 @@
             "emacs"
         ]
     },
-    "traad-autocomplete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "traad",
-            "sha256": "06pvsa6m8h9j6mrq10dm6zj5jqibcm1xf3s1wkh7l6sr6hziz8rz",
-            "rev": "022cda646ec9b7102c73899e6305bfdfc0402ba5"
-        },
-        "recipe": {
-            "sha256": "0psk4gb903slcsppgplawz6gsv1w1nw1vqj4y0rfql6rxnbl3jf2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "20140817.611",
-        "deps": [
-            "auto-complete",
-            "traad"
-        ]
-    },
     "xah-find": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -45805,7 +46015,7 @@
         },
         "recipe": {
             "sha256": "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151214.1257",
         "deps": []
@@ -45820,7 +46030,7 @@
         },
         "recipe": {
             "sha256": "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150905.1024",
         "deps": [
@@ -45829,6 +46039,24 @@
             "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",
@@ -45839,7 +46067,7 @@
         },
         "recipe": {
             "sha256": "17l05m1lg0vmahh53b2lvw316y4z7jz3nmy0zyiyiygax313y42l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130923.1454",
         "deps": []
@@ -45854,7 +46082,7 @@
         },
         "recipe": {
             "sha256": "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150303.228",
         "deps": [
@@ -45876,7 +46104,7 @@
         },
         "recipe": {
             "sha256": "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150906.1154",
         "deps": [
@@ -45889,12 +46117,12 @@
             "tag": "fetchFromGitHub",
             "owner": "clojure-emacs",
             "repo": "clojure-mode",
-            "sha256": "0mc5g44vfb8w0mhj518yxik6dg55w17vrldcw86ajhw05fww3h3n",
-            "rev": "802c1dbf3529da5a09f97cb21833e0a27ccf41d7"
+            "sha256": "130s55mwzmi1almjajfl5bv3jra9ccafsiv240ls4agqkq2702vv",
+            "rev": "22b6709a651cc9c38a0c2a4c42df500ec3e46f1b"
         },
         "recipe": {
             "sha256": "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150110.705",
         "deps": [
@@ -45911,7 +46139,7 @@
         },
         "recipe": {
             "sha256": "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130524.643",
         "deps": []
@@ -45926,7 +46154,7 @@
         },
         "recipe": {
             "sha256": "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151217.757",
         "deps": [
@@ -45943,7 +46171,7 @@
         },
         "recipe": {
             "sha256": "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151112.717",
         "deps": [
@@ -45961,7 +46189,7 @@
         },
         "recipe": {
             "sha256": "1a9iy6x4lkm4wgkcb0pv86c2kvpq8ymrc4ssp109r67kwqw7lrr6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130822.48",
         "deps": []
@@ -45976,7 +46204,7 @@
         },
         "recipe": {
             "sha256": "0csi70v89bqdpbsizji6c5z0jmkx4x4vk1zfclkpap4dalmxxcsh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150728.1204",
         "deps": []
@@ -45991,7 +46219,7 @@
         },
         "recipe": {
             "sha256": "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150614.957",
         "deps": [
@@ -46010,7 +46238,7 @@
         },
         "recipe": {
             "sha256": "1qndhchc8y27x49znhnc4rny1ynfcplr64rczrlbj53qmkxn5am7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140928.713",
         "deps": []
@@ -46025,7 +46253,7 @@
         },
         "recipe": {
             "sha256": "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151108.2352",
         "deps": [
@@ -46042,7 +46270,7 @@
         },
         "recipe": {
             "sha256": "0bz6iw73d85bi12qqx6fdw3paqknrxvn0asbwjmgdcrlqrfczjlr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150406.2202",
         "deps": []
@@ -46057,7 +46285,7 @@
         },
         "recipe": {
             "sha256": "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151030.232",
         "deps": [
@@ -46076,7 +46304,7 @@
         },
         "recipe": {
             "sha256": "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20131112.214",
         "deps": []
@@ -46091,7 +46319,7 @@
         },
         "recipe": {
             "sha256": "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151109.603",
         "deps": [
@@ -46110,7 +46338,7 @@
         },
         "recipe": {
             "sha256": "0chqiai7fv1idga71gc5dw4rdv1rblg5rrbdijh3glyi8yfr4snf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130413.419",
         "deps": []
@@ -46125,7 +46353,7 @@
         },
         "recipe": {
             "sha256": "191ikqns1sxcz6ca6xp6mb2vyfj19x19cmcf17snrf46kmx60qk9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140326.550",
         "deps": []
@@ -46140,7 +46368,7 @@
         },
         "recipe": {
             "sha256": "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140810.717",
         "deps": [
@@ -46157,7 +46385,7 @@
         },
         "recipe": {
             "sha256": "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140316.617",
         "deps": []
@@ -46166,14 +46394,14 @@
         "fetch": {
             "tag": "fetchgit",
             "url": "git://jblevins.org/git/markdown-mode.git",
-            "sha256": "b74db7308411036038e060cca7dbf6e1a6b839cc81b40dc439cfee54540f9c67",
-            "rev": "1c76d45ae30bba1e8d68b2500d0531c69dd1472d"
+            "sha256": "715de106b5be4b78b091ab76d70961e9232ee35f88673f55f5bfd01da6102e17",
+            "rev": "5a83366cc8e33f4a50f6283fb2cd0c3519d8577a"
         },
         "recipe": {
             "sha256": "02lmhihv495drv9cb40h6l0xsbx7yglbvsdzc4r0vf78j87rs33f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "20151218.1349",
+        "version": "20151224.1008",
         "deps": []
     },
     "sphinx-doc": {
@@ -46186,7 +46414,7 @@
         },
         "recipe": {
             "sha256": "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150616.1350",
         "deps": [
@@ -46205,7 +46433,7 @@
         },
         "recipe": {
             "sha256": "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151126.324",
         "deps": [
@@ -46224,7 +46452,7 @@
         },
         "recipe": {
             "sha256": "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151119.1038",
         "deps": [
@@ -46241,7 +46469,7 @@
         },
         "recipe": {
             "sha256": "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150410.2025",
         "deps": []
@@ -46256,7 +46484,7 @@
         },
         "recipe": {
             "sha256": "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150418.900",
         "deps": [
@@ -46274,7 +46502,7 @@
         },
         "recipe": {
             "sha256": "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150511.2247",
         "deps": [
@@ -46289,7 +46517,7 @@
         },
         "recipe": {
             "sha256": "1390vl3i4qbnl7lbia98wznhf6x887d24f8p7146fpqjsiwbm5ck",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130824.658",
         "deps": []
@@ -46304,7 +46532,7 @@
         },
         "recipe": {
             "sha256": "0nljybh2pw8pbbajfsz57r11rs4bvzfxmwpbm5qrdn6dzzv65nq3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151123.1327",
         "deps": [
@@ -46321,7 +46549,7 @@
         },
         "recipe": {
             "sha256": "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140405.1827",
         "deps": [
@@ -46338,7 +46566,7 @@
         },
         "recipe": {
             "sha256": "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140426.1204",
         "deps": []
@@ -46348,12 +46576,12 @@
             "tag": "fetchFromGitHub",
             "owner": "abingham",
             "repo": "emacs-ycmd",
-            "sha256": "09h7k4dir6rpcaarv8k69szssy8iyj67g44zpbgph9yp9cvfm9yx",
-            "rev": "b801275e0cc9e0a70d78c61e3fb8ed6b3bbb0c93"
+            "sha256": "1lydq43xn51m4dwvv3qzrcsqw7dwbhxz4rinqx4m9y81caqakssx",
+            "rev": "3005b49176ff3315ba4cc7893fff42ce034d6e80"
         },
         "recipe": {
             "sha256": "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151022.1210",
         "deps": [
@@ -46374,7 +46602,7 @@
         },
         "recipe": {
             "sha256": "15s6qjhrrqrhm87vmvd6akdclzba19613im85kfkhc24p6nxyhbn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150204.508",
         "deps": []
@@ -46389,7 +46617,7 @@
         },
         "recipe": {
             "sha256": "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20141216.1719",
         "deps": [

From 74a1b201080d98f427318765d09955ad684c0ca2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 27 Dec 2015 10:35:34 -0600
Subject: [PATCH 085/249] melpa-stable-packages 2015-12-27

---
 .../emacs-modes/melpa-stable-packages.json    | 5925 +++++------------
 1 file changed, 1502 insertions(+), 4423 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.json b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.json
index bc8c2fd0b0d..ca70c6e6b37 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.json
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.json
@@ -9,7 +9,7 @@
         },
         "recipe": {
             "sha256": "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": []
@@ -24,25 +24,11 @@
         },
         "recipe": {
             "sha256": "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0",
         "deps": []
     },
-    "cg": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs",
-            "sha256": "1v8wgm3cvz4xx2jlx95ipd9340mxfxgk5hqialp76y74x03vfzq1",
-            "rev": "11156"
-        },
-        "recipe": {
-            "sha256": "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "helm-ls-hg": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -53,7 +39,7 @@
         },
         "recipe": {
             "sha256": "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.7.8",
         "deps": [
@@ -70,7 +56,7 @@
         },
         "recipe": {
             "sha256": "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.16",
         "deps": []
@@ -85,7 +71,7 @@
         },
         "recipe": {
             "sha256": "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -103,7 +89,7 @@
         },
         "recipe": {
             "sha256": "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.2",
         "deps": []
@@ -118,7 +104,7 @@
         },
         "recipe": {
             "sha256": "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -138,7 +124,7 @@
         },
         "recipe": {
             "sha256": "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.0",
         "deps": [
@@ -147,19 +133,6 @@
             "finalize"
         ]
     },
-    "help-fns+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/help-fns+.el",
-            "sha256": "00x3ln7x4d6r422x845smf3h0x1z85l5jqyjkrllqcs7qijcrk5w"
-        },
-        "recipe": {
-            "sha256": "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "cmake-ide": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -170,7 +143,7 @@
         },
         "recipe": {
             "sha256": "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -187,26 +160,11 @@
         },
         "recipe": {
             "sha256": "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": []
     },
-    "dired-sort-menu+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired-sort-menu+.el",
-            "sha256": "0l19xa7z4015lqw98dzb5i40na32758wxyfka2vdhn7g5iq7qday"
-        },
-        "recipe": {
-            "sha256": "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "dired-sort-menu"
-        ]
-    },
     "go-eldoc": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -217,7 +175,7 @@
         },
         "recipe": {
             "sha256": "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.26",
         "deps": [
@@ -225,19 +183,6 @@
             "go-mode"
         ]
     },
-    "w32browser-dlgopen": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/w32browser-dlgopen.el",
-            "sha256": "15cjfr8fknlp61mqz6377d4pprv3pddhiqqdhk1lsz2mncw8z9mq"
-        },
-        "recipe": {
-            "sha256": "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "cerbere": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -248,7 +193,7 @@
         },
         "recipe": {
             "sha256": "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -268,24 +213,11 @@
         },
         "recipe": {
             "sha256": "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
     },
-    "lacarte": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/lacarte.el",
-            "sha256": "1nlras4g3ncp1pcmkkpa2j88zvqjibmn5h6ilahgjry0dwg9qw5j"
-        },
-        "recipe": {
-            "sha256": "0a0n1lqakgsbz0scn6617rkkkvzwranzlvkzw9q4zapiz1s9xqp9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "mmt": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -296,7 +228,7 @@
         },
         "recipe": {
             "sha256": "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -314,7 +246,7 @@
         },
         "recipe": {
             "sha256": "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": [
@@ -333,7 +265,7 @@
         },
         "recipe": {
             "sha256": "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.5",
         "deps": [
@@ -350,7 +282,7 @@
         },
         "recipe": {
             "sha256": "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -365,7 +297,7 @@
         },
         "recipe": {
             "sha256": "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.1",
         "deps": [
@@ -383,7 +315,7 @@
         },
         "recipe": {
             "sha256": "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5",
         "deps": [
@@ -400,7 +332,7 @@
         },
         "recipe": {
             "sha256": "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -415,7 +347,7 @@
         },
         "recipe": {
             "sha256": "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.9",
         "deps": [
@@ -434,7 +366,7 @@
         },
         "recipe": {
             "sha256": "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -449,7 +381,7 @@
         },
         "recipe": {
             "sha256": "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.41",
         "deps": [
@@ -469,7 +401,7 @@
         },
         "recipe": {
             "sha256": "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.1",
         "deps": [
@@ -488,7 +420,7 @@
         },
         "recipe": {
             "sha256": "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.0",
         "deps": [
@@ -506,7 +438,7 @@
         },
         "recipe": {
             "sha256": "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -523,7 +455,7 @@
         },
         "recipe": {
             "sha256": "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.63",
         "deps": [
@@ -540,7 +472,7 @@
         },
         "recipe": {
             "sha256": "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.1",
         "deps": []
@@ -555,7 +487,7 @@
         },
         "recipe": {
             "sha256": "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.2",
         "deps": [
@@ -572,7 +504,7 @@
         },
         "recipe": {
             "sha256": "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -589,7 +521,7 @@
         },
         "recipe": {
             "sha256": "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.10",
         "deps": []
@@ -604,7 +536,7 @@
         },
         "recipe": {
             "sha256": "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -622,7 +554,7 @@
         },
         "recipe": {
             "sha256": "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -642,7 +574,7 @@
         },
         "recipe": {
             "sha256": "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": [
@@ -659,7 +591,7 @@
         },
         "recipe": {
             "sha256": "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -677,7 +609,7 @@
         },
         "recipe": {
             "sha256": "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.3",
         "deps": [
@@ -687,19 +619,6 @@
             "s"
         ]
     },
-    "lib-requires": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/lib-requires.el",
-            "sha256": "1s6969kz6hpgjdm3xp18ik116nji43md7vbya600cmq48njk44nk"
-        },
-        "recipe": {
-            "sha256": "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "charmap": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -710,7 +629,7 @@
         },
         "recipe": {
             "sha256": "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": []
@@ -725,7 +644,7 @@
         },
         "recipe": {
             "sha256": "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.5",
         "deps": [
@@ -742,7 +661,7 @@
         },
         "recipe": {
             "sha256": "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "5.4.3",
         "deps": [
@@ -759,7 +678,7 @@
         },
         "recipe": {
             "sha256": "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
@@ -774,7 +693,7 @@
         },
         "recipe": {
             "sha256": "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.2.2",
         "deps": [
@@ -791,7 +710,7 @@
         },
         "recipe": {
             "sha256": "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4.3",
         "deps": [
@@ -810,7 +729,7 @@
         },
         "recipe": {
             "sha256": "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2",
         "deps": [
@@ -830,7 +749,7 @@
         },
         "recipe": {
             "sha256": "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.1",
         "deps": [
@@ -851,9 +770,9 @@
         },
         "recipe": {
             "sha256": "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "2_24",
+        "version": "2.24",
         "deps": []
     },
     "quickrun": {
@@ -866,7 +785,7 @@
         },
         "recipe": {
             "sha256": "1szgirakfnkn9ksls16p233sr7x9ck5m1f1kbk6ancj36yja2nki",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.2.6",
         "deps": [
@@ -884,7 +803,7 @@
         },
         "recipe": {
             "sha256": "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": []
@@ -899,7 +818,7 @@
         },
         "recipe": {
             "sha256": "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.4",
         "deps": [
@@ -916,7 +835,7 @@
         },
         "recipe": {
             "sha256": "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.7",
         "deps": [
@@ -936,24 +855,11 @@
         },
         "recipe": {
             "sha256": "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.4",
         "deps": []
     },
-    "sentence-highlight": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/sentence-highlight.el",
-            "sha256": "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k"
-        },
-        "recipe": {
-            "sha256": "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "pkgbuild-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -964,7 +870,7 @@
         },
         "recipe": {
             "sha256": "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.14",
         "deps": []
@@ -979,9 +885,9 @@
         },
         "recipe": {
             "sha256": "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0Alpha",
+        "version": "0alpha",
         "deps": [
             "erc"
         ]
@@ -996,9 +902,9 @@
         },
         "recipe": {
             "sha256": "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.1.0",
+        "version": "0.1",
         "deps": [
             "popup"
         ]
@@ -1013,7 +919,7 @@
         },
         "recipe": {
             "sha256": "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -1032,7 +938,7 @@
         },
         "recipe": {
             "sha256": "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.16",
         "deps": [
@@ -1050,7 +956,7 @@
         },
         "recipe": {
             "sha256": "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.5",
         "deps": [
@@ -1058,19 +964,6 @@
             "s"
         ]
     },
-    "help-mode+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/help-mode+.el",
-            "sha256": "1xnlb1sn52dzpwz2hx0wr34682cl83nar7qsacsn70z9h443a30j"
-        },
-        "recipe": {
-            "sha256": "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "discover-my-major": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -1081,7 +974,7 @@
         },
         "recipe": {
             "sha256": "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -1093,14 +986,14 @@
             "tag": "fetchFromGitHub",
             "owner": "emacs-helm",
             "repo": "helm",
-            "sha256": "1cl01rprns989k5gr89qjpa6sg0s2ndrsdcmcyszrnaisvz7im53",
-            "rev": "97e8ffaed3c5959e9c16e7a0e45cc0702218b2cc"
+            "sha256": "0awr4nvzgp1kckxqli1xw4pk16gc22i8hchin63fqvk0gllcy454",
+            "rev": "fe96a398aa09ed0d25f6782efa5833085aa63791"
         },
         "recipe": {
             "sha256": "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "1.9.0",
+        "version": "1.9.1",
         "deps": [
             "async",
             "cl-lib",
@@ -1118,7 +1011,7 @@
         },
         "recipe": {
             "sha256": "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -1135,7 +1028,7 @@
         },
         "recipe": {
             "sha256": "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": []
@@ -1150,26 +1043,13 @@
         },
         "recipe": {
             "sha256": "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
             "flycheck"
         ]
     },
-    "blank-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/blank-mode.el",
-            "sha256": "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv"
-        },
-        "recipe": {
-            "sha256": "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "sly-company": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -1179,8 +1059,8 @@
             "rev": "930e14fee9cdc837ae26299c7f5e379c53cee1af"
         },
         "recipe": {
-            "sha256": "034gnxmcdn1f9b08gs9r8ycbam4212ip1z4kmmpwgpl9zcq9z5kj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": [
@@ -1199,7 +1079,7 @@
         },
         "recipe": {
             "sha256": "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0",
         "deps": []
@@ -1214,7 +1094,7 @@
         },
         "recipe": {
             "sha256": "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": [
@@ -1231,7 +1111,7 @@
         },
         "recipe": {
             "sha256": "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.7",
         "deps": []
@@ -1246,7 +1126,7 @@
         },
         "recipe": {
             "sha256": "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -1261,26 +1141,13 @@
         },
         "recipe": {
             "sha256": "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
             "evil"
         ]
     },
-    "framemove": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/framemove.el",
-            "sha256": "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7"
-        },
-        "recipe": {
-            "sha256": "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "real-auto-save": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -1291,7 +1158,7 @@
         },
         "recipe": {
             "sha256": "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -1306,7 +1173,7 @@
         },
         "recipe": {
             "sha256": "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.5.2",
         "deps": [
@@ -1325,7 +1192,7 @@
         },
         "recipe": {
             "sha256": "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.0",
         "deps": []
@@ -1340,7 +1207,7 @@
         },
         "recipe": {
             "sha256": "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.0",
         "deps": [
@@ -1350,19 +1217,6 @@
             "yaxception"
         ]
     },
-    "isearch+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/isearch+.el",
-            "sha256": "1cg5rvc16ljncini13fpwmzfhp3zy9rd1jvdd3jxpdkqzw07rnc6"
-        },
-        "recipe": {
-            "sha256": "1rzlsf08nmc3p3vhpwbiy8cgnnl2c10xrnsr2rlpv0g2kxkrd69r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "espuds": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -1373,7 +1227,7 @@
         },
         "recipe": {
             "sha256": "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.3",
         "deps": [
@@ -1392,30 +1246,11 @@
         },
         "recipe": {
             "sha256": "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": []
     },
-    "persp-projectile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "projectile",
-            "sha256": "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf",
-            "rev": "1159110e83490f3b30d4d39e8c48022d3006900a"
-        },
-        "recipe": {
-            "sha256": "0bqq13rr1hc7rhmw37rbrwaz9flcv3hw3hx0k5b7y9zd3qndy2cj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "0.13.0",
-        "deps": [
-            "cl-lib",
-            "perspective",
-            "projectile"
-        ]
-    },
     "osx-location": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -1426,7 +1261,7 @@
         },
         "recipe": {
             "sha256": "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -1441,7 +1276,7 @@
         },
         "recipe": {
             "sha256": "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": [
@@ -1458,7 +1293,7 @@
         },
         "recipe": {
             "sha256": "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "5.4.0.0",
         "deps": [
@@ -1475,7 +1310,7 @@
         },
         "recipe": {
             "sha256": "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6.0",
         "deps": [
@@ -1492,7 +1327,7 @@
         },
         "recipe": {
             "sha256": "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.1",
         "deps": []
@@ -1507,24 +1342,11 @@
         },
         "recipe": {
             "sha256": "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.9.1",
         "deps": []
     },
-    "screenshot": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/screenshot.el",
-            "sha256": "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw"
-        },
-        "recipe": {
-            "sha256": "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "easy-repeat": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -1535,31 +1357,13 @@
         },
         "recipe": {
             "sha256": "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
             "emacs"
         ]
     },
-    "doremi-frm": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/doremi-frm.el",
-            "sha256": "0p2wcyb1cqa6b0lvrc83wj6xwl8gnmfg12k1q36scq2y430qbmdc"
-        },
-        "recipe": {
-            "sha256": "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "doremi",
-            "faces+",
-            "frame-fns",
-            "hexrgb"
-        ]
-    },
     "weblogger": {
         "fetch": {
             "tag": "fetchbzr",
@@ -1568,10 +1372,10 @@
             "rev": "38"
         },
         "recipe": {
-            "sha256": "17ccj602cp0lrs30rcp45g7fqb7k1l1hr9h8z4gh7rqs0n7z1jad",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "nil",
+        "version": "1.4.5",
         "deps": [
             "xml-rpc"
         ]
@@ -1586,7 +1390,7 @@
         },
         "recipe": {
             "sha256": "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.3",
         "deps": [
@@ -1595,32 +1399,6 @@
             "yaxception"
         ]
     },
-    "shell-command": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/shell-command.el",
-            "sha256": "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l"
-        },
-        "recipe": {
-            "sha256": "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "filesets+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/filesets+.el",
-            "sha256": "0vqmz5rac2fgry1mzg3hnp0w65x6va471f982g9i8fn70ws46ww2"
-        },
-        "recipe": {
-            "sha256": "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "find-file-in-project": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -1631,7 +1409,7 @@
         },
         "recipe": {
             "sha256": "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "4.5",
         "deps": [
@@ -1649,7 +1427,7 @@
         },
         "recipe": {
             "sha256": "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
@@ -1664,7 +1442,7 @@
         },
         "recipe": {
             "sha256": "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.1",
         "deps": [
@@ -1682,7 +1460,7 @@
         },
         "recipe": {
             "sha256": "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1",
         "deps": [
@@ -1700,7 +1478,7 @@
         },
         "recipe": {
             "sha256": "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.5",
         "deps": [
@@ -1717,7 +1495,7 @@
         },
         "recipe": {
             "sha256": "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.9",
         "deps": []
@@ -1732,26 +1510,11 @@
         },
         "recipe": {
             "sha256": "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.79",
         "deps": []
     },
-    "autofit-frame": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/autofit-frame.el",
-            "sha256": "14iajfdf59lc9ik6spv4sq3v0ji1dmhfl1zwhcz2bkypxlbg1v3s"
-        },
-        "recipe": {
-            "sha256": "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "fit-frame"
-        ]
-    },
     "narrowed-page-navigation": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -1762,7 +1525,7 @@
         },
         "recipe": {
             "sha256": "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -1780,7 +1543,7 @@
         },
         "recipe": {
             "sha256": "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6.2",
         "deps": []
@@ -1795,7 +1558,7 @@
         },
         "recipe": {
             "sha256": "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.1",
         "deps": [
@@ -1803,45 +1566,6 @@
             "helm"
         ]
     },
-    "bookmark+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/bookmark+.el",
-            "sha256": "1qp84qzywc9nzb8n6j6cl99g7z88355ypw2fr4vpwy6n863a4b7l"
-        },
-        "recipe": {
-            "sha256": "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "ert-expectations": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/ert-expectations.el",
-            "sha256": "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7"
-        },
-        "recipe": {
-            "sha256": "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "multi-eshell": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/multi-eshell.el",
-            "sha256": "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl"
-        },
-        "recipe": {
-            "sha256": "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "emoji-cheat-sheet-plus": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -1852,7 +1576,7 @@
         },
         "recipe": {
             "sha256": "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.1",
         "deps": [
@@ -1870,7 +1594,7 @@
         },
         "recipe": {
             "sha256": "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.4",
         "deps": [
@@ -1887,7 +1611,7 @@
         },
         "recipe": {
             "sha256": "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "7.1",
         "deps": [
@@ -1906,7 +1630,7 @@
         },
         "recipe": {
             "sha256": "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -1921,7 +1645,7 @@
         },
         "recipe": {
             "sha256": "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": []
@@ -1935,7 +1659,7 @@
         },
         "recipe": {
             "sha256": "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "24",
         "deps": []
@@ -1950,7 +1674,7 @@
         },
         "recipe": {
             "sha256": "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.2",
         "deps": [
@@ -1969,7 +1693,7 @@
         },
         "recipe": {
             "sha256": "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.26.0",
         "deps": [
@@ -1991,24 +1715,11 @@
         },
         "recipe": {
             "sha256": "1dcxqnzmvddk61dzmfx8vjbzd8m44lscr3pjdp3r7211zhwfk40n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
     },
-    "second-sel": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/second-sel.el",
-            "sha256": "0ar60sqzlyrhvlg0mxfbc8c824lqglq07gf8lccjabnpwilz3ksd"
-        },
-        "recipe": {
-            "sha256": "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ace-flyspell": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -2019,7 +1730,7 @@
         },
         "recipe": {
             "sha256": "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": [
@@ -2036,7 +1747,7 @@
         },
         "recipe": {
             "sha256": "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -2053,9 +1764,9 @@
         },
         "recipe": {
             "sha256": "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.09",
+        "version": "0.9",
         "deps": [
             "cl-lib",
             "popwin"
@@ -2071,7 +1782,7 @@
         },
         "recipe": {
             "sha256": "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -2093,24 +1804,11 @@
         },
         "recipe": {
             "sha256": "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": []
     },
-    "w32-browser": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/w32-browser.el",
-            "sha256": "1cpy3c0aj265wda9bz6b88i73mr9xi8gm1cp0q72ikhz43kszihx"
-        },
-        "recipe": {
-            "sha256": "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "miniedit": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -2121,7 +1819,7 @@
         },
         "recipe": {
             "sha256": "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0",
         "deps": []
@@ -2136,7 +1834,7 @@
         },
         "recipe": {
             "sha256": "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.2",
         "deps": [
@@ -2147,32 +1845,6 @@
             "s"
         ]
     },
-    "highlight-current-line": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/highlight-current-line.el",
-            "sha256": "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c"
-        },
-        "recipe": {
-            "sha256": "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "window+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/window+.el",
-            "sha256": "1mq8nrcypfm8na1qg0dykp6r1mfraix2jp1xc0lkx4wn620mp9cz"
-        },
-        "recipe": {
-            "sha256": "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "firestarter": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -2183,7 +1855,7 @@
         },
         "recipe": {
             "sha256": "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.4",
         "deps": []
@@ -2198,7 +1870,7 @@
         },
         "recipe": {
             "sha256": "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.4",
         "deps": [
@@ -2215,7 +1887,7 @@
         },
         "recipe": {
             "sha256": "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.1",
         "deps": [
@@ -2235,7 +1907,7 @@
         },
         "recipe": {
             "sha256": "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": []
@@ -2250,7 +1922,7 @@
         },
         "recipe": {
             "sha256": "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8.1",
         "deps": []
@@ -2265,7 +1937,7 @@
         },
         "recipe": {
             "sha256": "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.1",
         "deps": []
@@ -2280,24 +1952,11 @@
         },
         "recipe": {
             "sha256": "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
     },
-    "replace+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/replace+.el",
-            "sha256": "0hma5mb2r33yfdlwb1ls1gjnqps00sri6q0hkksngvz67hka9mx4"
-        },
-        "recipe": {
-            "sha256": "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "zotelo": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -2308,7 +1967,7 @@
         },
         "recipe": {
             "sha256": "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3",
         "deps": []
@@ -2323,7 +1982,7 @@
         },
         "recipe": {
             "sha256": "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.0",
         "deps": [
@@ -2341,7 +2000,7 @@
         },
         "recipe": {
             "sha256": "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.1",
         "deps": []
@@ -2356,37 +2015,11 @@
         },
         "recipe": {
             "sha256": "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.10",
         "deps": []
     },
-    "tool-bar+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/tool-bar+.el",
-            "sha256": "1ml95y7275yd2jn4zf96rg0pwxsv8vnwv52mvr9j0j9mqkw1d0d9"
-        },
-        "recipe": {
-            "sha256": "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "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": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "gradle-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -2397,26 +2030,13 @@
         },
         "recipe": {
             "sha256": "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.5",
         "deps": [
             "s"
         ]
     },
-    "redo+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/redo+.el",
-            "sha256": "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3"
-        },
-        "recipe": {
-            "sha256": "1alfs7k5mydgvzsjmdifcizqgrqjrk2kbh3mabai7nlrwi47w9n2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ess-R-data-view": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -2427,7 +2047,7 @@
         },
         "recipe": {
             "sha256": "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -2446,7 +2066,7 @@
         },
         "recipe": {
             "sha256": "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.7",
         "deps": []
@@ -2461,26 +2081,13 @@
         },
         "recipe": {
             "sha256": "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.0",
         "deps": [
             "request"
         ]
     },
-    "archive-region": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/archive-region.el",
-            "sha256": "1mhj6x0n2ya3xd7gykmkcf70ji5g8qd8xawz764ykdlcribpsq52"
-        },
-        "recipe": {
-            "sha256": "03x2fqhx4w0c7xd8x8zlnyzdwyay6r2yxf4jzgkcg87q7rqjk9nd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "kaesar": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -2491,7 +2098,7 @@
         },
         "recipe": {
             "sha256": "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.0",
         "deps": [
@@ -2508,7 +2115,7 @@
         },
         "recipe": {
             "sha256": "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.2",
         "deps": [
@@ -2525,7 +2132,7 @@
         },
         "recipe": {
             "sha256": "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -2544,7 +2151,7 @@
         },
         "recipe": {
             "sha256": "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": []
@@ -2559,7 +2166,7 @@
         },
         "recipe": {
             "sha256": "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -2580,7 +2187,7 @@
         },
         "recipe": {
             "sha256": "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.7.0",
         "deps": [
@@ -2601,14 +2208,14 @@
             "tag": "fetchFromGitHub",
             "owner": "masutaka",
             "repo": "emacs-helm-ghq",
-            "sha256": "0amdm0jcg5dxjfiid7q0llr2hffp02l0b0n5yhix8razvi7bhy2z",
-            "rev": "15621d1b2cd37c2ff0f73666c38acf7aae46bbc4"
+            "sha256": "0rlk9016rxj292kpxrnqgrm4xsjs4m4gk2fwh8z3fcihi013lxaw",
+            "rev": "2997646b2fb5421ab435b772dd2dbaeb92d70166"
         },
         "recipe": {
             "sha256": "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "1.5.0",
+        "version": "1.5.1",
         "deps": [
             "helm"
         ]
@@ -2622,7 +2229,7 @@
         },
         "recipe": {
             "sha256": "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -2637,7 +2244,7 @@
         },
         "recipe": {
             "sha256": "0snx0b8b4yc507q3i4fzvrd68xgzqxly8kn5cwp26ik6cv840y29",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5.1",
         "deps": [
@@ -2655,7 +2262,7 @@
         },
         "recipe": {
             "sha256": "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -2674,7 +2281,7 @@
         },
         "recipe": {
             "sha256": "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.3",
         "deps": []
@@ -2689,7 +2296,7 @@
         },
         "recipe": {
             "sha256": "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.16",
         "deps": [
@@ -2706,7 +2313,7 @@
         },
         "recipe": {
             "sha256": "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4.6",
         "deps": [
@@ -2723,7 +2330,7 @@
         },
         "recipe": {
             "sha256": "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "7.2.2",
         "deps": []
@@ -2738,7 +2345,7 @@
         },
         "recipe": {
             "sha256": "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -2755,7 +2362,7 @@
         },
         "recipe": {
             "sha256": "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.1",
         "deps": [
@@ -2772,24 +2379,11 @@
         },
         "recipe": {
             "sha256": "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
     },
-    "better-registers": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/better-registers.el",
-            "sha256": "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh"
-        },
-        "recipe": {
-            "sha256": "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "calfw": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -2800,7 +2394,7 @@
         },
         "recipe": {
             "sha256": "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5",
         "deps": [
@@ -2817,7 +2411,7 @@
         },
         "recipe": {
             "sha256": "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.45",
         "deps": [
@@ -2834,7 +2428,7 @@
         },
         "recipe": {
             "sha256": "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6",
         "deps": []
@@ -2849,7 +2443,7 @@
         },
         "recipe": {
             "sha256": "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.0",
         "deps": [
@@ -2867,7 +2461,7 @@
         },
         "recipe": {
             "sha256": "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "6.7",
         "deps": []
@@ -2882,7 +2476,7 @@
         },
         "recipe": {
             "sha256": "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -2902,7 +2496,7 @@
         },
         "recipe": {
             "sha256": "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -2917,7 +2511,7 @@
         },
         "recipe": {
             "sha256": "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.3",
         "deps": []
@@ -2927,14 +2521,14 @@
             "tag": "fetchFromGitHub",
             "owner": "DarwinAwardWinner",
             "repo": "ido-ubiquitous",
-            "sha256": "1fgg2l9fvg3iay9wgkfacbc0kl6hx7sbwxgmbl8j47vr6yzkgnd7",
-            "rev": "2e826e3f209cb5d2bc92bdbfd3b189d2c06ff51c"
+            "sha256": "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn",
+            "rev": "1a97a38f2d1a51371853e44da659caa6baf78cbe"
         },
         "recipe": {
             "sha256": "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "3.9",
+        "version": "3.10",
         "deps": [
             "cl-lib",
             "emacs"
@@ -2950,7 +2544,7 @@
         },
         "recipe": {
             "sha256": "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6.4",
         "deps": [
@@ -2969,7 +2563,7 @@
         },
         "recipe": {
             "sha256": "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.7",
         "deps": [
@@ -2986,7 +2580,7 @@
         },
         "recipe": {
             "sha256": "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -3001,7 +2595,7 @@
         },
         "recipe": {
             "sha256": "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -3019,7 +2613,7 @@
         },
         "recipe": {
             "sha256": "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": [
@@ -3036,7 +2630,7 @@
         },
         "recipe": {
             "sha256": "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -3049,14 +2643,14 @@
             "tag": "fetchFromGitHub",
             "owner": "masutaka",
             "repo": "emacs-helm-hatena-bookmark",
-            "sha256": "0254jcy6cb7m63lnkp5s97hyzr13xh1a1xykp96iirkgjfcg5xds",
-            "rev": "497d33632f195354eaa24670db0804c846b7261b"
+            "sha256": "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f",
+            "rev": "1ba352b858869a32323d4e6f9ca4b3eae055809e"
         },
         "recipe": {
             "sha256": "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "2.0.4",
+        "version": "2.1.0",
         "deps": [
             "helm"
         ]
@@ -3071,7 +2665,7 @@
         },
         "recipe": {
             "sha256": "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.0",
         "deps": [
@@ -3091,7 +2685,7 @@
         },
         "recipe": {
             "sha256": "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.12",
         "deps": []
@@ -3106,9 +2700,9 @@
         },
         "recipe": {
             "sha256": "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.99a",
+        "version": "0.99.1",
         "deps": [
             "emacs"
         ]
@@ -3123,29 +2717,14 @@
         },
         "recipe": {
             "sha256": "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.04",
+        "version": "0.4",
         "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": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "doremi"
-        ]
-    },
     "shampoo": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -3156,7 +2735,7 @@
         },
         "recipe": {
             "sha256": "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": []
@@ -3171,7 +2750,7 @@
         },
         "recipe": {
             "sha256": "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4",
         "deps": [
@@ -3191,24 +2770,11 @@
         },
         "recipe": {
             "sha256": "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.22",
         "deps": []
     },
-    "sticky": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/sticky.el",
-            "sha256": "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy"
-        },
-        "recipe": {
-            "sha256": "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ein": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -3219,7 +2785,7 @@
         },
         "recipe": {
             "sha256": "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": [
@@ -3237,7 +2803,7 @@
         },
         "recipe": {
             "sha256": "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -3255,7 +2821,7 @@
         },
         "recipe": {
             "sha256": "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
@@ -3270,24 +2836,11 @@
         },
         "recipe": {
             "sha256": "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
     },
-    "hexrgb": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hexrgb.el",
-            "sha256": "04maddrgvijimxc8i942h0f7448snqlgdsj3yc03izh6bimvkhk5"
-        },
-        "recipe": {
-            "sha256": "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "finalize": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -3298,7 +2851,7 @@
         },
         "recipe": {
             "sha256": "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -3317,7 +2870,7 @@
         },
         "recipe": {
             "sha256": "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": [
@@ -3334,7 +2887,7 @@
         },
         "recipe": {
             "sha256": "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": [
@@ -3352,9 +2905,9 @@
         },
         "recipe": {
             "sha256": "0b0cl2xj5w1r71zrjhnqhrzsnz1296jv21qx5adzslra6lk55q2r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.07",
+        "version": "0.7",
         "deps": [
             "cl-lib",
             "deferred",
@@ -3371,7 +2924,7 @@
         },
         "recipe": {
             "sha256": "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.7.5",
         "deps": [
@@ -3388,7 +2941,7 @@
         },
         "recipe": {
             "sha256": "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.4",
         "deps": []
@@ -3403,7 +2956,7 @@
         },
         "recipe": {
             "sha256": "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.4",
         "deps": []
@@ -3418,26 +2971,13 @@
         },
         "recipe": {
             "sha256": "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9",
         "deps": [
             "flymake-easy"
         ]
     },
-    "misc-fns": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/misc-fns.el",
-            "sha256": "1c46iwa6i08wsa0syrm0gxhyndrqlkmqpdj61rss7hbbf1066v86"
-        },
-        "recipe": {
-            "sha256": "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "flycheck-cask": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -3448,7 +2988,7 @@
         },
         "recipe": {
             "sha256": "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -3467,7 +3007,7 @@
         },
         "recipe": {
             "sha256": "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "5.1",
         "deps": []
@@ -3482,7 +3022,7 @@
         },
         "recipe": {
             "sha256": "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": [
@@ -3499,39 +3039,11 @@
         },
         "recipe": {
             "sha256": "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
     },
-    "dired-details+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired-details+.el",
-            "sha256": "119x9mclyhxfp2zr5rmh5jxl2h2wb82phbm8kvlkxa4kcwaiw04y"
-        },
-        "recipe": {
-            "sha256": "1gzr3z4nyzip299z08mignhigxr7drak7rv9z6gmdjrika9a29lx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "dired-details"
-        ]
-    },
-    "mouse3": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/mouse3.el",
-            "sha256": "1jxqvhfjsnjdp0c0zndj7p77vxfscs4z4s7csrd8gi9cli8pmgwi"
-        },
-        "recipe": {
-            "sha256": "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "unkillable-scratch": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -3542,7 +3054,7 @@
         },
         "recipe": {
             "sha256": "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -3557,7 +3069,7 @@
         },
         "recipe": {
             "sha256": "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -3572,7 +3084,7 @@
         },
         "recipe": {
             "sha256": "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -3589,37 +3101,11 @@
         },
         "recipe": {
             "sha256": "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
     },
-    "wc-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/wc-mode.el",
-            "sha256": "15wz0c0rsn02zl6yr8mpwzy2hvp2146krhdbjpq63l75w4i98w4d"
-        },
-        "recipe": {
-            "sha256": "0n9hc22rp18dxx33l2l1xla78m5zjybgh3mmsp91fbdiq92b446s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "csv-nav": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/csv-nav.el",
-            "sha256": "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva"
-        },
-        "recipe": {
-            "sha256": "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "grass-mode": {
         "fetch": {
             "tag": "fetchhg",
@@ -3629,7 +3115,7 @@
         },
         "recipe": {
             "sha256": "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -3647,7 +3133,7 @@
         },
         "recipe": {
             "sha256": "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -3664,7 +3150,7 @@
         },
         "recipe": {
             "sha256": "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.1",
         "deps": []
@@ -3679,7 +3165,7 @@
         },
         "recipe": {
             "sha256": "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.3",
         "deps": [
@@ -3697,7 +3183,7 @@
         },
         "recipe": {
             "sha256": "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -3715,7 +3201,7 @@
         },
         "recipe": {
             "sha256": "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -3732,7 +3218,7 @@
         },
         "recipe": {
             "sha256": "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": [
@@ -3756,7 +3242,7 @@
         },
         "recipe": {
             "sha256": "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.13",
         "deps": []
@@ -3771,7 +3257,7 @@
         },
         "recipe": {
             "sha256": "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.12",
         "deps": [
@@ -3790,7 +3276,7 @@
         },
         "recipe": {
             "sha256": "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -3809,7 +3295,7 @@
         },
         "recipe": {
             "sha256": "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -3824,26 +3310,11 @@
         },
         "recipe": {
             "sha256": "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
     },
-    "traad": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "traad",
-            "sha256": "1w2haj7grs4h9wiqkcpb28kl7zqlyba4pcgc07n1mvgksvnj729m",
-            "rev": "8852b4dc2b2113a1597301c0b03712b65f50747f"
-        },
-        "recipe": {
-            "sha256": "1ca965pjglbbi56m1s0hl8zxhbkaxa6ms51vvidzldvmzp8n7mw5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "0.4",
-        "deps": []
-    },
     "save-sexp": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -3854,7 +3325,7 @@
         },
         "recipe": {
             "sha256": "12jx47picdpw668q75qsp9gncrnxnlk1slhzvxsk5pvkdwh26h66",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
@@ -3869,7 +3340,7 @@
         },
         "recipe": {
             "sha256": "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.1",
         "deps": []
@@ -3884,24 +3355,11 @@
         },
         "recipe": {
             "sha256": "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
     },
-    "plsql": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/plsql.el",
-            "sha256": "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1"
-        },
-        "recipe": {
-            "sha256": "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ebal": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -3912,7 +3370,7 @@
         },
         "recipe": {
             "sha256": "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": [
@@ -3931,7 +3389,7 @@
         },
         "recipe": {
             "sha256": "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.2",
         "deps": [
@@ -3939,19 +3397,6 @@
             "emacs"
         ]
     },
-    "usage-memo": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/usage-memo.el",
-            "sha256": "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i"
-        },
-        "recipe": {
-            "sha256": "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "smartparens": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -3962,7 +3407,7 @@
         },
         "recipe": {
             "sha256": "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6.3",
         "deps": [
@@ -3980,7 +3425,7 @@
         },
         "recipe": {
             "sha256": "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.2",
         "deps": [
@@ -3998,7 +3443,7 @@
         },
         "recipe": {
             "sha256": "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -4013,7 +3458,7 @@
         },
         "recipe": {
             "sha256": "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -4031,7 +3476,7 @@
         },
         "recipe": {
             "sha256": "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -4048,7 +3493,7 @@
         },
         "recipe": {
             "sha256": "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -4063,24 +3508,11 @@
         },
         "recipe": {
             "sha256": "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": []
     },
-    "multi-term": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/multi-term.el",
-            "sha256": "062c52xd469jdmsq4fvdhsmgfjrlanv0bb1w5vglz7bsn68d2bim"
-        },
-        "recipe": {
-            "sha256": "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "hardcore-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -4091,7 +3523,7 @@
         },
         "recipe": {
             "sha256": "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -4106,7 +3538,7 @@
         },
         "recipe": {
             "sha256": "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": [
@@ -4123,7 +3555,7 @@
         },
         "recipe": {
             "sha256": "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": []
@@ -4138,7 +3570,7 @@
         },
         "recipe": {
             "sha256": "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.8",
         "deps": []
@@ -4153,7 +3585,7 @@
         },
         "recipe": {
             "sha256": "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.2.0",
         "deps": []
@@ -4168,7 +3600,7 @@
         },
         "recipe": {
             "sha256": "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.3",
         "deps": []
@@ -4183,7 +3615,7 @@
         },
         "recipe": {
             "sha256": "12yjl9hsd72dwzl42hdcmjfdbxyi356jcq0kz8k7jvcsn57z4p2k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.85",
         "deps": [
@@ -4191,19 +3623,6 @@
             "emacs"
         ]
     },
-    "highlight-cl": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/highlight-cl.el",
-            "sha256": "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw"
-        },
-        "recipe": {
-            "sha256": "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "stylus-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -4214,7 +3633,7 @@
         },
         "recipe": {
             "sha256": "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -4231,7 +3650,7 @@
         },
         "recipe": {
             "sha256": "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6",
         "deps": []
@@ -4246,7 +3665,7 @@
         },
         "recipe": {
             "sha256": "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.4",
         "deps": [
@@ -4269,7 +3688,7 @@
         },
         "recipe": {
             "sha256": "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.3",
         "deps": [
@@ -4287,7 +3706,7 @@
         },
         "recipe": {
             "sha256": "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.4",
         "deps": []
@@ -4302,26 +3721,13 @@
         },
         "recipe": {
             "sha256": "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.7",
         "deps": [
             "web-completion-data"
         ]
     },
-    "viewer": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/viewer.el",
-            "sha256": "0lns0ic3zjz1km02674d9hxgnp6wlhk168wyr6h4vhpr8a71x9mb"
-        },
-        "recipe": {
-            "sha256": "0aqwkymq5f0qfgs1hmcg1jb1rd0vcnlqwiyjrjjkfff2xlbpagqf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "gmail2bbdb": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -4332,7 +3738,7 @@
         },
         "recipe": {
             "sha256": "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.4",
         "deps": []
@@ -4347,7 +3753,7 @@
         },
         "recipe": {
             "sha256": "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.10",
         "deps": []
@@ -4362,7 +3768,7 @@
         },
         "recipe": {
             "sha256": "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": []
@@ -4376,7 +3782,7 @@
         },
         "recipe": {
             "sha256": "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.9",
         "deps": []
@@ -4391,7 +3797,7 @@
         },
         "recipe": {
             "sha256": "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.8",
         "deps": [
@@ -4408,7 +3814,7 @@
         },
         "recipe": {
             "sha256": "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "4.4.0",
         "deps": []
@@ -4422,8 +3828,8 @@
             "rev": "eef10fdde96a12528a6da32f51bf638b2863a3b1"
         },
         "recipe": {
-            "sha256": "0padz12mb6zv3jlprvnj9s5vyp2hx68cqb5v3z974zfg5ws9sy4c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150303",
         "deps": [
@@ -4440,24 +3846,11 @@
         },
         "recipe": {
             "sha256": "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.11.2",
         "deps": []
     },
-    "batch-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/batch-mode.el",
-            "sha256": "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p"
-        },
-        "recipe": {
-            "sha256": "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "puppet-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -4468,7 +3861,7 @@
         },
         "recipe": {
             "sha256": "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -4487,7 +3880,7 @@
         },
         "recipe": {
             "sha256": "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": [
@@ -4506,7 +3899,7 @@
         },
         "recipe": {
             "sha256": "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.8",
         "deps": [
@@ -4527,7 +3920,7 @@
         },
         "recipe": {
             "sha256": "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -4542,7 +3935,7 @@
         },
         "recipe": {
             "sha256": "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -4560,7 +3953,7 @@
         },
         "recipe": {
             "sha256": "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.2",
         "deps": [
@@ -4572,14 +3965,14 @@
             "tag": "fetchFromGitHub",
             "owner": "swannodette",
             "repo": "ob-sml",
-            "sha256": "0h3flg8plrjxlv57c8nknggj349l4xqfrbwzxa9yx46v2zxggn5b",
-            "rev": "09b503201be6e06a5ed8d6b52345dc886c202028"
+            "sha256": "1xx6hyq3gk4bavcx6i9bhipbn4mn5rv2ga9lryq09qgq2l9znclk",
+            "rev": "5dc966acbe65e9e158bfa90018035bf52d4dafd4"
         },
         "recipe": {
             "sha256": "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.02",
+        "version": "0.2",
         "deps": [
             "sml-mode"
         ]
@@ -4594,7 +3987,7 @@
         },
         "recipe": {
             "sha256": "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -4613,7 +4006,7 @@
         },
         "recipe": {
             "sha256": "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.2",
         "deps": [
@@ -4621,19 +4014,6 @@
             "markdown-mode"
         ]
     },
-    "modeline-posn": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/modeline-posn.el",
-            "sha256": "1c0pkk4jnpqs3r46yjh9srwy3ql6pkjv55m85w49kxvcflmipl9i"
-        },
-        "recipe": {
-            "sha256": "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "e2wm-direx": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -4644,7 +4024,7 @@
         },
         "recipe": {
             "sha256": "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.5",
         "deps": [
@@ -4652,33 +4032,6 @@
             "e2wm"
         ]
     },
-    "macros+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/macros+.el",
-            "sha256": "1nf8hgaig26plb7dbn81gw7q4dmnr5gh90lcm82aml8h8z5ab78q"
-        },
-        "recipe": {
-            "sha256": "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "ruby-electric": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://svn.ruby-lang.org/repos/ruby/trunk/misc/",
-            "sha256": "0gl8wcnm7pidvd8zy3w5lzxqj0qxs9d932350ncgnmxwfsfzkdk7",
-            "rev": "53195"
-        },
-        "recipe": {
-            "sha256": "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "multi-web-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -4689,7 +4042,7 @@
         },
         "recipe": {
             "sha256": "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": []
@@ -4703,7 +4056,7 @@
         },
         "recipe": {
             "sha256": "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.1",
         "deps": []
@@ -4718,7 +4071,7 @@
         },
         "recipe": {
             "sha256": "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -4735,7 +4088,7 @@
         },
         "recipe": {
             "sha256": "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -4750,7 +4103,7 @@
         },
         "recipe": {
             "sha256": "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.2",
         "deps": []
@@ -4765,7 +4118,7 @@
         },
         "recipe": {
             "sha256": "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.3",
         "deps": [
@@ -4782,7 +4135,7 @@
         },
         "recipe": {
             "sha256": "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.1",
         "deps": [
@@ -4799,7 +4152,7 @@
         },
         "recipe": {
             "sha256": "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.2",
         "deps": [
@@ -4817,7 +4170,7 @@
         },
         "recipe": {
             "sha256": "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.3",
         "deps": [
@@ -4835,7 +4188,7 @@
         },
         "recipe": {
             "sha256": "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": [
@@ -4852,24 +4205,11 @@
         },
         "recipe": {
             "sha256": "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3",
         "deps": []
     },
-    "bs-ext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/bs-ext.el",
-            "sha256": "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw"
-        },
-        "recipe": {
-            "sha256": "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "helm-migemo": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -4880,7 +4220,7 @@
         },
         "recipe": {
             "sha256": "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.22",
         "deps": [
@@ -4899,7 +4239,7 @@
         },
         "recipe": {
             "sha256": "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": []
@@ -4914,7 +4254,7 @@
         },
         "recipe": {
             "sha256": "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -4929,7 +4269,7 @@
         },
         "recipe": {
             "sha256": "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.7",
         "deps": [
@@ -4941,6 +4281,21 @@
             "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",
@@ -4951,7 +4306,7 @@
         },
         "recipe": {
             "sha256": "1gp523w11f0aa8mbrb8z6ykqmy6ihvnfs00ff906gdmjx5kk16sr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0",
         "deps": []
@@ -4966,7 +4321,7 @@
         },
         "recipe": {
             "sha256": "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -4981,7 +4336,7 @@
         },
         "recipe": {
             "sha256": "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -4996,7 +4351,7 @@
         },
         "recipe": {
             "sha256": "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": [
@@ -5014,26 +4369,13 @@
         },
         "recipe": {
             "sha256": "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.1",
         "deps": [
             "cl-lib"
         ]
     },
-    "smart-compile": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/smart-compile.el",
-            "sha256": "0sm4nxynwhwypzw008fz56axai9lrphjczwzfdy7da3akan18rbd"
-        },
-        "recipe": {
-            "sha256": "0vgxqyzl7jw2j96rmjw75b5lmjwrvzajrdvfyabss4xmv96dy2r3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "git-gutter-fringe+": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -5044,9 +4386,9 @@
         },
         "recipe": {
             "sha256": "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.01",
+        "version": "0.1",
         "deps": [
             "fringe-helper",
             "git-gutter+"
@@ -5062,26 +4404,11 @@
         },
         "recipe": {
             "sha256": "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
     },
-    "palette": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/palette.el",
-            "sha256": "13k1l2cs45fiwd0zayjfzxxrx1pqds3mkxrflmxy8y0piwx6mr1w"
-        },
-        "recipe": {
-            "sha256": "1v6dsph18rqfbvda2c25mqgdwap2a4zrg6qqq57n205zprpcwxc0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "hexrgb"
-        ]
-    },
     "egg": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -5092,24 +4419,11 @@
         },
         "recipe": {
             "sha256": "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.9",
         "deps": []
     },
-    "aok": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/aok.el",
-            "sha256": "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g"
-        },
-        "recipe": {
-            "sha256": "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "tern": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -5120,7 +4434,7 @@
         },
         "recipe": {
             "sha256": "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.16.0",
         "deps": [
@@ -5139,7 +4453,7 @@
         },
         "recipe": {
             "sha256": "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5.1",
         "deps": [
@@ -5152,14 +4466,14 @@
             "tag": "fetchFromGitHub",
             "owner": "chrisbarrett",
             "repo": "skeletor.el",
-            "sha256": "1f2yrm7kac98gfwbzlszcimnmp9cjv4k0aj8yidh7r0jn1xv45f8",
-            "rev": "253b89e199d0251e3eeb6b268fe60a3337fdf5bb"
+            "sha256": "101xn4glqi7b5vhdqqahj2ib4pm30pzq8sad7zagxw9csihcri3q",
+            "rev": "d986806559628623b591542143707de8d76347d0"
         },
         "recipe": {
             "sha256": "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "1.5.2",
+        "version": "1.6.1",
         "deps": [
             "cl-lib",
             "dash",
@@ -5179,7 +4493,7 @@
         },
         "recipe": {
             "sha256": "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": [
@@ -5197,13 +4511,32 @@
         },
         "recipe": {
             "sha256": "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -5214,7 +4547,7 @@
         },
         "recipe": {
             "sha256": "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.0",
         "deps": []
@@ -5229,7 +4562,7 @@
         },
         "recipe": {
             "sha256": "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.0",
         "deps": [
@@ -5248,7 +4581,7 @@
         },
         "recipe": {
             "sha256": "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -5266,7 +4599,7 @@
         },
         "recipe": {
             "sha256": "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -5281,7 +4614,7 @@
         },
         "recipe": {
             "sha256": "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150909",
         "deps": [
@@ -5289,19 +4622,6 @@
             "emacs"
         ]
     },
-    "zones": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/zones.el",
-            "sha256": "0fr6lbx62qa8acqa4s4wrg0nlga2pm3vy04j17wyhcxdjszan4yd"
-        },
-        "recipe": {
-            "sha256": "08sl7i7cy22nd1jijc5l7lp75k9z83gfr8q41n72l0vxrpdasc9w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "window-end-visible": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -5312,28 +4632,11 @@
         },
         "recipe": {
             "sha256": "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
     },
-    "dic-lookup-w3m": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://svn.sourceforge.jp/svnroot/dic-lookup-w3m/",
-            "sha256": "0lg6i9vw6xsnaamfjczz0cr41vlv1bs03h8c8y2jxpdkgaab31nc",
-            "rev": "79"
-        },
-        "recipe": {
-            "sha256": "0myv7sns9ajyr7fzn6kd8a64pfapjdksgby5ilh9mr99imm8dcfv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "stem",
-            "w3m"
-        ]
-    },
     "rbenv": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -5344,7 +4647,7 @@
         },
         "recipe": {
             "sha256": "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.3",
         "deps": []
@@ -5359,7 +4662,7 @@
         },
         "recipe": {
             "sha256": "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.1",
         "deps": [
@@ -5376,7 +4679,7 @@
         },
         "recipe": {
             "sha256": "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.14",
         "deps": [
@@ -5385,19 +4688,6 @@
             "flycheck"
         ]
     },
-    "disk": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/disk.el",
-            "sha256": "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv"
-        },
-        "recipe": {
-            "sha256": "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "navorski": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -5408,7 +4698,7 @@
         },
         "recipe": {
             "sha256": "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.7",
         "deps": [
@@ -5417,19 +4707,6 @@
             "s"
         ]
     },
-    "info+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/info+.el",
-            "sha256": "1c95876j5ya0na5rf7dlxchhawl85k25bjxh02kqcsrdirc1q86g"
-        },
-        "recipe": {
-            "sha256": "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "yasnippet": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -5440,9 +4717,9 @@
         },
         "recipe": {
             "sha256": "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.9.0-a",
+        "version": "0.9.0.1",
         "deps": []
     },
     "erc-crypt": {
@@ -5455,7 +4732,7 @@
         },
         "recipe": {
             "sha256": "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -5470,7 +4747,7 @@
         },
         "recipe": {
             "sha256": "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": []
@@ -5485,7 +4762,7 @@
         },
         "recipe": {
             "sha256": "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -5500,7 +4777,7 @@
         },
         "recipe": {
             "sha256": "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -5518,28 +4795,13 @@
         },
         "recipe": {
             "sha256": "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
             "s"
         ]
     },
-    "col-highlight": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/col-highlight.el",
-            "sha256": "1gs30lb038f01czrr1d95ngwvc53pd6sfq2vhcspq8d12062lx6n"
-        },
-        "recipe": {
-            "sha256": "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "vline"
-        ]
-    },
     "paxedit": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -5550,7 +4812,7 @@
         },
         "recipe": {
             "sha256": "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.6",
         "deps": [
@@ -5568,7 +4830,7 @@
         },
         "recipe": {
             "sha256": "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3",
         "deps": []
@@ -5583,7 +4845,7 @@
         },
         "recipe": {
             "sha256": "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.2",
         "deps": []
@@ -5598,7 +4860,7 @@
         },
         "recipe": {
             "sha256": "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": [
@@ -5617,7 +4879,7 @@
         },
         "recipe": {
             "sha256": "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.9",
         "deps": [
@@ -5631,32 +4893,6 @@
             "s"
         ]
     },
-    "project-local-variables": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/project-local-variables.el",
-            "sha256": "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw"
-        },
-        "recipe": {
-            "sha256": "0mrf7p420rmjm8ydwc5blpxr6299pdg3sy3jwz2zz0420gkp0ihl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "top-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/top-mode.el",
-            "sha256": "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn"
-        },
-        "recipe": {
-            "sha256": "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "highlight-numbers": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -5667,7 +4903,7 @@
         },
         "recipe": {
             "sha256": "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": [
@@ -5685,7 +4921,7 @@
         },
         "recipe": {
             "sha256": "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1.0",
         "deps": []
@@ -5700,7 +4936,7 @@
         },
         "recipe": {
             "sha256": "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -5717,7 +4953,7 @@
         },
         "recipe": {
             "sha256": "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -5734,26 +4970,11 @@
         },
         "recipe": {
             "sha256": "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8.11",
         "deps": []
     },
-    "all-ext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/all-ext.el",
-            "sha256": "10j70bwa28xpmqwigvls76jg6vz0iky88lmkq4pk35bg3rz09r4m"
-        },
-        "recipe": {
-            "sha256": "1zi266cm5hpfhnnnzbsm4s1w0lsy4sj5z8d020y0cg57yn2v62dv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "all"
-        ]
-    },
     "mallard-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -5764,7 +4985,7 @@
         },
         "recipe": {
             "sha256": "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": []
@@ -5779,7 +5000,7 @@
         },
         "recipe": {
             "sha256": "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -5797,7 +5018,7 @@
         },
         "recipe": {
             "sha256": "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.2",
         "deps": [
@@ -5814,7 +5035,7 @@
         },
         "recipe": {
             "sha256": "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -5831,7 +5052,7 @@
         },
         "recipe": {
             "sha256": "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130322.926",
         "deps": [
@@ -5851,7 +5072,7 @@
         },
         "recipe": {
             "sha256": "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.8",
         "deps": [
@@ -5870,7 +5091,7 @@
         },
         "recipe": {
             "sha256": "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": []
@@ -5885,24 +5106,11 @@
         },
         "recipe": {
             "sha256": "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": []
     },
-    "typing": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/typing.el",
-            "sha256": "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31"
-        },
-        "recipe": {
-            "sha256": "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ess": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -5913,9 +5121,9 @@
         },
         "recipe": {
             "sha256": "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "15.09",
+        "version": "15.9",
         "deps": [
             "julia-mode"
         ]
@@ -5930,7 +5138,7 @@
         },
         "recipe": {
             "sha256": "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5.2",
         "deps": []
@@ -5945,7 +5153,7 @@
         },
         "recipe": {
             "sha256": "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -5953,19 +5161,6 @@
             "names"
         ]
     },
-    "eldoc-extension": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/eldoc-extension.el",
-            "sha256": "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch"
-        },
-        "recipe": {
-            "sha256": "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "helm-w32-launcher": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -5976,7 +5171,7 @@
         },
         "recipe": {
             "sha256": "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.6",
         "deps": [
@@ -5995,9 +5190,9 @@
         },
         "recipe": {
             "sha256": "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.07",
+        "version": "0.7",
         "deps": [
             "auto-complete",
             "cl-lib"
@@ -6013,26 +5208,13 @@
         },
         "recipe": {
             "sha256": "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7",
         "deps": [
             "emacs"
         ]
     },
-    "jira": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/jira.el",
-            "sha256": "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz"
-        },
-        "recipe": {
-            "sha256": "0cf5zgkxagvka5v6scgyxqx4mz1n7lxbynn3gl2a4s9s64jycsy6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "dired-k": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -6043,7 +5225,7 @@
         },
         "recipe": {
             "sha256": "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.16",
         "deps": [
@@ -6051,19 +5233,6 @@
             "emacs"
         ]
     },
-    "legalese": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/legalese.el",
-            "sha256": "0vjf2f5kpmgnw7904jsv2wnn6dcv654v7h1v917wmj72sy941xml"
-        },
-        "recipe": {
-            "sha256": "0xsf3w5h4g7wigrv5kbys7lf9lfv2cab5ch320p74l3l3r2lj9wz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "project-persist-drawer": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -6074,26 +5243,13 @@
         },
         "recipe": {
             "sha256": "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.4",
         "deps": [
             "project-persist"
         ]
     },
-    "dos": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dos.el",
-            "sha256": "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp"
-        },
-        "recipe": {
-            "sha256": "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "image-archive": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -6104,7 +5260,7 @@
         },
         "recipe": {
             "sha256": "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.7",
         "deps": [
@@ -6122,7 +5278,7 @@
         },
         "recipe": {
             "sha256": "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.2",
         "deps": [
@@ -6139,43 +5295,13 @@
         },
         "recipe": {
             "sha256": "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
             "epl"
         ]
     },
-    "ruby-additional": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://svn.ruby-lang.org/repos/ruby/trunk/misc/",
-            "sha256": "0gl8wcnm7pidvd8zy3w5lzxqj0qxs9d932350ncgnmxwfsfzkdk7",
-            "rev": "53195"
-        },
-        "recipe": {
-            "sha256": "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "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": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "beginend": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -6186,7 +5312,7 @@
         },
         "recipe": {
             "sha256": "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -6203,24 +5329,11 @@
         },
         "recipe": {
             "sha256": "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
     },
-    "tidy": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/tidy.el",
-            "sha256": "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa"
-        },
-        "recipe": {
-            "sha256": "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "vimgolf": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -6231,7 +5344,7 @@
         },
         "recipe": {
             "sha256": "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.10.0",
         "deps": []
@@ -6246,7 +5359,7 @@
         },
         "recipe": {
             "sha256": "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -6254,19 +5367,6 @@
             "geiser"
         ]
     },
-    "git-dwim": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/git-dwim.el",
-            "sha256": "074k1r8rkvyhhwnqy4gnyd7shidxgc25l1xq4hmnwjn13nsyqfnv"
-        },
-        "recipe": {
-            "sha256": "0vdd2cksiqbnxplqbpb16bcmp137fj3p9a7pa0622wx8vd5p0rkr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "tuareg": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -6277,7 +5377,7 @@
         },
         "recipe": {
             "sha256": "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.9",
         "deps": [
@@ -6294,7 +5394,7 @@
         },
         "recipe": {
             "sha256": "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": []
@@ -6309,9 +5409,9 @@
         },
         "recipe": {
             "sha256": "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.01",
+        "version": "0.1",
         "deps": [
             "cl-lib"
         ]
@@ -6326,7 +5426,7 @@
         },
         "recipe": {
             "sha256": "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -6341,7 +5441,7 @@
         },
         "recipe": {
             "sha256": "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6",
         "deps": []
@@ -6356,7 +5456,7 @@
         },
         "recipe": {
             "sha256": "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -6371,28 +5471,13 @@
         },
         "recipe": {
             "sha256": "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.11",
         "deps": [
             "inf-ruby"
         ]
     },
-    "thing-cmds": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/thing-cmds.el",
-            "sha256": "0216gckb727hhzf230a3m3n9blyaa21djxcc77r4lf7g2h9g0b5m"
-        },
-        "recipe": {
-            "sha256": "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "hide-comnt"
-        ]
-    },
     "alchemist": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -6403,7 +5488,7 @@
         },
         "recipe": {
             "sha256": "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6.0",
         "deps": [
@@ -6424,11 +5509,28 @@
         },
         "recipe": {
             "sha256": "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -6439,9 +5541,9 @@
         },
         "recipe": {
             "sha256": "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.01",
+        "version": "0.1",
         "deps": [
             "cl-lib"
         ]
@@ -6456,7 +5558,7 @@
         },
         "recipe": {
             "sha256": "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5",
         "deps": [
@@ -6473,24 +5575,11 @@
         },
         "recipe": {
             "sha256": "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.10",
         "deps": []
     },
-    "narrow-indirect": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/narrow-indirect.el",
-            "sha256": "1j50f3kzgrvxf4iznjjwsi4smp7gdp09irz7x3ppv4w2c8apc6j8"
-        },
-        "recipe": {
-            "sha256": "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "button-lock": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -6501,7 +5590,7 @@
         },
         "recipe": {
             "sha256": "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.2",
         "deps": []
@@ -6516,7 +5605,7 @@
         },
         "recipe": {
             "sha256": "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.81",
         "deps": []
@@ -6531,7 +5620,7 @@
         },
         "recipe": {
             "sha256": "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.7",
         "deps": [
@@ -6551,7 +5640,7 @@
         },
         "recipe": {
             "sha256": "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.4",
         "deps": [
@@ -6570,7 +5659,7 @@
         },
         "recipe": {
             "sha256": "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3",
         "deps": []
@@ -6585,7 +5674,7 @@
         },
         "recipe": {
             "sha256": "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -6600,7 +5689,7 @@
         },
         "recipe": {
             "sha256": "13y6nmc317hljch3x8f80jg5sb57imm7w9kdn7ybw59g55zxzz8q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -6615,7 +5704,7 @@
         },
         "recipe": {
             "sha256": "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": []
@@ -6630,7 +5719,7 @@
         },
         "recipe": {
             "sha256": "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -6645,7 +5734,7 @@
         },
         "recipe": {
             "sha256": "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6",
         "deps": [
@@ -6665,7 +5754,7 @@
         },
         "recipe": {
             "sha256": "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -6680,7 +5769,7 @@
         },
         "recipe": {
             "sha256": "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -6695,7 +5784,7 @@
         },
         "recipe": {
             "sha256": "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.4",
         "deps": [
@@ -6713,8 +5802,8 @@
             "rev": "f39a36351e1e6f1105c9e32970e7502b77b0dbcd"
         },
         "recipe": {
-            "sha256": "1nqvlyklcqmdw2p7zf53jwrnz7nd7hl09nm20fbgw2dn0h1z9q30",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.3",
         "deps": [
@@ -6731,7 +5820,7 @@
         },
         "recipe": {
             "sha256": "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.10",
         "deps": []
@@ -6746,7 +5835,7 @@
         },
         "recipe": {
             "sha256": "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.12",
         "deps": [
@@ -6764,7 +5853,7 @@
         },
         "recipe": {
             "sha256": "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.3",
         "deps": [
@@ -6782,35 +5871,22 @@
         },
         "recipe": {
             "sha256": "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.3",
         "deps": []
     },
-    "elisp-depend": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/elisp-depend.el",
-            "sha256": "0khc3gacw27aw9pkfrnla9844lqbspgm0hrz7q0h5nr73d9pnc02"
-        },
-        "recipe": {
-            "sha256": "08zxzvj60v23b7d5q0hvgffm1jxq7lc5y9w22m6nv2fp29yadyiy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "scala-mode2": {
         "fetch": {
             "tag": "fetchFromGitHub",
-            "owner": "hvesalai",
-            "repo": "scala-mode2",
+            "owner": "ensime",
+            "repo": "emacs-scala-mode",
             "sha256": "1gfhk595vnf6565nv6m1v8dc4a3a9z34jj1qdh02lk8azg5ylk89",
             "rev": "34888c094990bc669347f106dbd516f487e55ae3"
         },
         "recipe": {
-            "sha256": "1m8przbs4vmcss7bp496vdziy1xxzh4waj36yny7l79ld9rhk6cl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.22",
         "deps": []
@@ -6825,7 +5901,7 @@
         },
         "recipe": {
             "sha256": "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -6842,7 +5918,7 @@
         },
         "recipe": {
             "sha256": "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1.0",
         "deps": []
@@ -6857,7 +5933,7 @@
         },
         "recipe": {
             "sha256": "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3",
         "deps": []
@@ -6872,7 +5948,7 @@
         },
         "recipe": {
             "sha256": "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.3",
         "deps": [
@@ -6889,24 +5965,11 @@
         },
         "recipe": {
             "sha256": "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
     },
-    "doremi": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/doremi.el",
-            "sha256": "0b50iwyjxnhny9kzbcqxwqwa5fg5xbldm7l4jzcyl3bmcdbg4w7q"
-        },
-        "recipe": {
-            "sha256": "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "grizzl": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -6917,7 +5980,7 @@
         },
         "recipe": {
             "sha256": "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": []
@@ -6932,24 +5995,11 @@
         },
         "recipe": {
             "sha256": "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
     },
-    "wid-edit+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/wid-edit+.el",
-            "sha256": "080i3gfvhmpmjq9hbjpkvs8pi88s59ia5dvrng0gg5zd8xrwdc6k"
-        },
-        "recipe": {
-            "sha256": "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "pabbrev": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -6960,7 +6010,7 @@
         },
         "recipe": {
             "sha256": "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "4.1",
         "deps": []
@@ -6975,29 +6025,11 @@
         },
         "recipe": {
             "sha256": "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.126",
         "deps": []
     },
-    "helm-ls-svn": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el",
-            "sha256": "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz",
-            "rev": "143722"
-        },
-        "recipe": {
-            "sha256": "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
     "evil-leader": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -7008,26 +6040,13 @@
         },
         "recipe": {
             "sha256": "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.3",
         "deps": [
             "evil"
         ]
     },
-    "highlight": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/highlight.el",
-            "sha256": "01d7khl7d78wz37bz28wjszhdwz81lrq9vm9d4slnj2qg4by6dcy"
-        },
-        "recipe": {
-            "sha256": "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "darktooth-theme": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -7038,7 +6057,7 @@
         },
         "recipe": {
             "sha256": "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.37",
         "deps": []
@@ -7053,7 +6072,7 @@
         },
         "recipe": {
             "sha256": "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3",
         "deps": []
@@ -7068,7 +6087,7 @@
         },
         "recipe": {
             "sha256": "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": []
@@ -7083,7 +6102,7 @@
         },
         "recipe": {
             "sha256": "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.3",
         "deps": []
@@ -7098,7 +6117,7 @@
         },
         "recipe": {
             "sha256": "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -7110,14 +6129,14 @@
             "tag": "fetchFromGitHub",
             "owner": "skeeto",
             "repo": "elfeed",
-            "sha256": "0132jl4fl2ycais9l0csykg466ppq8cc4181d3dx87zf7fdhrgwp",
-            "rev": "4c15ed9f9559285df196c9b793bd5168662b6532"
+            "sha256": "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j",
+            "rev": "9fd3cf8833e26bf41f52a7e2149734858d2eeb96"
         },
         "recipe": {
             "sha256": "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "1.3.0",
+        "version": "1.4.0",
         "deps": [
             "emacs"
         ]
@@ -7132,7 +6151,7 @@
         },
         "recipe": {
             "sha256": "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -7149,7 +6168,7 @@
         },
         "recipe": {
             "sha256": "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.9",
         "deps": [
@@ -7166,7 +6185,7 @@
         },
         "recipe": {
             "sha256": "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": []
@@ -7181,27 +6200,13 @@
         },
         "recipe": {
             "sha256": "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": [
             "emacs"
         ]
     },
-    "geben": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://geben-on-emacs.googlecode.com/svn/trunk/",
-            "sha256": "01kbvmylymm6qww45mbjjxmb8ccdl9c2pxdyqfq3g73vwzrvndk4",
-            "rev": "124"
-        },
-        "recipe": {
-            "sha256": "1hvvy1kp8wrb1qasm42fslgdkg095g4jxgzbnwpa4vp5cq270qbm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "date-field": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -7212,7 +6217,7 @@
         },
         "recipe": {
             "sha256": "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -7231,7 +6236,7 @@
         },
         "recipe": {
             "sha256": "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5.4",
         "deps": []
@@ -7246,7 +6251,7 @@
         },
         "recipe": {
             "sha256": "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -7261,7 +6266,7 @@
         },
         "recipe": {
             "sha256": "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -7276,9 +6281,9 @@
         },
         "recipe": {
             "sha256": "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.02",
+        "version": "0.2",
         "deps": [
             "helm"
         ]
@@ -7293,9 +6298,9 @@
         },
         "recipe": {
             "sha256": "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.01",
+        "version": "0.1",
         "deps": [
             "auto-complete",
             "cl-lib"
@@ -7311,7 +6316,7 @@
         },
         "recipe": {
             "sha256": "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
@@ -7326,22 +6331,9 @@
         },
         "recipe": {
             "sha256": "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.03",
-        "deps": []
-    },
-    "echo-bell": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/echo-bell.el",
-            "sha256": "11914ca1q8szqyqihfm2q39cway3p6j1fdggr99lk6848dkf5p1v"
-        },
-        "recipe": {
-            "sha256": "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
+        "version": "0.3",
         "deps": []
     },
     "dedicated": {
@@ -7354,7 +6346,7 @@
         },
         "recipe": {
             "sha256": "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -7369,7 +6361,7 @@
         },
         "recipe": {
             "sha256": "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.3",
         "deps": []
@@ -7384,13 +6376,28 @@
         },
         "recipe": {
             "sha256": "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -7401,7 +6408,7 @@
         },
         "recipe": {
             "sha256": "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.0",
         "deps": []
@@ -7416,7 +6423,7 @@
         },
         "recipe": {
             "sha256": "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5.0",
         "deps": [
@@ -7434,7 +6441,7 @@
         },
         "recipe": {
             "sha256": "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.11.2",
         "deps": [
@@ -7451,7 +6458,7 @@
         },
         "recipe": {
             "sha256": "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.10.0",
         "deps": []
@@ -7466,7 +6473,7 @@
         },
         "recipe": {
             "sha256": "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.0",
         "deps": [
@@ -7485,7 +6492,7 @@
         },
         "recipe": {
             "sha256": "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.22",
         "deps": [
@@ -7503,37 +6510,11 @@
         },
         "recipe": {
             "sha256": "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.28",
         "deps": []
     },
-    "buffer-stack": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/buffer-stack.el",
-            "sha256": "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r"
-        },
-        "recipe": {
-            "sha256": "00vxfd4ki5pqf9n9vbmn1441vn2y14bdr1v05h46hswf13b4hzrn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "frame-fns": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/frame-fns.el",
-            "sha256": "0vh3k8wjvf78r5gv6sn468a4gxfxf4f63csk54izgyspyv6mj9c7"
-        },
-        "recipe": {
-            "sha256": "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "search-web": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -7544,7 +6525,7 @@
         },
         "recipe": {
             "sha256": "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -7559,7 +6540,7 @@
         },
         "recipe": {
             "sha256": "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7",
         "deps": []
@@ -7574,7 +6555,7 @@
         },
         "recipe": {
             "sha256": "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.9.0",
         "deps": []
@@ -7589,7 +6570,7 @@
         },
         "recipe": {
             "sha256": "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -7600,17 +6581,19 @@
             "org"
         ]
     },
-    "apropos-fn+var": {
+    "erlang": {
         "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/apropos-fn+var.el",
-            "sha256": "0q1b2x4z0ds4y45gy7sxc68xyai3g8kmqnssnhdina4x20sgm2vf"
+            "tag": "fetchFromGitHub",
+            "owner": "erlang",
+            "repo": "otp",
+            "sha256": "1dl2sxd77miaqbl9plrg6kgql5jg5vz42lj9f85i771g95h2c6nk",
+            "rev": "21d6192389a04024f7a41ced9d0911a9cce6f4e8"
         },
         "recipe": {
-            "sha256": "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "nil",
+        "version": "18.2.1",
         "deps": []
     },
     "concurrent": {
@@ -7623,26 +6606,13 @@
         },
         "recipe": {
             "sha256": "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.2",
         "deps": [
             "deferred"
         ]
     },
-    "grep+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/grep+.el",
-            "sha256": "03a4mmhbkwj2bq48525jba6wiczs943lmlhvy5vz8x4hb47rlmc3"
-        },
-        "recipe": {
-            "sha256": "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "helm-zhihu-daily": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -7653,7 +6623,7 @@
         },
         "recipe": {
             "sha256": "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -7672,7 +6642,7 @@
         },
         "recipe": {
             "sha256": "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": []
@@ -7687,24 +6657,11 @@
         },
         "recipe": {
             "sha256": "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
     },
-    "ac-dabbrev": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/ac-dabbrev.el",
-            "sha256": "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh"
-        },
-        "recipe": {
-            "sha256": "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "caskxy": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -7715,7 +6672,7 @@
         },
         "recipe": {
             "sha256": "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.5",
         "deps": [
@@ -7733,7 +6690,7 @@
         },
         "recipe": {
             "sha256": "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": []
@@ -7748,7 +6705,7 @@
         },
         "recipe": {
             "sha256": "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.0.0",
         "deps": []
@@ -7763,7 +6720,7 @@
         },
         "recipe": {
             "sha256": "16jvbr4nm48p3dj9wmysjaxyz4ajcay19risqrs9fzrifkr21c9p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0",
         "deps": []
@@ -7778,7 +6735,7 @@
         },
         "recipe": {
             "sha256": "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6.2",
         "deps": [
@@ -7797,7 +6754,7 @@
         },
         "recipe": {
             "sha256": "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -7816,7 +6773,7 @@
         },
         "recipe": {
             "sha256": "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.11",
         "deps": [
@@ -7824,19 +6781,6 @@
             "cl-lib"
         ]
     },
-    "transpose-frame": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/transpose-frame.el",
-            "sha256": "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4"
-        },
-        "recipe": {
-            "sha256": "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "travis": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -7847,7 +6791,7 @@
         },
         "recipe": {
             "sha256": "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.0",
         "deps": [
@@ -7867,7 +6811,7 @@
         },
         "recipe": {
             "sha256": "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.14.3",
         "deps": [
@@ -7877,19 +6821,6 @@
             "es-windows"
         ]
     },
-    "sequential-command": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/sequential-command.el",
-            "sha256": "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk"
-        },
-        "recipe": {
-            "sha256": "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ac-helm": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -7900,7 +6831,7 @@
         },
         "recipe": {
             "sha256": "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1",
         "deps": [
@@ -7919,24 +6850,11 @@
         },
         "recipe": {
             "sha256": "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1.1",
         "deps": []
     },
-    "pp+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/pp+.el",
-            "sha256": "1997hkxnnhrhkszzxmhabkh8ifb07bzr0w9svx8yynn22j0s5dmh"
-        },
-        "recipe": {
-            "sha256": "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "genrnc": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -7947,7 +6865,7 @@
         },
         "recipe": {
             "sha256": "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -7967,7 +6885,7 @@
         },
         "recipe": {
             "sha256": "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.4",
         "deps": [
@@ -7987,7 +6905,7 @@
         },
         "recipe": {
             "sha256": "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -8002,7 +6920,7 @@
         },
         "recipe": {
             "sha256": "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -8023,7 +6941,7 @@
         },
         "recipe": {
             "sha256": "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -8038,7 +6956,7 @@
         },
         "recipe": {
             "sha256": "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -8055,7 +6973,7 @@
         },
         "recipe": {
             "sha256": "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9",
         "deps": [
@@ -8072,7 +6990,7 @@
         },
         "recipe": {
             "sha256": "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -8089,7 +7007,7 @@
         },
         "recipe": {
             "sha256": "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.2",
         "deps": [
@@ -8106,7 +7024,7 @@
         },
         "recipe": {
             "sha256": "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": [
@@ -8124,7 +7042,7 @@
         },
         "recipe": {
             "sha256": "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -8143,7 +7061,7 @@
         },
         "recipe": {
             "sha256": "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": []
@@ -8158,7 +7076,7 @@
         },
         "recipe": {
             "sha256": "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -8173,7 +7091,7 @@
         },
         "recipe": {
             "sha256": "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.2",
         "deps": []
@@ -8188,7 +7106,7 @@
         },
         "recipe": {
             "sha256": "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1",
         "deps": []
@@ -8203,7 +7121,7 @@
         },
         "recipe": {
             "sha256": "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": [
@@ -8222,7 +7140,7 @@
         },
         "recipe": {
             "sha256": "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.3",
         "deps": [
@@ -8240,7 +7158,7 @@
         },
         "recipe": {
             "sha256": "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": [
@@ -8248,20 +7166,6 @@
             "emacs"
         ]
     },
-    "swbuff": {
-        "fetch": {
-            "tag": "fetchcvs",
-            "module": "emhacks/swbuff.el",
-            "cvsRoot": ":pserver:anonymous@emhacks.cvs.sourceforge.net:/cvsroot/emhacks",
-            "sha256": "c579839fb395f1f778683324269269ca3d916995177804ca5dff3548007ec4b5"
-        },
-        "recipe": {
-            "sha256": "1p4jj2ikhfp56d9iai1n1x2ggf1nsfkrhfnggbvk4zb0d2wy3l44",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "bbcode-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -8272,7 +7176,7 @@
         },
         "recipe": {
             "sha256": "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.0",
         "deps": []
@@ -8287,7 +7191,7 @@
         },
         "recipe": {
             "sha256": "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2",
         "deps": []
@@ -8302,7 +7206,7 @@
         },
         "recipe": {
             "sha256": "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.1",
         "deps": [
@@ -8319,24 +7223,11 @@
         },
         "recipe": {
             "sha256": "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "13.10",
         "deps": []
     },
-    "centered-cursor-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/centered-cursor-mode.el",
-            "sha256": "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl"
-        },
-        "recipe": {
-            "sha256": "0a5mymnkwjvpra8iffxjwa5fq3kq4vc8fw7pr7gmrwq8ml7il5zl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "rectangle-utils": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -8347,7 +7238,7 @@
         },
         "recipe": {
             "sha256": "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -8365,7 +7256,7 @@
         },
         "recipe": {
             "sha256": "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.8",
         "deps": []
@@ -8373,14 +7264,14 @@
     "sbt-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
-            "owner": "hvesalai",
-            "repo": "sbt-mode",
+            "owner": "ensime",
+            "repo": "emacs-sbt-mode",
             "sha256": "0y846zmcz5x2jn5bndm0mfi18jc5cd1fkidgc4wvqmm0w30gyx4q",
             "rev": "be70372bb0890a4f8bec1b6ef10b30ed2e3f5236"
         },
         "recipe": {
-            "sha256": "0a2ynbxgjgbm2nvrgss59xc98kmryf9bmd3qg7qxacyancyi2gxh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -8397,7 +7288,7 @@
         },
         "recipe": {
             "sha256": "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -8412,26 +7303,13 @@
         },
         "recipe": {
             "sha256": "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.2",
         "deps": [
             "anything"
         ]
     },
-    "novice+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/novice+.el",
-            "sha256": "1lv911k9s0607g8mrhc42zb7s1cw0zqqafqbrk6w17j4hr53n897"
-        },
-        "recipe": {
-            "sha256": "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "discover": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -8442,7 +7320,7 @@
         },
         "recipe": {
             "sha256": "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -8459,7 +7337,7 @@
         },
         "recipe": {
             "sha256": "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.1",
         "deps": []
@@ -8474,7 +7352,7 @@
         },
         "recipe": {
             "sha256": "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
@@ -8489,7 +7367,7 @@
         },
         "recipe": {
             "sha256": "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -8510,7 +7388,7 @@
         },
         "recipe": {
             "sha256": "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -8518,17 +7396,19 @@
             "cake"
         ]
     },
-    "el-swank-fuzzy": {
+    "org-tree-slide": {
         "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/el-swank-fuzzy.el",
-            "sha256": "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn"
+            "tag": "fetchFromGitHub",
+            "owner": "takaxp",
+            "repo": "org-tree-slide",
+            "sha256": "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45",
+            "rev": "dccd80418a4444df5e8301695ff0d0dfe86a3c21"
         },
         "recipe": {
-            "sha256": "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "nil",
+        "version": "2.8.4",
         "deps": []
     },
     "org-transform-tree-table": {
@@ -8541,7 +7421,7 @@
         },
         "recipe": {
             "sha256": "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": [
@@ -8559,7 +7439,7 @@
         },
         "recipe": {
             "sha256": "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": [
@@ -8567,19 +7447,6 @@
             "emacs"
         ]
     },
-    "icomplete+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/icomplete+.el",
-            "sha256": "1vcv3ssmn5wwjnz6wcc0lsb0awxgqk5pn9p8zgwnj8qbag31b4ky"
-        },
-        "recipe": {
-            "sha256": "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "helm-package": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -8590,9 +7457,9 @@
         },
         "recipe": {
             "sha256": "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.03",
+        "version": "0.3",
         "deps": [
             "cl-lib",
             "helm"
@@ -8608,7 +7475,7 @@
         },
         "recipe": {
             "sha256": "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.4",
         "deps": []
@@ -8623,7 +7490,7 @@
         },
         "recipe": {
             "sha256": "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": [
@@ -8640,24 +7507,11 @@
         },
         "recipe": {
             "sha256": "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
     },
-    "dummy-h-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dummy-h-mode.el",
-            "sha256": "0zq94x4br3sk6n4chrfnw7hpnsicxa02fcpk8hw1hfsaq3327n6v"
-        },
-        "recipe": {
-            "sha256": "1h2pm37y9kz62id0rm0zzgh1hpkhd9gvq95kjd29w0awsp9b6ca4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "highlight-quoted": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -8668,7 +7522,7 @@
         },
         "recipe": {
             "sha256": "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -8685,7 +7539,7 @@
         },
         "recipe": {
             "sha256": "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -8700,7 +7554,7 @@
         },
         "recipe": {
             "sha256": "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -8716,7 +7570,7 @@
         },
         "recipe": {
             "sha256": "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.8",
         "deps": []
@@ -8731,7 +7585,7 @@
         },
         "recipe": {
             "sha256": "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.0",
         "deps": [
@@ -8747,8 +7601,8 @@
             "rev": "2065f07cb813041719aabb1e92fa98aebb2c6ae6"
         },
         "recipe": {
-            "sha256": "0lgs33lm85j9y2c5nw6dl8v6avghyjdavbk6yzh1cya2d9v5f4q0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.0",
         "deps": []
@@ -8763,7 +7617,7 @@
         },
         "recipe": {
             "sha256": "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.0",
         "deps": [
@@ -8781,7 +7635,7 @@
         },
         "recipe": {
             "sha256": "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": [
@@ -8803,7 +7657,7 @@
         },
         "recipe": {
             "sha256": "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.2",
         "deps": []
@@ -8818,7 +7672,7 @@
         },
         "recipe": {
             "sha256": "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "13",
         "deps": []
@@ -8833,7 +7687,7 @@
         },
         "recipe": {
             "sha256": "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.0",
         "deps": []
@@ -8848,7 +7702,7 @@
         },
         "recipe": {
             "sha256": "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
@@ -8863,7 +7717,7 @@
         },
         "recipe": {
             "sha256": "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7",
         "deps": [
@@ -8880,26 +7734,13 @@
         },
         "recipe": {
             "sha256": "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
             "cl-lib"
         ]
     },
-    "character-fold+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/character-fold+.el",
-            "sha256": "1lr1gzabaw7jpxazyjq7pkmy1cljna8v4150jkpndzzb1anb9xxy"
-        },
-        "recipe": {
-            "sha256": "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "notmuch": {
         "fetch": {
             "tag": "fetchgit",
@@ -8909,7 +7750,7 @@
         },
         "recipe": {
             "sha256": "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.21",
         "deps": []
@@ -8924,7 +7765,7 @@
         },
         "recipe": {
             "sha256": "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -8942,7 +7783,7 @@
         },
         "recipe": {
             "sha256": "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -8953,19 +7794,6 @@
             "s"
         ]
     },
-    "auto-capitalize": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/auto-capitalize.el",
-            "sha256": "1lk9zwng7wkjvb8hprlgyrab1s56n8a61xjva931h0bgypwl1dfi"
-        },
-        "recipe": {
-            "sha256": "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "emms-mode-line-cycle": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -8976,7 +7804,7 @@
         },
         "recipe": {
             "sha256": "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.4",
         "deps": [
@@ -8994,7 +7822,7 @@
         },
         "recipe": {
             "sha256": "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.2",
         "deps": []
@@ -9009,7 +7837,7 @@
         },
         "recipe": {
             "sha256": "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.2",
         "deps": []
@@ -9024,9 +7852,9 @@
         },
         "recipe": {
             "sha256": "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.02",
+        "version": "0.2",
         "deps": [
             "popup"
         ]
@@ -9041,7 +7869,7 @@
         },
         "recipe": {
             "sha256": "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1.0",
         "deps": [
@@ -9065,7 +7893,7 @@
         },
         "recipe": {
             "sha256": "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6",
         "deps": [
@@ -9083,7 +7911,7 @@
         },
         "recipe": {
             "sha256": "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.0",
         "deps": [
@@ -9098,14 +7926,14 @@
             "tag": "fetchFromGitHub",
             "owner": "Floobits",
             "repo": "floobits-emacs",
-            "sha256": "11zfpwfpv8lrib9629h9jyn9svqg30kf4jbnaj0s2sxcyn2sxfga",
-            "rev": "08b3b5a3c3a178b8f21f1baf5e1f0eb0cf1fb855"
+            "sha256": "1b9zxyv5bn1ja0gcv5p3dk3lq3gp3g1dhbnizx7ifgpzc36sp374",
+            "rev": "c75af788d089b701dc71fd79c2baefe82d0d17eb"
         },
         "recipe": {
             "sha256": "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "1.6.1",
+        "version": "1.6.2",
         "deps": [
             "highlight",
             "json"
@@ -9121,7 +7949,7 @@
         },
         "recipe": {
             "sha256": "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -9135,7 +7963,7 @@
         },
         "recipe": {
             "sha256": "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -9150,7 +7978,7 @@
         },
         "recipe": {
             "sha256": "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -9160,14 +7988,14 @@
             "tag": "fetchFromGitHub",
             "owner": "stan-dev",
             "repo": "stan-mode",
-            "sha256": "1yx8n2c9bls0cvc53d69nyrg44yc3py51lzci0cviwszmnbbrljx",
-            "rev": "3a1b9a714ae7a547638a449f5a9ac487003c55b8"
+            "sha256": "0s633nnaprqq0svs0v4zfk9p47izbvjwx1x2xa9b9rid69bpx54s",
+            "rev": "60e31cd0dedc36ee6d5ddde01c5b8cb121c2e844"
         },
         "recipe": {
             "sha256": "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "7.1.0",
+        "version": "8.0.0",
         "deps": []
     },
     "edts": {
@@ -9180,7 +8008,7 @@
         },
         "recipe": {
             "sha256": "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -9195,7 +8023,7 @@
         },
         "recipe": {
             "sha256": "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -9213,7 +8041,7 @@
         },
         "recipe": {
             "sha256": "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.4",
         "deps": [
@@ -9229,7 +8057,7 @@
         },
         "recipe": {
             "sha256": "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3",
         "deps": [
@@ -9246,7 +8074,7 @@
         },
         "recipe": {
             "sha256": "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -9263,7 +8091,7 @@
         },
         "recipe": {
             "sha256": "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.10",
         "deps": []
@@ -9278,7 +8106,7 @@
         },
         "recipe": {
             "sha256": "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.2",
         "deps": [
@@ -9295,7 +8123,7 @@
         },
         "recipe": {
             "sha256": "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
@@ -9310,7 +8138,7 @@
         },
         "recipe": {
             "sha256": "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "5.0.1",
         "deps": [
@@ -9327,7 +8155,7 @@
         },
         "recipe": {
             "sha256": "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.18.1",
         "deps": [
@@ -9344,7 +8172,7 @@
         },
         "recipe": {
             "sha256": "042fa55yakdn2di4l5dilnmqpslac46wpr1zpl4xk3v3i4nn9ndv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.3.1",
         "deps": [
@@ -9363,7 +8191,7 @@
         },
         "recipe": {
             "sha256": "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -9380,7 +8208,7 @@
         },
         "recipe": {
             "sha256": "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
@@ -9395,7 +8223,7 @@
         },
         "recipe": {
             "sha256": "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.5",
         "deps": [
@@ -9413,7 +8241,7 @@
         },
         "recipe": {
             "sha256": "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.1",
         "deps": [
@@ -9430,7 +8258,7 @@
         },
         "recipe": {
             "sha256": "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -9450,7 +8278,7 @@
         },
         "recipe": {
             "sha256": "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.25.1",
         "deps": []
@@ -9465,7 +8293,7 @@
         },
         "recipe": {
             "sha256": "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.13.3",
         "deps": [
@@ -9482,7 +8310,7 @@
         },
         "recipe": {
             "sha256": "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.0",
         "deps": []
@@ -9497,7 +8325,7 @@
         },
         "recipe": {
             "sha256": "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.2",
         "deps": [
@@ -9515,7 +8343,7 @@
         },
         "recipe": {
             "sha256": "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.5",
         "deps": [
@@ -9533,7 +8361,7 @@
         },
         "recipe": {
             "sha256": "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140303.946",
         "deps": [
@@ -9550,7 +8378,7 @@
         },
         "recipe": {
             "sha256": "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -9567,37 +8395,11 @@
         },
         "recipe": {
             "sha256": "0hkmpa0vg1miv8qqpnml4xblzvn9w4ba02fqp6qa2nnv554i7azp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "6.3",
         "deps": []
     },
-    "highlight-chars": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/highlight-chars.el",
-            "sha256": "14gx9fri2qbgii828dd42aw02rskshbyyymd68aqh2dll7cbw6mf"
-        },
-        "recipe": {
-            "sha256": "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "flymake-cursor": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/flymake-cursor.el",
-            "sha256": "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr"
-        },
-        "recipe": {
-            "sha256": "1s065w0z3sfv3d348w4zhlw96xf3j28bcz14sl46963mj2dm90lr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "comment-dwim-2": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -9608,7 +8410,7 @@
         },
         "recipe": {
             "sha256": "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.2",
         "deps": []
@@ -9623,7 +8425,7 @@
         },
         "recipe": {
             "sha256": "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
@@ -9638,7 +8440,7 @@
         },
         "recipe": {
             "sha256": "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.6",
         "deps": []
@@ -9653,7 +8455,7 @@
         },
         "recipe": {
             "sha256": "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": [
@@ -9661,19 +8463,6 @@
             "helm"
         ]
     },
-    "chm-view": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/chm-view.el",
-            "sha256": "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8"
-        },
-        "recipe": {
-            "sha256": "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "company-quickhelp": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -9684,7 +8473,7 @@
         },
         "recipe": {
             "sha256": "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.0",
         "deps": [
@@ -9703,7 +8492,7 @@
         },
         "recipe": {
             "sha256": "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -9720,7 +8509,7 @@
         },
         "recipe": {
             "sha256": "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4",
         "deps": [
@@ -9737,7 +8526,7 @@
         },
         "recipe": {
             "sha256": "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.3",
         "deps": [
@@ -9754,7 +8543,7 @@
         },
         "recipe": {
             "sha256": "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -9769,7 +8558,7 @@
         },
         "recipe": {
             "sha256": "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.10.2",
         "deps": []
@@ -9784,7 +8573,7 @@
         },
         "recipe": {
             "sha256": "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -9799,7 +8588,7 @@
         },
         "recipe": {
             "sha256": "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1",
         "deps": [
@@ -9816,7 +8605,7 @@
         },
         "recipe": {
             "sha256": "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.2",
         "deps": [
@@ -9834,7 +8623,7 @@
         },
         "recipe": {
             "sha256": "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.8",
         "deps": [
@@ -9851,7 +8640,7 @@
         },
         "recipe": {
             "sha256": "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.17.0",
         "deps": []
@@ -9866,7 +8655,7 @@
         },
         "recipe": {
             "sha256": "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4.1",
         "deps": [
@@ -9883,7 +8672,7 @@
         },
         "recipe": {
             "sha256": "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -9901,7 +8690,7 @@
         },
         "recipe": {
             "sha256": "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -9918,7 +8707,7 @@
         },
         "recipe": {
             "sha256": "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -9926,19 +8715,6 @@
             "emacs"
         ]
     },
-    "showtip": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/showtip.el",
-            "sha256": "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql"
-        },
-        "recipe": {
-            "sha256": "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "electric-operator": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -9949,7 +8725,7 @@
         },
         "recipe": {
             "sha256": "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -9968,7 +8744,7 @@
         },
         "recipe": {
             "sha256": "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.6",
         "deps": [
@@ -9977,19 +8753,6 @@
             "yaxception"
         ]
     },
-    "message-x": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/message-x.el",
-            "sha256": "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf"
-        },
-        "recipe": {
-            "sha256": "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "spotify": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -10000,24 +8763,11 @@
         },
         "recipe": {
             "sha256": "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.2",
         "deps": []
     },
-    "http-post-simple": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/http-post-simple.el",
-            "sha256": "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my"
-        },
-        "recipe": {
-            "sha256": "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "mustache-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -10028,7 +8778,7 @@
         },
         "recipe": {
             "sha256": "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3",
         "deps": []
@@ -10043,7 +8793,7 @@
         },
         "recipe": {
             "sha256": "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8.10",
         "deps": [
@@ -10061,7 +8811,7 @@
         },
         "recipe": {
             "sha256": "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6",
         "deps": []
@@ -10076,7 +8826,7 @@
         },
         "recipe": {
             "sha256": "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -10094,7 +8844,7 @@
         },
         "recipe": {
             "sha256": "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -10109,7 +8859,7 @@
         },
         "recipe": {
             "sha256": "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": [
@@ -10118,19 +8868,6 @@
             "s"
         ]
     },
-    "pastebin": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/pastebin.el",
-            "sha256": "17br64snqby465bjb0l1hzw0pcms5m2knrvb6y9gn3kir4sdi6kn"
-        },
-        "recipe": {
-            "sha256": "19fgjcbxgmnm59qjkxhvy2aib5qs5d5a43hwvjdhxq2k6rn3f2gj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "org-gcal": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -10141,7 +8878,7 @@
         },
         "recipe": {
             "sha256": "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -10162,7 +8899,7 @@
         },
         "recipe": {
             "sha256": "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -10181,7 +8918,7 @@
         },
         "recipe": {
             "sha256": "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.46",
         "deps": [
@@ -10200,7 +8937,7 @@
         },
         "recipe": {
             "sha256": "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
@@ -10215,7 +8952,7 @@
         },
         "recipe": {
             "sha256": "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -10234,7 +8971,7 @@
         },
         "recipe": {
             "sha256": "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2",
         "deps": [
@@ -10252,7 +8989,7 @@
         },
         "recipe": {
             "sha256": "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.0",
         "deps": []
@@ -10267,54 +9004,13 @@
         },
         "recipe": {
             "sha256": "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
             "key-chord"
         ]
     },
-    "point-undo": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/point-undo.el",
-            "sha256": "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz"
-        },
-        "recipe": {
-            "sha256": "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "frame-cmds": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/frame-cmds.el",
-            "sha256": "1p7ry940wgjpg2vq3m1nr1bs86cc4mhbpzj64znlmlnjgwa4bk2a"
-        },
-        "recipe": {
-            "sha256": "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "frame-fns"
-        ]
-    },
-    "yaoddmuse": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/yaoddmuse.el",
-            "sha256": "0svy6zp5f22z7mblap4psh7h4i52d1qasi9yk22l39przhsrjar4"
-        },
-        "recipe": {
-            "sha256": "07sqcsad3k23agwwws7hxnc46cp9mkc9qinzva7qvjgs8pa9dh54",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "tern-django": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -10325,7 +9021,7 @@
         },
         "recipe": {
             "sha256": "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -10334,36 +9030,24 @@
             "tern"
         ]
     },
-    "shell-history": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/shell-history.el",
-            "sha256": "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r"
-        },
-        "recipe": {
-            "sha256": "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ido-ubiquitous": {
         "fetch": {
             "tag": "fetchFromGitHub",
             "owner": "DarwinAwardWinner",
             "repo": "ido-ubiquitous",
-            "sha256": "1fgg2l9fvg3iay9wgkfacbc0kl6hx7sbwxgmbl8j47vr6yzkgnd7",
-            "rev": "2e826e3f209cb5d2bc92bdbfd3b189d2c06ff51c"
+            "sha256": "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn",
+            "rev": "1a97a38f2d1a51371853e44da659caa6baf78cbe"
         },
         "recipe": {
             "sha256": "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "3.9",
+        "version": "3.10",
         "deps": [
             "cl-lib",
             "emacs",
-            "ido-completing-read+"
+            "ido-completing-read+",
+            "s"
         ]
     },
     "merlin": {
@@ -10376,7 +9060,7 @@
         },
         "recipe": {
             "sha256": "0wnh7512sknagdk56j6gd8vamh9ns3vnggm56s73pik0m009w0xr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.3.1",
         "deps": []
@@ -10391,7 +9075,7 @@
         },
         "recipe": {
             "sha256": "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -10410,7 +9094,7 @@
         },
         "recipe": {
             "sha256": "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.2",
         "deps": []
@@ -10425,24 +9109,11 @@
         },
         "recipe": {
             "sha256": "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
     },
-    "unbound": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/unbound.el",
-            "sha256": "0i5km1naxprd4lj20097ph50mjs2364xwxcdw0j3g5569mk5nc06"
-        },
-        "recipe": {
-            "sha256": "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "anti-zenburn-theme": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -10453,7 +9124,7 @@
         },
         "recipe": {
             "sha256": "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.3",
         "deps": []
@@ -10468,7 +9139,7 @@
         },
         "recipe": {
             "sha256": "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -10483,7 +9154,7 @@
         },
         "recipe": {
             "sha256": "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -10500,7 +9171,7 @@
         },
         "recipe": {
             "sha256": "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.10",
         "deps": [
@@ -10521,9 +9192,9 @@
         },
         "recipe": {
             "sha256": "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "04b",
+        "version": "4.2",
         "deps": []
     },
     "lfe-mode": {
@@ -10536,38 +9207,11 @@
         },
         "recipe": {
             "sha256": "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.10.1",
         "deps": []
     },
-    "color-theme": {
-        "fetch": {
-            "tag": "fetchbzr",
-            "url": "http://bzr.savannah.gnu.org/r/color-theme/trunk",
-            "sha256": "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz",
-            "rev": "57"
-        },
-        "recipe": {
-            "sha256": "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "ascii": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/ascii.el",
-            "sha256": "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75"
-        },
-        "recipe": {
-            "sha256": "0jb63f7qwhfbz0n4yrvnvx03cjqly3mqsc3rq9mgf4svy2zw702r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "nyan-prompt": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -10578,7 +9222,7 @@
         },
         "recipe": {
             "sha256": "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
@@ -10593,7 +9237,7 @@
         },
         "recipe": {
             "sha256": "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.2",
         "deps": [
@@ -10610,7 +9254,7 @@
         },
         "recipe": {
             "sha256": "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -10625,7 +9269,7 @@
         },
         "recipe": {
             "sha256": "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.2",
         "deps": [
@@ -10645,7 +9289,7 @@
         },
         "recipe": {
             "sha256": "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.6",
         "deps": [
@@ -10666,7 +9310,7 @@
         },
         "recipe": {
             "sha256": "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -10674,19 +9318,6 @@
             "go-mode"
         ]
     },
-    "finder+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/finder+.el",
-            "sha256": "01rkp2fa4h9pippa7q3702hn9bqgbdg7ml4w6dn72l8nj4vnrwmn"
-        },
-        "recipe": {
-            "sha256": "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "plenv": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -10697,7 +9328,7 @@
         },
         "recipe": {
             "sha256": "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.32",
         "deps": []
@@ -10712,7 +9343,7 @@
         },
         "recipe": {
             "sha256": "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": [
@@ -10729,7 +9360,7 @@
         },
         "recipe": {
             "sha256": "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.3",
         "deps": [
@@ -10746,7 +9377,7 @@
         },
         "recipe": {
             "sha256": "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.6",
         "deps": []
@@ -10761,7 +9392,7 @@
         },
         "recipe": {
             "sha256": "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.6",
         "deps": []
@@ -10776,7 +9407,7 @@
         },
         "recipe": {
             "sha256": "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -10791,7 +9422,7 @@
         },
         "recipe": {
             "sha256": "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.6.1",
         "deps": []
@@ -10806,7 +9437,7 @@
         },
         "recipe": {
             "sha256": "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -10823,7 +9454,7 @@
         },
         "recipe": {
             "sha256": "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -10840,52 +9471,13 @@
         },
         "recipe": {
             "sha256": "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.1",
         "deps": [
             "emacs"
         ]
     },
-    "list-processes+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/list-processes+.el",
-            "sha256": "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a"
-        },
-        "recipe": {
-            "sha256": "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "hippie-exp-ext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hippie-exp-ext.el",
-            "sha256": "1jkjg7zxpc06plzlyvj1a8dcvj8ijqzhkxwlsd12cgkymvp411yl"
-        },
-        "recipe": {
-            "sha256": "14py5hz523847f7bhw67v81x5cfhzz5la15mrqavc4z4yicy63iq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "recentf-ext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/recentf-ext.el",
-            "sha256": "15kwkphrlxq6nbmqm95sxv4rykl1d35sjm59ncy07ncqm706h33l"
-        },
-        "recipe": {
-            "sha256": "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ov": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -10896,27 +9488,13 @@
         },
         "recipe": {
             "sha256": "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.6",
         "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": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ibuffer-vc": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -10927,7 +9505,7 @@
         },
         "recipe": {
             "sha256": "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.10",
         "deps": [
@@ -10944,7 +9522,7 @@
         },
         "recipe": {
             "sha256": "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -10968,7 +9546,7 @@
         },
         "recipe": {
             "sha256": "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -10985,7 +9563,7 @@
         },
         "recipe": {
             "sha256": "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": []
@@ -11000,7 +9578,7 @@
         },
         "recipe": {
             "sha256": "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.2",
         "deps": []
@@ -11015,26 +9593,13 @@
         },
         "recipe": {
             "sha256": "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.0",
         "deps": [
             "auto-complete"
         ]
     },
-    "time-ext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/time-ext.el",
-            "sha256": "0kxgzjwgd979aypjak07k8ss6hnm3x9f96z1rz2zsz2i3vvh6sqv"
-        },
-        "recipe": {
-            "sha256": "15b3m1jvr7kg5sc4c8cp0aaiiyivfx8ip1zf7w5m702krv4lfvpk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ws-butler": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -11045,7 +9610,7 @@
         },
         "recipe": {
             "sha256": "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": []
@@ -11060,7 +9625,7 @@
         },
         "recipe": {
             "sha256": "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.44",
         "deps": []
@@ -11075,7 +9640,7 @@
         },
         "recipe": {
             "sha256": "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": []
@@ -11090,7 +9655,7 @@
         },
         "recipe": {
             "sha256": "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.20",
         "deps": []
@@ -11105,7 +9670,7 @@
         },
         "recipe": {
             "sha256": "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -11123,7 +9688,7 @@
         },
         "recipe": {
             "sha256": "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -11138,7 +9703,7 @@
         },
         "recipe": {
             "sha256": "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.8",
         "deps": [
@@ -11156,7 +9721,7 @@
         },
         "recipe": {
             "sha256": "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -11169,23 +9734,10 @@
             "rev": "5b49aea3810d"
         },
         "recipe": {
-            "sha256": "00vck0ma5c4zygw0jfqx4nk4pv40rvzvrlp8igzwr0533p19p0pk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0",
-        "deps": []
-    },
-    "dired-sort": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired-sort.el",
-            "sha256": "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z"
-        },
-        "recipe": {
-            "sha256": "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
+        "version": "1.78",
         "deps": []
     },
     "pandoc-mode": {
@@ -11198,7 +9750,7 @@
         },
         "recipe": {
             "sha256": "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.13.3",
         "deps": [
@@ -11216,7 +9768,7 @@
         },
         "recipe": {
             "sha256": "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": []
@@ -11231,7 +9783,7 @@
         },
         "recipe": {
             "sha256": "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.10.0",
         "deps": [
@@ -11248,7 +9800,7 @@
         },
         "recipe": {
             "sha256": "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -11266,7 +9818,7 @@
         },
         "recipe": {
             "sha256": "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -11283,7 +9835,7 @@
         },
         "recipe": {
             "sha256": "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.2",
         "deps": [
@@ -11300,7 +9852,7 @@
         },
         "recipe": {
             "sha256": "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.4",
         "deps": [
@@ -11319,26 +9871,13 @@
         },
         "recipe": {
             "sha256": "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
             "skewer-mode"
         ]
     },
-    "eimp": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/eimp.el",
-            "sha256": "024qyipwlj3g0fff06cgq357blkh3hyr14vpmkqsv15x6gb9snir"
-        },
-        "recipe": {
-            "sha256": "11z23kx89yy03hzs1xlbcih70lsp2lplxs8nkc8jvfcpsjwypsl0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "flymake-perlcritic": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -11349,41 +9888,13 @@
         },
         "recipe": {
             "sha256": "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.3",
         "deps": [
             "flymake"
         ]
     },
-    "dired-single": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired-single.el",
-            "sha256": "1ys38kjnqvks8w207jv6y5yh30rarmib0p78ak761k9sldgd6wvx"
-        },
-        "recipe": {
-            "sha256": "075vzvmh9y403m1vm5a807vkzrqv8dmhgfdzyizfj80q365sv72p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "oneonone": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/oneonone.el",
-            "sha256": "1810acc61dwdq80jwn5diwg9djzag3n1l9lql72bjkq21my320k5"
-        },
-        "recipe": {
-            "sha256": "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "hexrgb"
-        ]
-    },
     "emamux": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -11394,7 +9905,7 @@
         },
         "recipe": {
             "sha256": "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.13",
         "deps": [
@@ -11412,7 +9923,7 @@
         },
         "recipe": {
             "sha256": "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -11430,7 +9941,7 @@
         },
         "recipe": {
             "sha256": "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8.11",
         "deps": [
@@ -11438,19 +9949,6 @@
             "emacs"
         ]
     },
-    "move-text": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/move-text.el",
-            "sha256": "0azda60cbz3kpvy6zd7pvlj40iwvj1zjdxv1brzqa6yfa4kyixv2"
-        },
-        "recipe": {
-            "sha256": "1xgq7wsh08fb23zv71lfw5rska9wijsl64ijpi2m06zyw1m7mdqr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ac-cake2": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -11461,7 +9959,7 @@
         },
         "recipe": {
             "sha256": "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.1",
         "deps": [
@@ -11479,9 +9977,9 @@
         },
         "recipe": {
             "sha256": "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "3.8.0b1",
+        "version": "3.8.0.2.1",
         "deps": []
     },
     "corral": {
@@ -11494,24 +9992,11 @@
         },
         "recipe": {
             "sha256": "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
     },
-    "look-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/look-mode.el",
-            "sha256": "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp"
-        },
-        "recipe": {
-            "sha256": "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "cacoo": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -11522,7 +10007,7 @@
         },
         "recipe": {
             "sha256": "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1.2",
         "deps": [
@@ -11539,7 +10024,7 @@
         },
         "recipe": {
             "sha256": "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.4",
         "deps": [
@@ -11556,7 +10041,7 @@
         },
         "recipe": {
             "sha256": "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.1",
         "deps": [
@@ -11573,7 +10058,7 @@
         },
         "recipe": {
             "sha256": "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.6",
         "deps": []
@@ -11588,7 +10073,7 @@
         },
         "recipe": {
             "sha256": "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.4",
         "deps": [
@@ -11607,26 +10092,13 @@
         },
         "recipe": {
             "sha256": "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2",
         "deps": [
             "cl-lib"
         ]
     },
-    "pretty-lambdada": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/pretty-lambdada.el",
-            "sha256": "0qda87pz137ki2527v2ji74nibazwxh8ykqv26315z6pz0q1dkin"
-        },
-        "recipe": {
-            "sha256": "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "omni-tags": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -11637,7 +10109,7 @@
         },
         "recipe": {
             "sha256": "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": [
@@ -11655,26 +10127,13 @@
         },
         "recipe": {
             "sha256": "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.01",
+        "version": "0.1",
         "deps": [
             "cl-lib"
         ]
     },
-    "tfs": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/tfs.el",
-            "sha256": "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v"
-        },
-        "recipe": {
-            "sha256": "10szb9mni37s2blvhl1spj96narmkrv8zhrryw9q1251z8laq5v0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "page-break-lines": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -11685,7 +10144,7 @@
         },
         "recipe": {
             "sha256": "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.10",
         "deps": []
@@ -11700,7 +10159,7 @@
         },
         "recipe": {
             "sha256": "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.1",
         "deps": []
@@ -11715,7 +10174,7 @@
         },
         "recipe": {
             "sha256": "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -11730,7 +10189,7 @@
         },
         "recipe": {
             "sha256": "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.0",
         "deps": []
@@ -11745,7 +10204,7 @@
         },
         "recipe": {
             "sha256": "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -11760,7 +10219,7 @@
         },
         "recipe": {
             "sha256": "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -11779,7 +10238,7 @@
         },
         "recipe": {
             "sha256": "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": [
@@ -11796,7 +10255,7 @@
         },
         "recipe": {
             "sha256": "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.5",
         "deps": []
@@ -11811,26 +10270,13 @@
         },
         "recipe": {
             "sha256": "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.3",
         "deps": [
             "evil"
         ]
     },
-    "hl-line+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hl-line+.el",
-            "sha256": "023l9f74kmg66j2rj5h39b4l6svdd48i4h3bdvq8lwy0lz58g889"
-        },
-        "recipe": {
-            "sha256": "13yv2nmx1wb80z4yifnh6d67rag17wirmp7z8ssq3havjl8lbpix",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "xbm-life": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -11841,7 +10287,7 @@
         },
         "recipe": {
             "sha256": "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.3",
         "deps": []
@@ -11856,7 +10302,7 @@
         },
         "recipe": {
             "sha256": "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.1",
         "deps": []
@@ -11871,7 +10317,7 @@
         },
         "recipe": {
             "sha256": "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.13",
         "deps": []
@@ -11886,7 +10332,7 @@
         },
         "recipe": {
             "sha256": "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.4",
         "deps": []
@@ -11901,9 +10347,9 @@
         },
         "recipe": {
             "sha256": "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.03",
+        "version": "0.3",
         "deps": [
             "cl-lib",
             "helm-core"
@@ -11919,7 +10365,7 @@
         },
         "recipe": {
             "sha256": "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0",
         "deps": []
@@ -11934,7 +10380,7 @@
         },
         "recipe": {
             "sha256": "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -11949,7 +10395,7 @@
         },
         "recipe": {
             "sha256": "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.0",
         "deps": []
@@ -11964,7 +10410,7 @@
         },
         "recipe": {
             "sha256": "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.12.1",
         "deps": [
@@ -11982,7 +10428,7 @@
         },
         "recipe": {
             "sha256": "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.70",
         "deps": [
@@ -12001,7 +10447,7 @@
         },
         "recipe": {
             "sha256": "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.2",
         "deps": [
@@ -12018,7 +10464,7 @@
         },
         "recipe": {
             "sha256": "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2",
         "deps": []
@@ -12033,7 +10479,7 @@
         },
         "recipe": {
             "sha256": "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -12048,7 +10494,7 @@
         },
         "recipe": {
             "sha256": "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.2",
         "deps": [
@@ -12069,7 +10515,7 @@
         },
         "recipe": {
             "sha256": "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -12087,7 +10533,7 @@
         },
         "recipe": {
             "sha256": "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.4",
         "deps": [
@@ -12107,7 +10553,7 @@
         },
         "recipe": {
             "sha256": "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -12126,7 +10572,7 @@
         },
         "recipe": {
             "sha256": "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": [
@@ -12144,7 +10590,7 @@
         },
         "recipe": {
             "sha256": "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -12162,7 +10608,7 @@
         },
         "recipe": {
             "sha256": "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": []
@@ -12177,7 +10623,7 @@
         },
         "recipe": {
             "sha256": "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.9",
         "deps": [
@@ -12185,19 +10631,6 @@
             "rich-minority"
         ]
     },
-    "apu": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/apu.el",
-            "sha256": "1g70yzfsn4wg077biwf2ja6gj1qv728s2map3a1njy664ga3r1k4"
-        },
-        "recipe": {
-            "sha256": "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "live-py-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -12208,7 +10641,7 @@
         },
         "recipe": {
             "sha256": "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.8.1",
         "deps": []
@@ -12223,7 +10656,7 @@
         },
         "recipe": {
             "sha256": "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.6",
         "deps": []
@@ -12238,7 +10671,7 @@
         },
         "recipe": {
             "sha256": "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": [
@@ -12257,7 +10690,7 @@
         },
         "recipe": {
             "sha256": "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8.92",
         "deps": []
@@ -12272,7 +10705,7 @@
         },
         "recipe": {
             "sha256": "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -12289,7 +10722,7 @@
         },
         "recipe": {
             "sha256": "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.3",
         "deps": [
@@ -12307,7 +10740,7 @@
         },
         "recipe": {
             "sha256": "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -12322,7 +10755,7 @@
         },
         "recipe": {
             "sha256": "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.2",
         "deps": [
@@ -12340,7 +10773,7 @@
         },
         "recipe": {
             "sha256": "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": [
@@ -12357,7 +10790,7 @@
         },
         "recipe": {
             "sha256": "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": []
@@ -12372,7 +10805,7 @@
         },
         "recipe": {
             "sha256": "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
@@ -12387,7 +10820,7 @@
         },
         "recipe": {
             "sha256": "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150723.0",
         "deps": [
@@ -12405,7 +10838,7 @@
         },
         "recipe": {
             "sha256": "0axr0x8mdxif0xbvs83mxc3gqgs84jb4b9la9n62i3lldckghwmg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3",
         "deps": []
@@ -12420,7 +10853,7 @@
         },
         "recipe": {
             "sha256": "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -12428,19 +10861,6 @@
             "yaxception"
         ]
     },
-    "dropdown-list": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dropdown-list.el",
-            "sha256": "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a"
-        },
-        "recipe": {
-            "sha256": "14i9w897gnb3mvnkbzhzij04bgr551r8km310mbrmzzag54w077z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "docker": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -12451,7 +10871,7 @@
         },
         "recipe": {
             "sha256": "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -12461,19 +10881,6 @@
             "s"
         ]
     },
-    "fuzzy-format": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/fuzzy-format.el",
-            "sha256": "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7"
-        },
-        "recipe": {
-            "sha256": "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "auto-package-update": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -12484,7 +10891,7 @@
         },
         "recipe": {
             "sha256": "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6.1",
         "deps": [
@@ -12502,7 +10909,7 @@
         },
         "recipe": {
             "sha256": "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.0",
         "deps": []
@@ -12517,7 +10924,7 @@
         },
         "recipe": {
             "sha256": "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": [
@@ -12537,7 +10944,7 @@
         },
         "recipe": {
             "sha256": "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": [
@@ -12556,7 +10963,7 @@
         },
         "recipe": {
             "sha256": "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -12571,7 +10978,7 @@
         },
         "recipe": {
             "sha256": "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.0",
         "deps": [
@@ -12588,7 +10995,7 @@
         },
         "recipe": {
             "sha256": "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": []
@@ -12603,31 +11010,11 @@
         },
         "recipe": {
             "sha256": "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": []
     },
-    "helm-projectile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "projectile",
-            "sha256": "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf",
-            "rev": "1159110e83490f3b30d4d39e8c48022d3006900a"
-        },
-        "recipe": {
-            "sha256": "0s7la43q2v2h2s6lykxw5ag8if8d931jhw5k716b26ihzl1xxbv5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "0.13.0",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "helm",
-            "projectile"
-        ]
-    },
     "ahk-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -12638,7 +11025,7 @@
         },
         "recipe": {
             "sha256": "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5.5",
         "deps": []
@@ -12653,7 +11040,7 @@
         },
         "recipe": {
             "sha256": "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": [
@@ -12673,7 +11060,7 @@
         },
         "recipe": {
             "sha256": "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.2",
         "deps": []
@@ -12688,26 +11075,13 @@
         },
         "recipe": {
             "sha256": "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5.0",
         "deps": [
             "cl-lib"
         ]
     },
-    "gnus-spotlight": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/gnus-spotlight.el",
-            "sha256": "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4"
-        },
-        "recipe": {
-            "sha256": "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "uzumaki": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -12718,27 +11092,13 @@
         },
         "recipe": {
             "sha256": "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
             "cl-lib"
         ]
     },
-    "eredis": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://eredis.googlecode.com/svn/trunk/",
-            "sha256": "0cdyhklmsv0xfcq97c3wqh8scs6910jzvvp04w0jxlayd1dbzx49",
-            "rev": "28"
-        },
-        "recipe": {
-            "sha256": "1j0y4h97pqsw6k18w6r3rza3ql04ag3cixyndji7i1smbfsh4v95",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "fvwm-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -12749,7 +11109,7 @@
         },
         "recipe": {
             "sha256": "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6.4",
         "deps": []
@@ -12764,7 +11124,7 @@
         },
         "recipe": {
             "sha256": "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": []
@@ -12779,7 +11139,7 @@
         },
         "recipe": {
             "sha256": "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.0",
         "deps": [
@@ -12791,17 +11151,18 @@
             "tag": "fetchFromGitHub",
             "owner": "jyp",
             "repo": "boon",
-            "sha256": "0alxz27pyf669mkw5wvkidrvwm11iwbkl9k7v8lzq05kgy59bwkq",
-            "rev": "2430cf5bb509961142f68bfa34c1723a22917ddf"
+            "sha256": "1apxgj14hgfpz6hjp3384yjf2zrkv4pcncf2zklijs668igvaskq",
+            "rev": "82458a944e9cf3e4c959e63ebad09312aafe6d2c"
         },
         "recipe": {
             "sha256": "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.2",
+        "version": "0.3",
         "deps": [
             "emacs",
-            "expand-region"
+            "expand-region",
+            "multiple-cursors"
         ]
     },
     "inflections": {
@@ -12814,24 +11175,11 @@
         },
         "recipe": {
             "sha256": "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.3",
         "deps": []
     },
-    "todochiku": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/todochiku.el",
-            "sha256": "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5"
-        },
-        "recipe": {
-            "sha256": "1iq08s5ji6hd8as80qxqkbavnjbx0kcmmjjvhjchmvv93vsn1f96",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "color-theme-sanityinc-solarized": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -12842,7 +11190,7 @@
         },
         "recipe": {
             "sha256": "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.29",
         "deps": []
@@ -12857,7 +11205,7 @@
         },
         "recipe": {
             "sha256": "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2",
         "deps": []
@@ -12872,7 +11220,7 @@
         },
         "recipe": {
             "sha256": "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.2",
         "deps": []
@@ -12887,7 +11235,7 @@
         },
         "recipe": {
             "sha256": "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -12904,7 +11252,7 @@
         },
         "recipe": {
             "sha256": "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -12921,26 +11269,13 @@
         },
         "recipe": {
             "sha256": "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.2",
         "deps": [
             "eieio"
         ]
     },
-    "fuzzy-match": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/fuzzy-match.el",
-            "sha256": "1q2qvw2inizw9r47nff7ikvjzfsx1f8n6yf0j31fxvaawcdf91nq"
-        },
-        "recipe": {
-            "sha256": "0mpy84f2zdyzmipzhs06b8rl2pxiypazf35ls1nc1yj8r16ijrds",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "reverse-theme": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -12951,22 +11286,9 @@
         },
         "recipe": {
             "sha256": "1lq8nwhf8n5i280v0kqksndm4b3n6x34wnd5fa5i48ljwr5cinih",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.03",
-        "deps": []
-    },
-    "menu-bar+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/menu-bar+.el",
-            "sha256": "1vdqhn9srd8ihp0yjjj6lr0zl4n858wri0h3jzxmk3axc688lks7"
-        },
-        "recipe": {
-            "sha256": "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
+        "version": "0.3",
         "deps": []
     },
     "perspective": {
@@ -12979,7 +11301,7 @@
         },
         "recipe": {
             "sha256": "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.12",
         "deps": [
@@ -12996,7 +11318,7 @@
         },
         "recipe": {
             "sha256": "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1",
         "deps": []
@@ -13011,26 +11333,13 @@
         },
         "recipe": {
             "sha256": "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": [
             "cl-lib"
         ]
     },
-    "sqlplus": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/sqlplus.el",
-            "sha256": "0xixdddcrzx6k0s8w9rp6q7b9qjpdb4l888gmcis42yvawb1i53d"
-        },
-        "recipe": {
-            "sha256": "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "pt": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -13041,7 +11350,7 @@
         },
         "recipe": {
             "sha256": "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.3",
         "deps": []
@@ -13056,24 +11365,11 @@
         },
         "recipe": {
             "sha256": "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.0",
         "deps": []
     },
-    "mb-depth+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/mb-depth+.el",
-            "sha256": "02dszzkcqa2zwnafxyd6avsjgdrmb6c80j9qx0bgdkwm7yii090q"
-        },
-        "recipe": {
-            "sha256": "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "fold-dwim-org": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -13084,7 +11380,7 @@
         },
         "recipe": {
             "sha256": "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6",
         "deps": [
@@ -13101,7 +11397,7 @@
         },
         "recipe": {
             "sha256": "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.4",
         "deps": [
@@ -13120,7 +11416,7 @@
         },
         "recipe": {
             "sha256": "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -13135,7 +11431,7 @@
         },
         "recipe": {
             "sha256": "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -13144,19 +11440,6 @@
             "nixos-options"
         ]
     },
-    "face-remap+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/face-remap+.el",
-            "sha256": "13a439ipxy28l91c9gy6skq54xy2m3hj2qgqdjjqbinnhngg7ffi"
-        },
-        "recipe": {
-            "sha256": "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "flymake-json": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -13167,7 +11450,7 @@
         },
         "recipe": {
             "sha256": "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -13184,7 +11467,7 @@
         },
         "recipe": {
             "sha256": "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.0.18",
         "deps": [
@@ -13201,26 +11484,13 @@
         },
         "recipe": {
             "sha256": "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
             "dash"
         ]
     },
-    "showkey": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/showkey.el",
-            "sha256": "0fbpwqjgi15l1mk2p1m9apfj9a50566gi97wkin5hrc8zhm41k5r"
-        },
-        "recipe": {
-            "sha256": "1m280ll07i5c6s4w0s227jygdlpvd87dq45039v0sljyxm4bfrsv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "flymake-haskell-multi": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -13231,7 +11501,7 @@
         },
         "recipe": {
             "sha256": "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -13248,7 +11518,7 @@
         },
         "recipe": {
             "sha256": "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.7",
         "deps": []
@@ -13263,7 +11533,7 @@
         },
         "recipe": {
             "sha256": "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.8",
         "deps": [
@@ -13280,7 +11550,7 @@
         },
         "recipe": {
             "sha256": "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.2",
         "deps": [
@@ -13291,19 +11561,6 @@
             "s"
         ]
     },
-    "isearch-prop": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/isearch-prop.el",
-            "sha256": "190dlmrqk1g7ak5a3p6i97kwxk4lgz8y0kxf9ql75qis3hc4cl09"
-        },
-        "recipe": {
-            "sha256": "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "org-table-comment": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -13314,7 +11571,7 @@
         },
         "recipe": {
             "sha256": "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
@@ -13329,7 +11586,7 @@
         },
         "recipe": {
             "sha256": "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -13344,7 +11601,7 @@
         },
         "recipe": {
             "sha256": "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.11",
         "deps": [
@@ -13353,23 +11610,6 @@
             "migemo"
         ]
     },
-    "crosshairs": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/crosshairs.el",
-            "sha256": "0m2qggd8q3r32c8ipnp14093p0hbdd7i66nrv3q739wid7j98s8b"
-        },
-        "recipe": {
-            "sha256": "1gf73li6q5rg1dimzihxq0rdxiqzbl2w78r1qzc9mxw3qj7azxqp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "col-highlight",
-            "hl-line+",
-            "vline"
-        ]
-    },
     "osx-browse": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -13380,7 +11620,7 @@
         },
         "recipe": {
             "sha256": "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8.8",
         "deps": [
@@ -13398,7 +11638,7 @@
         },
         "recipe": {
             "sha256": "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -13415,7 +11655,7 @@
         },
         "recipe": {
             "sha256": "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.2",
         "deps": [
@@ -13432,7 +11672,7 @@
         },
         "recipe": {
             "sha256": "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.2",
         "deps": []
@@ -13447,7 +11687,7 @@
         },
         "recipe": {
             "sha256": "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": [
@@ -13465,7 +11705,7 @@
         },
         "recipe": {
             "sha256": "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -13484,7 +11724,7 @@
         },
         "recipe": {
             "sha256": "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4",
         "deps": [
@@ -13501,7 +11741,7 @@
         },
         "recipe": {
             "sha256": "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.1",
         "deps": []
@@ -13516,7 +11756,7 @@
         },
         "recipe": {
             "sha256": "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -13533,7 +11773,7 @@
         },
         "recipe": {
             "sha256": "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -13550,7 +11790,7 @@
         },
         "recipe": {
             "sha256": "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.0",
         "deps": []
@@ -13565,7 +11805,7 @@
         },
         "recipe": {
             "sha256": "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -13582,7 +11822,7 @@
         },
         "recipe": {
             "sha256": "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -13600,26 +11840,13 @@
         },
         "recipe": {
             "sha256": "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
             "expand-region"
         ]
     },
-    "hideshowvis": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hideshowvis.el",
-            "sha256": "15ax1j3j7kylyc8a91ja825sp4mhbdgx0j4i5kqxwhvmwvpmyrv6"
-        },
-        "recipe": {
-            "sha256": "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "tumble": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -13630,7 +11857,7 @@
         },
         "recipe": {
             "sha256": "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5",
         "deps": []
@@ -13645,7 +11872,7 @@
         },
         "recipe": {
             "sha256": "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7",
         "deps": []
@@ -13660,7 +11887,7 @@
         },
         "recipe": {
             "sha256": "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -13681,7 +11908,7 @@
         },
         "recipe": {
             "sha256": "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4",
         "deps": [
@@ -13698,25 +11925,11 @@
         },
         "recipe": {
             "sha256": "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
     },
-    "dsvn": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/",
-            "sha256": "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq",
-            "rev": "1720849"
-        },
-        "recipe": {
-            "sha256": "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "clocker": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -13727,7 +11940,7 @@
         },
         "recipe": {
             "sha256": "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.10",
         "deps": [
@@ -13735,19 +11948,6 @@
             "projectile"
         ]
     },
-    "hl-spotlight": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hl-spotlight.el",
-            "sha256": "1mvcvd8401w0xw8kjq6rwmmqa41npgdxgpghf4nxl6rghza77nwh"
-        },
-        "recipe": {
-            "sha256": "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "instapaper": {
         "fetch": {
             "tag": "fetchhg",
@@ -13757,7 +11957,7 @@
         },
         "recipe": {
             "sha256": "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.5",
         "deps": []
@@ -13772,24 +11972,11 @@
         },
         "recipe": {
             "sha256": "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1",
         "deps": []
     },
-    "findr": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/findr.el",
-            "sha256": "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q"
-        },
-        "recipe": {
-            "sha256": "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "whitaker": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -13800,7 +11987,7 @@
         },
         "recipe": {
             "sha256": "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -13817,7 +12004,7 @@
         },
         "recipe": {
             "sha256": "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8.12",
         "deps": [
@@ -13835,7 +12022,7 @@
         },
         "recipe": {
             "sha256": "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -13850,7 +12037,7 @@
         },
         "recipe": {
             "sha256": "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.1",
         "deps": [
@@ -13867,7 +12054,7 @@
         },
         "recipe": {
             "sha256": "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": [
@@ -13876,19 +12063,6 @@
             "s"
         ]
     },
-    "dired-sort-menu": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired-sort-menu.el",
-            "sha256": "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi"
-        },
-        "recipe": {
-            "sha256": "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "rinari": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -13899,7 +12073,7 @@
         },
         "recipe": {
             "sha256": "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.11",
         "deps": [
@@ -13919,7 +12093,7 @@
         },
         "recipe": {
             "sha256": "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8.4",
         "deps": [
@@ -13938,7 +12112,7 @@
         },
         "recipe": {
             "sha256": "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.2",
         "deps": [
@@ -13954,7 +12128,7 @@
         },
         "recipe": {
             "sha256": "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": []
@@ -13969,7 +12143,7 @@
         },
         "recipe": {
             "sha256": "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.5.10",
         "deps": []
@@ -13984,7 +12158,7 @@
         },
         "recipe": {
             "sha256": "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -13992,19 +12166,6 @@
             "ido-vertical-mode"
         ]
     },
-    "cus-edit+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/cus-edit+.el",
-            "sha256": "0qqfxnsy124nk61iqgb8rjwziyj6h4nvx0gdpsj03z1zh7gqms9s"
-        },
-        "recipe": {
-            "sha256": "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "outshine": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -14015,7 +12176,7 @@
         },
         "recipe": {
             "sha256": "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0",
         "deps": []
@@ -14030,7 +12191,7 @@
         },
         "recipe": {
             "sha256": "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.3",
         "deps": []
@@ -14045,7 +12206,7 @@
         },
         "recipe": {
             "sha256": "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -14060,7 +12221,7 @@
         },
         "recipe": {
             "sha256": "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.4",
         "deps": [
@@ -14077,7 +12238,7 @@
         },
         "recipe": {
             "sha256": "023zvgmi5b5b2qga3jqd7jrq9ap8n3rhvl6jrv9fsi565sg1fv43",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.48",
         "deps": [
@@ -14095,39 +12256,13 @@
         },
         "recipe": {
             "sha256": "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
             "direx"
         ]
     },
-    "muttrc-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/muttrc-mode.el",
-            "sha256": "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis"
-        },
-        "recipe": {
-            "sha256": "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "cmds-menu": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/cmds-menu.el",
-            "sha256": "1dfnvvdlyb8jlrj6zkmry075vmax77kyjnk5mjsfz2wwyk5lsfb5"
-        },
-        "recipe": {
-            "sha256": "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "cmake-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -14138,26 +12273,11 @@
         },
         "recipe": {
             "sha256": "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.4.1",
         "deps": []
     },
-    "eyedropper": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/eyedropper.el",
-            "sha256": "1bs8239sv3mjyj2dw72wrl7yp1ds7gs3cs4a9ds7hlzzz7qw9s6s"
-        },
-        "recipe": {
-            "sha256": "07kdn90vm2nbdprw9hwdgi4py6gqzmrad09y1fwqdy49hrvbwdzk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "hexrgb"
-        ]
-    },
     "interleave": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -14168,7 +12288,7 @@
         },
         "recipe": {
             "sha256": "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -14183,7 +12303,7 @@
         },
         "recipe": {
             "sha256": "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.9",
         "deps": [
@@ -14191,19 +12311,6 @@
             "emacs"
         ]
     },
-    "delight": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/delight.el",
-            "sha256": "1gap2icsqi7cryfvcffh41zqg2ghl4y7kg9pngzdfjrc3m7sf635"
-        },
-        "recipe": {
-            "sha256": "1d9m5k18k73vhidwd50mcbq7mlvwdn4sb9ih8r5gri9a9whi2nkj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "speech-tagger": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -14214,7 +12321,7 @@
         },
         "recipe": {
             "sha256": "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.0",
         "deps": []
@@ -14229,7 +12336,7 @@
         },
         "recipe": {
             "sha256": "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.1",
         "deps": []
@@ -14244,7 +12351,7 @@
         },
         "recipe": {
             "sha256": "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": []
@@ -14259,7 +12366,7 @@
         },
         "recipe": {
             "sha256": "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.2",
         "deps": []
@@ -14274,7 +12381,7 @@
         },
         "recipe": {
             "sha256": "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": []
@@ -14289,7 +12396,7 @@
         },
         "recipe": {
             "sha256": "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -14309,7 +12416,7 @@
         },
         "recipe": {
             "sha256": "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
@@ -14324,7 +12431,7 @@
         },
         "recipe": {
             "sha256": "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6",
         "deps": [
@@ -14341,7 +12448,7 @@
         },
         "recipe": {
             "sha256": "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.6",
         "deps": [
@@ -14358,7 +12465,7 @@
         },
         "recipe": {
             "sha256": "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2015.11.29",
         "deps": []
@@ -14373,7 +12480,7 @@
         },
         "recipe": {
             "sha256": "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -14382,19 +12489,6 @@
             "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": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "win-switch": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -14405,7 +12499,7 @@
         },
         "recipe": {
             "sha256": "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -14420,7 +12514,7 @@
         },
         "recipe": {
             "sha256": "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.1",
         "deps": [
@@ -14437,7 +12531,7 @@
         },
         "recipe": {
             "sha256": "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": [
@@ -14454,7 +12548,7 @@
         },
         "recipe": {
             "sha256": "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.1",
         "deps": []
@@ -14469,24 +12563,11 @@
         },
         "recipe": {
             "sha256": "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
     },
-    "etags-table": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/etags-table.el",
-            "sha256": "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf"
-        },
-        "recipe": {
-            "sha256": "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ac-alchemist": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -14497,9 +12578,9 @@
         },
         "recipe": {
             "sha256": "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.01",
+        "version": "0.1",
         "deps": [
             "alchemist",
             "auto-complete",
@@ -14516,7 +12597,7 @@
         },
         "recipe": {
             "sha256": "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -14534,7 +12615,7 @@
         },
         "recipe": {
             "sha256": "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -14549,7 +12630,7 @@
         },
         "recipe": {
             "sha256": "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": [
@@ -14566,7 +12647,7 @@
         },
         "recipe": {
             "sha256": "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.1",
         "deps": [
@@ -14583,7 +12664,7 @@
         },
         "recipe": {
             "sha256": "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.0",
         "deps": []
@@ -14598,7 +12679,7 @@
         },
         "recipe": {
             "sha256": "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -14615,7 +12696,7 @@
         },
         "recipe": {
             "sha256": "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.7",
         "deps": [
@@ -14634,9 +12715,9 @@
         },
         "recipe": {
             "sha256": "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.03",
+        "version": "0.3",
         "deps": [
             "cl-lib",
             "emacs"
@@ -14652,7 +12733,7 @@
         },
         "recipe": {
             "sha256": "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.2",
         "deps": [
@@ -14673,7 +12754,7 @@
         },
         "recipe": {
             "sha256": "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5",
         "deps": []
@@ -14688,7 +12769,7 @@
         },
         "recipe": {
             "sha256": "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.1",
         "deps": []
@@ -14703,7 +12784,7 @@
         },
         "recipe": {
             "sha256": "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": []
@@ -14718,7 +12799,7 @@
         },
         "recipe": {
             "sha256": "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.6",
         "deps": []
@@ -14733,26 +12814,13 @@
         },
         "recipe": {
             "sha256": "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.10",
         "deps": [
             "emacs"
         ]
     },
-    "goto-chg": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/goto-chg.el",
-            "sha256": "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij"
-        },
-        "recipe": {
-            "sha256": "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "dired-fdclone": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -14763,7 +12831,7 @@
         },
         "recipe": {
             "sha256": "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5.2",
         "deps": []
@@ -14778,7 +12846,7 @@
         },
         "recipe": {
             "sha256": "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.7",
         "deps": [
@@ -14796,7 +12864,7 @@
         },
         "recipe": {
             "sha256": "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.20131027",
         "deps": []
@@ -14811,7 +12879,7 @@
         },
         "recipe": {
             "sha256": "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -14826,7 +12894,7 @@
         },
         "recipe": {
             "sha256": "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -14841,7 +12909,7 @@
         },
         "recipe": {
             "sha256": "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.7",
         "deps": [
@@ -14855,14 +12923,14 @@
             "tag": "fetchFromGitHub",
             "owner": "AdrieanKhisbe",
             "repo": "cask-package-toolset.el",
-            "sha256": "1182z9h6xk8mj2blq4x4429kjg7b9s54gdhza4cdb6jk9409bdrn",
-            "rev": "27467a52e243f3ba4024ce19d8e1f4dbd5dd7c0b"
+            "sha256": "0a2cyx80w2ijp6v6jngahqc0df5vjaf71wm6kq55p0ws511h7184",
+            "rev": "22f0c0bbc89d68004af5c6fcb5a6bda2591ed187"
         },
         "recipe": {
             "sha256": "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.8.1",
+        "version": "0.9.0",
         "deps": [
             "ansi",
             "cl-lib",
@@ -14884,7 +12952,7 @@
         },
         "recipe": {
             "sha256": "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1",
         "deps": []
@@ -14898,7 +12966,7 @@
         },
         "recipe": {
             "sha256": "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -14913,7 +12981,7 @@
         },
         "recipe": {
             "sha256": "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.2",
         "deps": []
@@ -14928,7 +12996,7 @@
         },
         "recipe": {
             "sha256": "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.1",
         "deps": [
@@ -14936,19 +13004,6 @@
             "math-symbol-lists"
         ]
     },
-    "window-number": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/window-number.el",
-            "sha256": "1as3qbvj6d171qp2s8ycqqi16bgqm47vfk3fbxrl9szjzaxh9nw6"
-        },
-        "recipe": {
-            "sha256": "1qhlsdhs40cyly87pj3f1n6ckr7z5pmhqndgay5jyxwxxdpknpap",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "minibuffer-complete-cycle": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -14959,7 +13014,7 @@
         },
         "recipe": {
             "sha256": "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.25.20130814",
         "deps": []
@@ -14974,7 +13029,7 @@
         },
         "recipe": {
             "sha256": "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -14995,7 +13050,7 @@
         },
         "recipe": {
             "sha256": "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -15012,7 +13067,7 @@
         },
         "recipe": {
             "sha256": "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8.6",
         "deps": [
@@ -15024,19 +13079,6 @@
             "tabulated-list"
         ]
     },
-    "thesaurus": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/thesaurus.el",
-            "sha256": "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq"
-        },
-        "recipe": {
-            "sha256": "1nyjk9jr1xvdkil13ylfsgg7q2sx71za05gi8m2v5f45pbmbi50h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "relax": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -15047,7 +13089,7 @@
         },
         "recipe": {
             "sha256": "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -15064,7 +13106,7 @@
         },
         "recipe": {
             "sha256": "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.3",
         "deps": []
@@ -15079,7 +13121,7 @@
         },
         "recipe": {
             "sha256": "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -15098,27 +13140,11 @@
         },
         "recipe": {
             "sha256": "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": []
     },
-    "thumb-frm": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/thumb-frm.el",
-            "sha256": "1zyx30awgdvhfbr7fzgizm7gl93j0hqckiafp2jmlaarl8s2i36i"
-        },
-        "recipe": {
-            "sha256": "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "frame-cmds",
-            "frame-fns"
-        ]
-    },
     "browse-url-dwim": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -15129,7 +13155,7 @@
         },
         "recipe": {
             "sha256": "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.8",
         "deps": [
@@ -15146,7 +13172,7 @@
         },
         "recipe": {
             "sha256": "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.8",
         "deps": []
@@ -15161,7 +13187,7 @@
         },
         "recipe": {
             "sha256": "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": [
@@ -15175,14 +13201,14 @@
             "tag": "fetchFromGitHub",
             "owner": "ardumont",
             "repo": "markdown-toc",
-            "sha256": "1syvz866xb0b0c3qkf786qzin4r27yppx0vmm9vx7rr0nfz7prz0",
-            "rev": "30b9cb4b79b210e150c4e2774ce2ef1a6c5230e4"
+            "sha256": "0jgr327qlh7acwi6sld27xdsvr89parspk6wmfklwszvy1v13633",
+            "rev": "c2ac578113015ba7d3377c0756a4d00c61ba2e17"
         },
         "recipe": {
             "sha256": "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.0.8",
+        "version": "0.0.9",
         "deps": [
             "dash",
             "markdown-mode",
@@ -15199,7 +13225,7 @@
         },
         "recipe": {
             "sha256": "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.31",
         "deps": [
@@ -15217,7 +13243,7 @@
         },
         "recipe": {
             "sha256": "13lld7kjz1n1ryxvrfsy0iym5l9m9ybrf7bpcmkzsalpp15j3mvm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": [
@@ -15234,7 +13260,7 @@
         },
         "recipe": {
             "sha256": "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -15244,14 +13270,14 @@
             "tag": "fetchFromGitHub",
             "owner": "jcollard",
             "repo": "elm-mode",
-            "sha256": "0asry7b5s1mj0hpvwhazrn7l1ipyzm0sv4jp6jxshsjvmy6mgxwd",
-            "rev": "51f0dabb23b924725744f36501468b2017972f56"
+            "sha256": "055bnhkw0nvry3n20a980nrq3y2rlihp59pmrm1s4rlb0f5drckc",
+            "rev": "3462740eb2add23fc294aa5b2b549ee08f5f711e"
         },
         "recipe": {
             "sha256": "18hky1d1d2q5paz271w17r6n1k2sb7rrski8dxq3q586k4lqykj2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.5.0",
+        "version": "0.5.3",
         "deps": [
             "emacs",
             "f",
@@ -15269,9 +13295,9 @@
         },
         "recipe": {
             "sha256": "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "1.08",
+        "version": "1.8",
         "deps": [
             "helm"
         ]
@@ -15286,7 +13312,7 @@
         },
         "recipe": {
             "sha256": "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -15303,7 +13329,7 @@
         },
         "recipe": {
             "sha256": "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": []
@@ -15318,7 +13344,7 @@
         },
         "recipe": {
             "sha256": "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1.1",
         "deps": [
@@ -15336,7 +13362,7 @@
         },
         "recipe": {
             "sha256": "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.0",
         "deps": [
@@ -15353,7 +13379,7 @@
         },
         "recipe": {
             "sha256": "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9",
         "deps": [
@@ -15373,26 +13399,13 @@
         },
         "recipe": {
             "sha256": "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
             "helm"
         ]
     },
-    "sr-speedbar": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/sr-speedbar.el",
-            "sha256": "1ffnm2kfh8cg5rdhrkqmh4krggbxvqg3s6lc1nssv88av1c5cs3i"
-        },
-        "recipe": {
-            "sha256": "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "emr": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -15403,7 +13416,7 @@
         },
         "recipe": {
             "sha256": "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.6",
         "deps": [
@@ -15428,7 +13441,7 @@
         },
         "recipe": {
             "sha256": "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -15448,7 +13461,7 @@
         },
         "recipe": {
             "sha256": "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -15463,7 +13476,7 @@
         },
         "recipe": {
             "sha256": "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -15484,7 +13497,7 @@
         },
         "recipe": {
             "sha256": "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -15503,7 +13516,7 @@
         },
         "recipe": {
             "sha256": "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.1",
         "deps": []
@@ -15518,7 +13531,7 @@
         },
         "recipe": {
             "sha256": "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -15533,7 +13546,7 @@
         },
         "recipe": {
             "sha256": "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.3",
         "deps": []
@@ -15548,26 +13561,13 @@
         },
         "recipe": {
             "sha256": "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "13.16",
         "deps": [
             "cl-lib"
         ]
     },
-    "icicles": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/icicles.el",
-            "sha256": "1vr4wp808rv8kiq324ph2jfbqdw1wzii41rca45v5w21gway169s"
-        },
-        "recipe": {
-            "sha256": "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "linum-relative": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -15578,7 +13578,7 @@
         },
         "recipe": {
             "sha256": "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -15593,7 +13593,7 @@
         },
         "recipe": {
             "sha256": "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.23",
         "deps": []
@@ -15608,37 +13608,11 @@
         },
         "recipe": {
             "sha256": "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.4",
         "deps": []
     },
-    "wimpy-del": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/wimpy-del.el",
-            "sha256": "05gmqx9qj95fd4lryvpp7rk93f1ibsvl3lqanraph0s73ir48x3z"
-        },
-        "recipe": {
-            "sha256": "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "help+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/help+.el",
-            "sha256": "0vdga10l8vslsicrspl3wyhf6a5jxdwzqb7r8g07fbd4f09d57a4"
-        },
-        "recipe": {
-            "sha256": "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "org-projectile": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -15649,7 +13623,7 @@
         },
         "recipe": {
             "sha256": "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -15657,19 +13631,6 @@
             "projectile"
         ]
     },
-    "doremi-mac": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/doremi-mac.el",
-            "sha256": "1zlb6r5qy46yf5x499gzk6kvdy427qf3s9gzmpf5mzszcy6rzsfx"
-        },
-        "recipe": {
-            "sha256": "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "flyspell-popup": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -15680,7 +13641,7 @@
         },
         "recipe": {
             "sha256": "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -15697,7 +13658,7 @@
         },
         "recipe": {
             "sha256": "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.9",
         "deps": []
@@ -15712,24 +13673,11 @@
         },
         "recipe": {
             "sha256": "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.7",
         "deps": []
     },
-    "replace-from-region": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/replace-from-region.el",
-            "sha256": "1clxkzxqsm91zbzv8nffav224ldr04ww5lppga2l41xjfl6z12qb"
-        },
-        "recipe": {
-            "sha256": "19q8hz2xiyamhw8hzpahqwd4352k1m9r9wlh9kdh6hbb6sjgllnb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "fuel": {
         "fetch": {
             "tag": "fetchgit",
@@ -15739,57 +13687,30 @@
         },
         "recipe": {
             "sha256": "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.96",
         "deps": []
     },
-    "mic-paren": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/mic-paren.el",
-            "sha256": "1ibim60fx0srmvchwbb2s04dmcc7mv7zyg1vqavas24ya2gmixc5"
-        },
-        "recipe": {
-            "sha256": "1kdmp0wd7838nk58lby8gx91pjan47lq3izk4vdb2vm0h0iq57sa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "helm-core": {
         "fetch": {
             "tag": "fetchFromGitHub",
             "owner": "emacs-helm",
             "repo": "helm",
-            "sha256": "1cl01rprns989k5gr89qjpa6sg0s2ndrsdcmcyszrnaisvz7im53",
-            "rev": "97e8ffaed3c5959e9c16e7a0e45cc0702218b2cc"
+            "sha256": "0awr4nvzgp1kckxqli1xw4pk16gc22i8hchin63fqvk0gllcy454",
+            "rev": "fe96a398aa09ed0d25f6782efa5833085aa63791"
         },
         "recipe": {
             "sha256": "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "1.9.0",
+        "version": "1.9.1",
         "deps": [
             "async",
             "cl-lib",
             "emacs"
         ]
     },
-    "sml-modeline": {
-        "fetch": {
-            "tag": "fetchbzr",
-            "url": "lp:~nxhtml/nxhtml/main",
-            "sha256": "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4",
-            "rev": "835"
-        },
-        "recipe": {
-            "sha256": "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "wonderland": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -15800,7 +13721,7 @@
         },
         "recipe": {
             "sha256": "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -15820,7 +13741,7 @@
         },
         "recipe": {
             "sha256": "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.7",
         "deps": [
@@ -15829,45 +13750,6 @@
             "yaxception"
         ]
     },
-    "synonyms": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/synonyms.el",
-            "sha256": "1vqsi13ygbzjh3a6hdzidjy1p1xjxxvbisax8lcppy99l2cymr20"
-        },
-        "recipe": {
-            "sha256": "0rnq97jpr047gpkxhw22jj3gw09r45vn6fwkzxnxjzcmsyk492d0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "save-load-path": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/save-load-path.el",
-            "sha256": "1p8p5b85sdnq45rdjq5wcr3xz7c22mr5bz41a21mkabc4j4fvd3z"
-        },
-        "recipe": {
-            "sha256": "01hm1rm9x3bqs6vf65l4xv2n4ramh3qwgmrp632fyfz5dlrvbssi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "fic-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/fic-mode.el",
-            "sha256": "110h0ff7bkwx7icph0j997hq53zpyz426dji4vs89zf75cf1nl7s"
-        },
-        "recipe": {
-            "sha256": "037f2jr8bs2sfxw28cal2d49bsbrg0zkz2xdham627l04qnkgv8x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "dionysos": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -15878,7 +13760,7 @@
         },
         "recipe": {
             "sha256": "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -15898,7 +13780,7 @@
         },
         "recipe": {
             "sha256": "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.5",
         "deps": [
@@ -15925,7 +13807,7 @@
         },
         "recipe": {
             "sha256": "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": [
@@ -15943,9 +13825,9 @@
         },
         "recipe": {
             "sha256": "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "7.9.3e",
+        "version": "7.9.3.5",
         "deps": []
     },
     "annotate": {
@@ -15958,7 +13840,7 @@
         },
         "recipe": {
             "sha256": "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.4",
         "deps": []
@@ -15973,7 +13855,7 @@
         },
         "recipe": {
             "sha256": "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -15988,7 +13870,7 @@
         },
         "recipe": {
             "sha256": "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.1",
         "deps": [
@@ -16005,7 +13887,7 @@
         },
         "recipe": {
             "sha256": "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.4",
         "deps": [
@@ -16022,24 +13904,11 @@
         },
         "recipe": {
             "sha256": "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": []
     },
-    "mouse+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/mouse+.el",
-            "sha256": "1l29smg3r2b2b08869wsrwyr5239gznd88xwf40q7qi350cj8fwy"
-        },
-        "recipe": {
-            "sha256": "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "sexp-move": {
         "fetch": {
             "tag": "fetchFromGitLab",
@@ -16050,7 +13919,7 @@
         },
         "recipe": {
             "sha256": "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.6",
         "deps": []
@@ -16065,7 +13934,7 @@
         },
         "recipe": {
             "sha256": "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.1",
         "deps": [
@@ -16081,7 +13950,7 @@
         },
         "recipe": {
             "sha256": "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.0",
         "deps": []
@@ -16096,7 +13965,7 @@
         },
         "recipe": {
             "sha256": "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": []
@@ -16111,7 +13980,7 @@
         },
         "recipe": {
             "sha256": "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.3",
         "deps": []
@@ -16126,7 +13995,7 @@
         },
         "recipe": {
             "sha256": "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": []
@@ -16141,7 +14010,7 @@
         },
         "recipe": {
             "sha256": "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -16151,19 +14020,6 @@
             "yaxception"
         ]
     },
-    "cygwin-mount": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/cygwin-mount.el",
-            "sha256": "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw"
-        },
-        "recipe": {
-            "sha256": "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "stgit": {
         "fetch": {
             "tag": "fetchgit",
@@ -16173,7 +14029,7 @@
         },
         "recipe": {
             "sha256": "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.17.1",
         "deps": []
@@ -16188,7 +14044,7 @@
         },
         "recipe": {
             "sha256": "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.3",
         "deps": [
@@ -16205,7 +14061,7 @@
         },
         "recipe": {
             "sha256": "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.2",
         "deps": []
@@ -16220,7 +14076,7 @@
         },
         "recipe": {
             "sha256": "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": [
@@ -16239,7 +14095,7 @@
         },
         "recipe": {
             "sha256": "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": [
@@ -16249,19 +14105,6 @@
             "s"
         ]
     },
-    "highlight-tail": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/highlight-tail.el",
-            "sha256": "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg"
-        },
-        "recipe": {
-            "sha256": "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "common-lisp-snippets": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -16272,7 +14115,7 @@
         },
         "recipe": {
             "sha256": "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -16289,7 +14132,7 @@
         },
         "recipe": {
             "sha256": "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": []
@@ -16304,7 +14147,7 @@
         },
         "recipe": {
             "sha256": "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.3",
         "deps": []
@@ -16319,7 +14162,7 @@
         },
         "recipe": {
             "sha256": "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8.0",
         "deps": [
@@ -16336,7 +14179,7 @@
         },
         "recipe": {
             "sha256": "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1.2",
         "deps": []
@@ -16351,7 +14194,7 @@
         },
         "recipe": {
             "sha256": "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.3",
         "deps": []
@@ -16366,7 +14209,7 @@
         },
         "recipe": {
             "sha256": "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -16384,7 +14227,7 @@
         },
         "recipe": {
             "sha256": "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.1",
         "deps": []
@@ -16398,7 +14241,7 @@
         },
         "recipe": {
             "sha256": "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6.5",
         "deps": [
@@ -16407,19 +14250,6 @@
             "s"
         ]
     },
-    "subr+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/subr+.el",
-            "sha256": "16k141aikvwg5dsw8mfkv222ikjdch0178dm8w58km0mjj7j81wk"
-        },
-        "recipe": {
-            "sha256": "1vrv64768f7rk58mqr4pq1fjyi5n5kfqk90hzrwbvblkkrmilmfs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "extend-dnd": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -16430,7 +14260,7 @@
         },
         "recipe": {
             "sha256": "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5",
         "deps": []
@@ -16445,7 +14275,7 @@
         },
         "recipe": {
             "sha256": "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7",
         "deps": [
@@ -16463,7 +14293,7 @@
         },
         "recipe": {
             "sha256": "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.1",
         "deps": [
@@ -16481,7 +14311,7 @@
         },
         "recipe": {
             "sha256": "121sszwvihbv688nq5lhdclvsjj8759glh42h82r4pcw30lxggxb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.14",
         "deps": [
@@ -16500,7 +14330,7 @@
         },
         "recipe": {
             "sha256": "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -16520,7 +14350,7 @@
         },
         "recipe": {
             "sha256": "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.1",
         "deps": [
@@ -16538,26 +14368,13 @@
         },
         "recipe": {
             "sha256": "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "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": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "flymake-less": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -16568,7 +14385,7 @@
         },
         "recipe": {
             "sha256": "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -16585,7 +14402,7 @@
         },
         "recipe": {
             "sha256": "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.1",
         "deps": [
@@ -16607,7 +14424,7 @@
         },
         "recipe": {
             "sha256": "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4.2",
         "deps": [
@@ -16625,7 +14442,7 @@
         },
         "recipe": {
             "sha256": "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -16642,7 +14459,7 @@
         },
         "recipe": {
             "sha256": "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -16657,7 +14474,7 @@
         },
         "recipe": {
             "sha256": "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1.0",
         "deps": [
@@ -16665,19 +14482,6 @@
             "magit"
         ]
     },
-    "awk-it": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/awk-it.el",
-            "sha256": "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw"
-        },
-        "recipe": {
-            "sha256": "1rnrm9jf9wvfrwyylhj0bfrz9140945lc87lrh21caf7q88fpvkw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ace-isearch": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -16688,7 +14492,7 @@
         },
         "recipe": {
             "sha256": "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.4",
         "deps": [
@@ -16708,7 +14512,7 @@
         },
         "recipe": {
             "sha256": "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.2",
         "deps": [
@@ -16725,7 +14529,7 @@
         },
         "recipe": {
             "sha256": "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -16740,7 +14544,7 @@
         },
         "recipe": {
             "sha256": "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -16759,7 +14563,7 @@
         },
         "recipe": {
             "sha256": "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5",
         "deps": [
@@ -16777,7 +14581,7 @@
         },
         "recipe": {
             "sha256": "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": []
@@ -16792,7 +14596,7 @@
         },
         "recipe": {
             "sha256": "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.0",
         "deps": [
@@ -16811,7 +14615,7 @@
         },
         "recipe": {
             "sha256": "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -16826,24 +14630,11 @@
         },
         "recipe": {
             "sha256": "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": []
     },
-    "header2": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/header2.el",
-            "sha256": "04gp3km2d163cw8gqzb02dj3kq23s96ncip5c03whpja2sj9ji6f"
-        },
-        "recipe": {
-            "sha256": "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "move-dup": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -16854,7 +14645,7 @@
         },
         "recipe": {
             "sha256": "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": []
@@ -16869,7 +14660,7 @@
         },
         "recipe": {
             "sha256": "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.1",
         "deps": []
@@ -16884,7 +14675,7 @@
         },
         "recipe": {
             "sha256": "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.1",
         "deps": [
@@ -16901,7 +14692,7 @@
         },
         "recipe": {
             "sha256": "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.3",
         "deps": [
@@ -16918,7 +14709,7 @@
         },
         "recipe": {
             "sha256": "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.1",
         "deps": [
@@ -16935,7 +14726,7 @@
         },
         "recipe": {
             "sha256": "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.150707",
         "deps": [
@@ -16955,7 +14746,7 @@
         },
         "recipe": {
             "sha256": "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -16975,7 +14766,7 @@
         },
         "recipe": {
             "sha256": "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.13.0",
         "deps": [
@@ -16993,7 +14784,7 @@
         },
         "recipe": {
             "sha256": "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
@@ -17008,7 +14799,7 @@
         },
         "recipe": {
             "sha256": "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.8.9",
         "deps": [
@@ -17026,7 +14817,7 @@
         },
         "recipe": {
             "sha256": "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.25.1",
         "deps": [
@@ -17048,24 +14839,11 @@
         },
         "recipe": {
             "sha256": "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
     },
-    "dired+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired+.el",
-            "sha256": "0pgm5pg3z7cbrvs12fwj6g2kxm7qqq0410lsb1kpsdlgixb2yh5q"
-        },
-        "recipe": {
-            "sha256": "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "mocker": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -17076,7 +14854,7 @@
         },
         "recipe": {
             "sha256": "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.1",
         "deps": [
@@ -17084,19 +14862,6 @@
             "el-x"
         ]
     },
-    "hide-region": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hide-region.el",
-            "sha256": "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval"
-        },
-        "recipe": {
-            "sha256": "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "pungi": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -17107,7 +14872,7 @@
         },
         "recipe": {
             "sha256": "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": [
@@ -17125,28 +14890,13 @@
         },
         "recipe": {
             "sha256": "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.20",
         "deps": [
             "emacs"
         ]
     },
-    "browse-kill-ring+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/browse-kill-ring+.el",
-            "sha256": "0av8fv2xf8b3qs32hxv90pglv9a90z2865rlja21hsyi5isw8vca"
-        },
-        "recipe": {
-            "sha256": "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "browse-kill-ring"
-        ]
-    },
     "ace-jump-buffer": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -17157,7 +14907,7 @@
         },
         "recipe": {
             "sha256": "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.1",
         "deps": [
@@ -17165,19 +14915,6 @@
             "dash"
         ]
     },
-    "find-dired+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/find-dired+.el",
-            "sha256": "1x0zn9kpnvxhgljp4ii4f11hgncj9smdkn64ihih00w7qgg7sif2"
-        },
-        "recipe": {
-            "sha256": "06a6lwx61xindlchh3ps8khhxc6sr7i9d7i60rjw1h07nxmh0fli",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ac-octave": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -17188,7 +14925,7 @@
         },
         "recipe": {
             "sha256": "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": [
@@ -17205,7 +14942,7 @@
         },
         "recipe": {
             "sha256": "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.1",
         "deps": [
@@ -17218,14 +14955,14 @@
             "tag": "fetchFromGitHub",
             "owner": "danil",
             "repo": "ido-describe-bindings",
-            "sha256": "19chkraanp4fbg5a7mrrjycqd87y5z4a65psy5wdhrp30ykhm7iq",
-            "rev": "a4048d5d1a6aad93c0206dbe4f34f4edb21a04d2"
+            "sha256": "1xd86jx6j5livsdsplq5yawz1wmkflkvnjmccjjlcy8f5ncl80ax",
+            "rev": "2076b7e8a418008fb503357df2f0f99de3d9aa1d"
         },
         "recipe": {
             "sha256": "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.0.5",
+        "version": "0.0.6",
         "deps": [
             "dash",
             "ido-vertical-mode"
@@ -17241,7 +14978,7 @@
         },
         "recipe": {
             "sha256": "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": []
@@ -17256,7 +14993,7 @@
         },
         "recipe": {
             "sha256": "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.2.8",
         "deps": [
@@ -17274,7 +15011,7 @@
         },
         "recipe": {
             "sha256": "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": [
@@ -17292,7 +15029,7 @@
         },
         "recipe": {
             "sha256": "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -17307,7 +15044,7 @@
         },
         "recipe": {
             "sha256": "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.0",
         "deps": [
@@ -17324,7 +15061,7 @@
         },
         "recipe": {
             "sha256": "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.45",
         "deps": []
@@ -17339,7 +15076,7 @@
         },
         "recipe": {
             "sha256": "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.4",
         "deps": [
@@ -17356,26 +15093,13 @@
         },
         "recipe": {
             "sha256": "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
             "emacs"
         ]
     },
-    "naked": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/naked.el",
-            "sha256": "0fr7l8ab6wmffyjs7vc38x6ca37w8c00fjhi3br3g7cgi0bna0wi"
-        },
-        "recipe": {
-            "sha256": "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ranger": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -17386,7 +15110,7 @@
         },
         "recipe": {
             "sha256": "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.7",
         "deps": [
@@ -17403,7 +15127,7 @@
         },
         "recipe": {
             "sha256": "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -17418,7 +15142,7 @@
         },
         "recipe": {
             "sha256": "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -17433,7 +15157,7 @@
         },
         "recipe": {
             "sha256": "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": [
@@ -17450,7 +15174,7 @@
         },
         "recipe": {
             "sha256": "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.2",
         "deps": []
@@ -17465,7 +15189,7 @@
         },
         "recipe": {
             "sha256": "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.0",
         "deps": [
@@ -17484,7 +15208,7 @@
         },
         "recipe": {
             "sha256": "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.70",
         "deps": [
@@ -17501,7 +15225,7 @@
         },
         "recipe": {
             "sha256": "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.9",
         "deps": []
@@ -17516,7 +15240,7 @@
         },
         "recipe": {
             "sha256": "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -17534,7 +15258,7 @@
         },
         "recipe": {
             "sha256": "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -17548,26 +15272,11 @@
         },
         "recipe": {
             "sha256": "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1.1",
         "deps": []
     },
-    "simple+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/simple+.el",
-            "sha256": "0y1c87288cj7kwdq5ww6rvd4g4afssw22b7d0wa5ihl85nnf21kv"
-        },
-        "recipe": {
-            "sha256": "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "strings"
-        ]
-    },
     "weather-metno": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -17578,7 +15287,7 @@
         },
         "recipe": {
             "sha256": "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -17596,7 +15305,7 @@
         },
         "recipe": {
             "sha256": "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -17611,7 +15320,7 @@
         },
         "recipe": {
             "sha256": "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.3",
         "deps": [
@@ -17631,7 +15340,7 @@
         },
         "recipe": {
             "sha256": "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.2",
         "deps": []
@@ -17646,7 +15355,7 @@
         },
         "recipe": {
             "sha256": "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.59",
         "deps": [
@@ -17664,7 +15373,7 @@
         },
         "recipe": {
             "sha256": "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -17679,7 +15388,7 @@
         },
         "recipe": {
             "sha256": "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.2",
         "deps": []
@@ -17694,7 +15403,7 @@
         },
         "recipe": {
             "sha256": "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -17709,7 +15418,7 @@
         },
         "recipe": {
             "sha256": "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.2",
         "deps": [
@@ -17729,7 +15438,7 @@
         },
         "recipe": {
             "sha256": "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -17743,31 +15452,18 @@
             "tag": "fetchFromGitHub",
             "owner": "aaron-em",
             "repo": "rcirc-styles.el",
-            "sha256": "1y4gmrayw9aq1w8c98mpl3zlr9mc2wr2mmcs2pyhcrkncfazmxvn",
-            "rev": "37cc85b6f3608db08b59d158d87da544b1a5a41e"
+            "sha256": "1f4jy4mndf1m1j9y23mvsvlp732zd2f17khr82lbbfmsxnwzjyq5",
+            "rev": "47b4b289acf4c5839fa463207223a52649a3f574"
         },
         "recipe": {
             "sha256": "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "1.1",
+        "version": "1.2",
         "deps": [
             "cl-lib"
         ]
     },
-    "key-chord": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/key-chord.el",
-            "sha256": "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg"
-        },
-        "recipe": {
-            "sha256": "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "yatemplate": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -17778,7 +15474,7 @@
         },
         "recipe": {
             "sha256": "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -17795,7 +15491,7 @@
         },
         "recipe": {
             "sha256": "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.4",
         "deps": []
@@ -17810,7 +15506,7 @@
         },
         "recipe": {
             "sha256": "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -17825,7 +15521,7 @@
         },
         "recipe": {
             "sha256": "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "5.14.7.3.1",
         "deps": [
@@ -17843,7 +15539,7 @@
         },
         "recipe": {
             "sha256": "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -17860,7 +15556,7 @@
         },
         "recipe": {
             "sha256": "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -17868,19 +15564,6 @@
             "pos-tip"
         ]
     },
-    "apache-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/apache-mode.el",
-            "sha256": "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik"
-        },
-        "recipe": {
-            "sha256": "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ac-racer": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -17891,9 +15574,9 @@
         },
         "recipe": {
             "sha256": "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.01",
+        "version": "0.1",
         "deps": [
             "auto-complete",
             "cl-lib",
@@ -17910,7 +15593,7 @@
         },
         "recipe": {
             "sha256": "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2",
         "deps": []
@@ -17925,7 +15608,7 @@
         },
         "recipe": {
             "sha256": "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.1.2",
         "deps": []
@@ -17935,16 +15618,17 @@
             "tag": "fetchFromGitHub",
             "owner": "syohex",
             "repo": "emacs-terraform-mode",
-            "sha256": "0jv047dhvbfjyw6ca73gjdrqb1rf2vykvdyrp9581als8n8xyy0y",
-            "rev": "86e661cfcdc56677d7f4935a187ed72d208b9140"
+            "sha256": "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7",
+            "rev": "6157690efce03ff20b16b85e2be6b0964efec2fb"
         },
         "recipe": {
             "sha256": "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.03",
+        "version": "0.4",
         "deps": [
-            "cl-lib"
+            "cl-lib",
+            "hcl-mode"
         ]
     },
     "elpa-audit": {
@@ -17957,24 +15641,11 @@
         },
         "recipe": {
             "sha256": "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
     },
-    "ruby-block": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/ruby-block.el",
-            "sha256": "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq"
-        },
-        "recipe": {
-            "sha256": "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "inline-crypt": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -17985,7 +15656,7 @@
         },
         "recipe": {
             "sha256": "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.4",
         "deps": []
@@ -18000,7 +15671,7 @@
         },
         "recipe": {
             "sha256": "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.7.1",
         "deps": [
@@ -18020,7 +15691,7 @@
         },
         "recipe": {
             "sha256": "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": [
@@ -18037,7 +15708,7 @@
         },
         "recipe": {
             "sha256": "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": [
@@ -18056,7 +15727,7 @@
         },
         "recipe": {
             "sha256": "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": []
@@ -18071,7 +15742,7 @@
         },
         "recipe": {
             "sha256": "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.15",
         "deps": []
@@ -18086,7 +15757,7 @@
         },
         "recipe": {
             "sha256": "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.12",
         "deps": [
@@ -18103,7 +15774,7 @@
         },
         "recipe": {
             "sha256": "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1.1",
         "deps": [
@@ -18111,19 +15782,6 @@
             "magit"
         ]
     },
-    "hl-defined": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hl-defined.el",
-            "sha256": "19pvwdkw833c84j9ynn2x8s8lv1bi98gkkmppn01v08yyzi3kr7y"
-        },
-        "recipe": {
-            "sha256": "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "diffview": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -18134,24 +15792,11 @@
         },
         "recipe": {
             "sha256": "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
     },
-    "tree-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/tree-mode.el",
-            "sha256": "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx"
-        },
-        "recipe": {
-            "sha256": "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "helm-cscope": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -18162,7 +15807,7 @@
         },
         "recipe": {
             "sha256": "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -18182,7 +15827,7 @@
         },
         "recipe": {
             "sha256": "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": []
@@ -18197,24 +15842,11 @@
         },
         "recipe": {
             "sha256": "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4",
         "deps": []
     },
-    "hide-lines": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hide-lines.el",
-            "sha256": "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2"
-        },
-        "recipe": {
-            "sha256": "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "helm-firefox": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -18225,7 +15857,7 @@
         },
         "recipe": {
             "sha256": "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -18244,7 +15876,7 @@
         },
         "recipe": {
             "sha256": "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -18259,7 +15891,7 @@
         },
         "recipe": {
             "sha256": "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1",
         "deps": []
@@ -18274,7 +15906,7 @@
         },
         "recipe": {
             "sha256": "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.3",
         "deps": [
@@ -18284,19 +15916,6 @@
             "let-alist"
         ]
     },
-    "modeline-char": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/modeline-char.el",
-            "sha256": "0z3izd0wvnqh3r8535rzxi0xab6hz46njw4m24nl6xps2n7fcwmi"
-        },
-        "recipe": {
-            "sha256": "1cb6pm69db0jbksmc4mkawf643i74is9v7ka34pv3mb21nj095qp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "el-autoyas": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -18307,7 +15926,7 @@
         },
         "recipe": {
             "sha256": "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5",
         "deps": []
@@ -18322,7 +15941,7 @@
         },
         "recipe": {
             "sha256": "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
@@ -18337,26 +15956,13 @@
         },
         "recipe": {
             "sha256": "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.1.2",
         "deps": [
             "haskell-emacs"
         ]
     },
-    "windata": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/windata.el",
-            "sha256": "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz"
-        },
-        "recipe": {
-            "sha256": "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ert-async": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -18367,7 +15973,7 @@
         },
         "recipe": {
             "sha256": "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": []
@@ -18382,7 +15988,7 @@
         },
         "recipe": {
             "sha256": "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.21",
         "deps": []
@@ -18397,7 +16003,7 @@
         },
         "recipe": {
             "sha256": "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.0",
         "deps": [
@@ -18414,26 +16020,13 @@
         },
         "recipe": {
             "sha256": "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
             "yasnippet"
         ]
     },
-    "misc-cmds": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/misc-cmds.el",
-            "sha256": "0akrb0gd4ywrib9bg3q5qjf991gnkggivmg1nsn9snc6il8yjaxq"
-        },
-        "recipe": {
-            "sha256": "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "drupal-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -18444,7 +16037,7 @@
         },
         "recipe": {
             "sha256": "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.1",
         "deps": [
@@ -18461,9 +16054,9 @@
         },
         "recipe": {
             "sha256": "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.04",
+        "version": "0.4",
         "deps": [
             "cl-lib",
             "company",
@@ -18481,7 +16074,7 @@
         },
         "recipe": {
             "sha256": "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -18498,7 +16091,7 @@
         },
         "recipe": {
             "sha256": "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.2",
         "deps": []
@@ -18513,7 +16106,7 @@
         },
         "recipe": {
             "sha256": "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.13",
         "deps": [
@@ -18531,7 +16124,7 @@
         },
         "recipe": {
             "sha256": "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.0",
         "deps": [
@@ -18549,7 +16142,7 @@
         },
         "recipe": {
             "sha256": "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.5",
         "deps": [
@@ -18566,7 +16159,7 @@
         },
         "recipe": {
             "sha256": "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": [
@@ -18583,7 +16176,7 @@
         },
         "recipe": {
             "sha256": "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -18600,7 +16193,7 @@
         },
         "recipe": {
             "sha256": "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.1.2",
         "deps": [
@@ -18617,7 +16210,7 @@
         },
         "recipe": {
             "sha256": "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -18634,7 +16227,7 @@
         },
         "recipe": {
             "sha256": "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -18653,7 +16246,7 @@
         },
         "recipe": {
             "sha256": "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -18670,7 +16263,7 @@
         },
         "recipe": {
             "sha256": "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "4.0.0",
         "deps": []
@@ -18685,7 +16278,7 @@
         },
         "recipe": {
             "sha256": "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": [
@@ -18702,7 +16295,7 @@
         },
         "recipe": {
             "sha256": "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": [
@@ -18722,7 +16315,7 @@
         },
         "recipe": {
             "sha256": "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.0",
         "deps": []
@@ -18737,7 +16330,7 @@
         },
         "recipe": {
             "sha256": "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -18752,7 +16345,7 @@
         },
         "recipe": {
             "sha256": "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.6",
         "deps": [
@@ -18773,7 +16366,7 @@
         },
         "recipe": {
             "sha256": "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.3",
         "deps": []
@@ -18788,7 +16381,7 @@
         },
         "recipe": {
             "sha256": "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.2.5",
         "deps": []
@@ -18803,9 +16396,9 @@
         },
         "recipe": {
             "sha256": "0cnbhjw951f8sci63cvzcc65d0ffdx3rb8l1g38qql5rzkam48fn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.07",
+        "version": "0.7",
         "deps": [
             "cl-lib",
             "helm-core"
@@ -18821,7 +16414,7 @@
         },
         "recipe": {
             "sha256": "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -18839,7 +16432,7 @@
         },
         "recipe": {
             "sha256": "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.2",
         "deps": [
@@ -18847,19 +16440,6 @@
             "json"
         ]
     },
-    "vline": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/vline.el",
-            "sha256": "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj"
-        },
-        "recipe": {
-            "sha256": "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "artbollocks-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -18870,7 +16450,7 @@
         },
         "recipe": {
             "sha256": "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.2",
         "deps": []
@@ -18885,7 +16465,7 @@
         },
         "recipe": {
             "sha256": "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -18903,7 +16483,7 @@
         },
         "recipe": {
             "sha256": "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.10.0",
         "deps": [
@@ -18924,7 +16504,7 @@
         },
         "recipe": {
             "sha256": "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
@@ -18939,7 +16519,7 @@
         },
         "recipe": {
             "sha256": "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.4",
         "deps": [
@@ -18956,27 +16536,11 @@
         },
         "recipe": {
             "sha256": "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.4.0",
         "deps": []
     },
-    "confluence": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://confluence-el.googlecode.com/svn/trunk/",
-            "sha256": "1l6970ng046hw2izzb15cbbbf83l6m8c9mvic8fzjixfi3g1dl55",
-            "rev": "170"
-        },
-        "recipe": {
-            "sha256": "003lykwd3ya0xwlahmm35nx9p6mk8vylq57yxrmgdcc64630bdpf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "xml-rpc"
-        ]
-    },
     "dictionary": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -18987,24 +16551,11 @@
         },
         "recipe": {
             "sha256": "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.10",
         "deps": []
     },
-    "backup-each-save": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/backup-each-save.el",
-            "sha256": "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7"
-        },
-        "recipe": {
-            "sha256": "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "cl-lib-highlight": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -19015,7 +16566,7 @@
         },
         "recipe": {
             "sha256": "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -19032,7 +16583,7 @@
         },
         "recipe": {
             "sha256": "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.3",
         "deps": [
@@ -19050,7 +16601,7 @@
         },
         "recipe": {
             "sha256": "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.2",
         "deps": [
@@ -19068,7 +16619,7 @@
         },
         "recipe": {
             "sha256": "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6.0",
         "deps": [
@@ -19089,7 +16640,7 @@
         },
         "recipe": {
             "sha256": "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.15",
         "deps": [
@@ -19106,7 +16657,7 @@
         },
         "recipe": {
             "sha256": "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": [
@@ -19124,7 +16675,7 @@
         },
         "recipe": {
             "sha256": "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -19141,7 +16692,7 @@
         },
         "recipe": {
             "sha256": "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -19158,7 +16709,7 @@
         },
         "recipe": {
             "sha256": "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9",
         "deps": [
@@ -19179,26 +16730,13 @@
         },
         "recipe": {
             "sha256": "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.2",
         "deps": [
             "esxml"
         ]
     },
-    "cursor-chg": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/cursor-chg.el",
-            "sha256": "1mvfg2m3wq5rbbxs2a84pd69yb82dag4g5mpzr16xi0gn6ybj4s7"
-        },
-        "recipe": {
-            "sha256": "0d1ilall8c1y4w014wks9yx4fz743hvx5lc8jqxxlrq7pmqyqdxk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "gitattributes-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -19209,7 +16747,7 @@
         },
         "recipe": {
             "sha256": "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.0",
         "deps": []
@@ -19219,14 +16757,14 @@
             "tag": "fetchFromGitHub",
             "owner": "iqbalansari",
             "repo": "emacs-emojify",
-            "sha256": "03hc2c8cyn0saasw63vv75iswcxxj8xd8ni78xnccpni1i16lgwj",
-            "rev": "e3c269838277db29560352365b7b9ceb3db9593e"
+            "sha256": "0nrf6p4h66i17nz850kpdrnk5h5ra4l3icjjrq34sxvmsssp6zhp",
+            "rev": "fec788f09ab1c131b89f296ebd3e73df97e96cfe"
         },
         "recipe": {
             "sha256": "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.2",
+        "version": "0.3",
         "deps": [
             "emacs",
             "ht",
@@ -19243,7 +16781,7 @@
         },
         "recipe": {
             "sha256": "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": [
@@ -19264,7 +16802,7 @@
         },
         "recipe": {
             "sha256": "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.1",
         "deps": [
@@ -19282,7 +16820,7 @@
         },
         "recipe": {
             "sha256": "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -19297,7 +16835,7 @@
         },
         "recipe": {
             "sha256": "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.1",
         "deps": [
@@ -19314,27 +16852,11 @@
         },
         "recipe": {
             "sha256": "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
     },
-    "zoom-frm": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/zoom-frm.el",
-            "sha256": "0y424lw7j0p0i0s7az7fabk9k4d0shcp4mimlkfl3whci24rbq6y"
-        },
-        "recipe": {
-            "sha256": "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "frame-cmds",
-            "frame-fns"
-        ]
-    },
     "find-file-in-repository": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -19345,24 +16867,11 @@
         },
         "recipe": {
             "sha256": "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2",
         "deps": []
     },
-    "auto-install": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/auto-install.el",
-            "sha256": "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d"
-        },
-        "recipe": {
-            "sha256": "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "clojure-snippets": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -19373,7 +16882,7 @@
         },
         "recipe": {
             "sha256": "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -19390,7 +16899,7 @@
         },
         "recipe": {
             "sha256": "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -19405,7 +16914,7 @@
         },
         "recipe": {
             "sha256": "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -19425,9 +16934,9 @@
         },
         "recipe": {
             "sha256": "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.02",
+        "version": "0.2",
         "deps": [
             "auto-complete",
             "cl-lib"
@@ -19443,7 +16952,7 @@
         },
         "recipe": {
             "sha256": "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -19461,7 +16970,7 @@
         },
         "recipe": {
             "sha256": "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -19470,19 +16979,6 @@
             "s"
         ]
     },
-    "fit-frame": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/fit-frame.el",
-            "sha256": "15697xc2gr5x9wj472jyzjhnim1jlx3ai3anzx8apngpqa9caiq1"
-        },
-        "recipe": {
-            "sha256": "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "helm-make": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -19493,7 +16989,7 @@
         },
         "recipe": {
             "sha256": "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -19510,8 +17006,8 @@
             "rev": "eef10fdde96a12528a6da32f51bf638b2863a3b1"
         },
         "recipe": {
-            "sha256": "1v9fsyaby77fr30nnhr7dmlrmrlyz2grkhzg62illln66b9m5nlr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20150303",
         "deps": [
@@ -19528,7 +17024,7 @@
         },
         "recipe": {
             "sha256": "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -19543,7 +17039,7 @@
         },
         "recipe": {
             "sha256": "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.19",
         "deps": [
@@ -19562,7 +17058,7 @@
         },
         "recipe": {
             "sha256": "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.10",
         "deps": []
@@ -19577,7 +17073,7 @@
         },
         "recipe": {
             "sha256": "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3",
         "deps": []
@@ -19592,7 +17088,7 @@
         },
         "recipe": {
             "sha256": "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.6",
         "deps": [
@@ -19600,19 +17096,6 @@
             "sr-speedbar"
         ]
     },
-    "reveal-next": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/reveal-next.el",
-            "sha256": "0bpcx6jlv0m5bg1zrkak471fa2yj4m517zn72ajvp5r9y408i82y"
-        },
-        "recipe": {
-            "sha256": "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "vbasense": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -19623,7 +17106,7 @@
         },
         "recipe": {
             "sha256": "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -19632,19 +17115,6 @@
             "yaxception"
         ]
     },
-    "lively": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/lively.el",
-            "sha256": "1z9b0arn7vby4fkwzgj3ml537lh94gvf61vs03cqfkc95lv14r76"
-        },
-        "recipe": {
-            "sha256": "1wjd6kfnknhw9lc2p9iipaxfm9phpkqqmjw43bhc70ybsq1xaln7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "creds": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -19655,7 +17125,7 @@
         },
         "recipe": {
             "sha256": "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.6.1",
         "deps": [
@@ -19673,7 +17143,7 @@
         },
         "recipe": {
             "sha256": "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -19691,7 +17161,7 @@
         },
         "recipe": {
             "sha256": "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.0",
         "deps": []
@@ -19706,7 +17176,7 @@
         },
         "recipe": {
             "sha256": "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": [
@@ -19725,7 +17195,7 @@
         },
         "recipe": {
             "sha256": "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.16.0",
         "deps": [
@@ -19745,7 +17215,7 @@
         },
         "recipe": {
             "sha256": "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -19765,24 +17235,11 @@
         },
         "recipe": {
             "sha256": "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
     },
-    "rfringe": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/rfringe.el",
-            "sha256": "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh"
-        },
-        "recipe": {
-            "sha256": "171gzfciz78l6b653acgfailxpwmh8m1dm0dzpg0b1k0ny3aiwf6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "editorconfig": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -19793,7 +17250,7 @@
         },
         "recipe": {
             "sha256": "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.1",
         "deps": [
@@ -19810,9 +17267,9 @@
         },
         "recipe": {
             "sha256": "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.03",
+        "version": "0.3",
         "deps": [
             "anzu",
             "evil"
@@ -19828,7 +17285,7 @@
         },
         "recipe": {
             "sha256": "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.9",
         "deps": [
@@ -19845,24 +17302,11 @@
         },
         "recipe": {
             "sha256": "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": []
     },
-    "lispxmp": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/lispxmp.el",
-            "sha256": "1m07gb3v1a7al0h4nj3914y8lqrwzi8fwb1ih66nxzn6kb0qj3mf"
-        },
-        "recipe": {
-            "sha256": "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "passthword": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -19873,7 +17317,7 @@
         },
         "recipe": {
             "sha256": "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4",
         "deps": [
@@ -19890,7 +17334,7 @@
         },
         "recipe": {
             "sha256": "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.10.0",
         "deps": []
@@ -19905,7 +17349,7 @@
         },
         "recipe": {
             "sha256": "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5",
         "deps": [
@@ -19915,6 +17359,23 @@
             "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",
@@ -19925,7 +17386,7 @@
         },
         "recipe": {
             "sha256": "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.0",
         "deps": []
@@ -19935,14 +17396,14 @@
             "tag": "fetchFromGitHub",
             "owner": "10sr",
             "repo": "git-ps1-mode-el",
-            "sha256": "0pkzpihn94z2xy28nwaiv7883hq604xbmhrpxz2xh8cjix81h8ha",
-            "rev": "003d9dd264afdc71ae4635fef8c5d7bc901e3ddf"
+            "sha256": "073c7b64nv0623mcf7ipajkdxkgp5ff70zrndxr3830s1swk0nfk",
+            "rev": "fb86e89dc106e87d87ad2ae4d5ae0e52df528321"
         },
         "recipe": {
             "sha256": "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.1.1",
+        "version": "0.2.0",
         "deps": []
     },
     "evil-textobj-anyblock": {
@@ -19955,7 +17416,7 @@
         },
         "recipe": {
             "sha256": "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": [
@@ -19973,7 +17434,7 @@
         },
         "recipe": {
             "sha256": "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -19988,7 +17449,7 @@
         },
         "recipe": {
             "sha256": "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.16",
         "deps": []
@@ -20003,7 +17464,7 @@
         },
         "recipe": {
             "sha256": "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": [
@@ -20020,7 +17481,7 @@
         },
         "recipe": {
             "sha256": "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2",
         "deps": [
@@ -20032,14 +17493,14 @@
             "tag": "fetchFromGitHub",
             "owner": "wasamasa",
             "repo": "shackle",
-            "sha256": "1v8pm8rfqkfbx8ifj2ra78h64zxcl15rpwgaw99xl88j388xyfsl",
-            "rev": "7542039876325d9b2051b77a0cbe15986154ac1a"
+            "sha256": "0yy162sz7vwj0i9w687a5x1c2fq31vc3i6gqhbywspviczdp4q1y",
+            "rev": "4069e0cbff0d172de2cd7d588de971d8b02915c6"
         },
         "recipe": {
             "sha256": "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.8.1",
+        "version": "0.9.0",
         "deps": [
             "cl-lib"
         ]
@@ -20054,7 +17515,7 @@
         },
         "recipe": {
             "sha256": "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.5",
         "deps": [
@@ -20071,9 +17532,9 @@
         },
         "recipe": {
             "sha256": "1j64w6dnxmq0rfycci9wfy2z5lbddsggf486pknxfgwwqgvns90l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.05",
+        "version": "0.5",
         "deps": [
             "helm"
         ]
@@ -20088,7 +17549,7 @@
         },
         "recipe": {
             "sha256": "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": []
@@ -20103,9 +17564,9 @@
         },
         "recipe": {
             "sha256": "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.06",
+        "version": "0.6",
         "deps": [
             "auto-complete"
         ]
@@ -20120,7 +17581,7 @@
         },
         "recipe": {
             "sha256": "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.10",
         "deps": []
@@ -20135,7 +17596,7 @@
         },
         "recipe": {
             "sha256": "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -20152,7 +17613,7 @@
         },
         "recipe": {
             "sha256": "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9",
         "deps": [
@@ -20172,7 +17633,7 @@
         },
         "recipe": {
             "sha256": "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -20189,7 +17650,7 @@
         },
         "recipe": {
             "sha256": "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.6",
         "deps": []
@@ -20199,14 +17660,14 @@
             "tag": "fetchFromGitHub",
             "owner": "stan-dev",
             "repo": "stan-mode",
-            "sha256": "1yx8n2c9bls0cvc53d69nyrg44yc3py51lzci0cviwszmnbbrljx",
-            "rev": "3a1b9a714ae7a547638a449f5a9ac487003c55b8"
+            "sha256": "0s633nnaprqq0svs0v4zfk9p47izbvjwx1x2xa9b9rid69bpx54s",
+            "rev": "60e31cd0dedc36ee6d5ddde01c5b8cb121c2e844"
         },
         "recipe": {
             "sha256": "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "7.1.0",
+        "version": "8.0.0",
         "deps": [
             "stan-mode",
             "yasnippet"
@@ -20222,7 +17683,7 @@
         },
         "recipe": {
             "sha256": "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0.0",
         "deps": [
@@ -20241,7 +17702,7 @@
         },
         "recipe": {
             "sha256": "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "4.7",
         "deps": []
@@ -20256,7 +17717,7 @@
         },
         "recipe": {
             "sha256": "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.4",
         "deps": [
@@ -20275,7 +17736,7 @@
         },
         "recipe": {
             "sha256": "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
@@ -20290,7 +17751,7 @@
         },
         "recipe": {
             "sha256": "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.2",
         "deps": [
@@ -20310,7 +17771,7 @@
         },
         "recipe": {
             "sha256": "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.1",
         "deps": [
@@ -20327,7 +17788,7 @@
         },
         "recipe": {
             "sha256": "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.0",
         "deps": []
@@ -20342,7 +17803,7 @@
         },
         "recipe": {
             "sha256": "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -20359,7 +17820,7 @@
         },
         "recipe": {
             "sha256": "1rm91xccvdsqghdnrnjvyp8xfvrw5ac677vzzz24rz9dssh2mz9b",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.5",
         "deps": [
@@ -20376,14 +17837,14 @@
             "tag": "fetchFromGitHub",
             "owner": "for-GET",
             "repo": "know-your-http-well",
-            "sha256": "077hidc464kpmgd1vz50j0pygl956llhbqy1c9mwl3r0jh86q0rg",
-            "rev": "a7fb26fd5a8bf658d1c7d62f77a37fd772a144b0"
+            "sha256": "08q43k4450kgygyvqv18gwcmmb7y9x445401048lbixc4cp6p3cg",
+            "rev": "e208d856ce1b036d2dc1454813c6fc81f0269def"
         },
         "recipe": {
             "sha256": "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.2.0",
+        "version": "0.4.0",
         "deps": []
     },
     "homebrew-mode": {
@@ -20396,7 +17857,7 @@
         },
         "recipe": {
             "sha256": "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.2",
         "deps": [
@@ -20405,32 +17866,18 @@
             "inf-ruby"
         ]
     },
-    "caml": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://caml.inria.fr/svn/ocaml/trunk/emacs/",
-            "sha256": "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw",
-            "rev": "16548"
-        },
-        "recipe": {
-            "sha256": "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "deft": {
         "fetch": {
             "tag": "fetchgit",
             "url": "git://jblevins.org/git/deft.git",
-            "sha256": "2b6d9dbc07fb68c99fe36c9f0663c67f3e9d0c245c2d226d297641246396b724",
-            "rev": "f2735d28f50962eb8db717d231e7779bd99bf873"
+            "sha256": "eb5c178337c0bd6a001114aac685bb0d23167050970274203d93c1c0caece1e8",
+            "rev": "4001a55cf5f79cdbfa00f1405e8a4645af4acd40"
         },
         "recipe": {
             "sha256": "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.6",
+        "version": "0.7",
         "deps": []
     },
     "autodisass-java-bytecode": {
@@ -20443,7 +17890,7 @@
         },
         "recipe": {
             "sha256": "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3",
         "deps": []
@@ -20453,14 +17900,14 @@
             "tag": "fetchFromGitHub",
             "owner": "masutaka",
             "repo": "emacs-helm-bundle-show",
-            "sha256": "1w0x4bn9x16pd7s1j4max6268qd4r16709sya646sbqdkk41rcxj",
-            "rev": "6dffd602a4cc5d85eade7de3be99a22b246fc437"
+            "sha256": "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30",
+            "rev": "b34523aa8a7f82ed9a1bf3643c35b65866a7877a"
         },
         "recipe": {
             "sha256": "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "1.1.4",
+        "version": "1.1.5",
         "deps": [
             "helm"
         ]
@@ -20475,7 +17922,7 @@
         },
         "recipe": {
             "sha256": "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": [
@@ -20492,7 +17939,7 @@
         },
         "recipe": {
             "sha256": "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -20511,7 +17958,7 @@
         },
         "recipe": {
             "sha256": "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": [
@@ -20527,7 +17974,7 @@
         },
         "recipe": {
             "sha256": "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.0",
         "deps": []
@@ -20542,24 +17989,11 @@
         },
         "recipe": {
             "sha256": "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.4",
         "deps": []
     },
-    "savekill": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/savekill.el",
-            "sha256": "1qfq83cb4qixdl15j28rlslkq6g88ig55ydg747jqb3dqyp3qaah"
-        },
-        "recipe": {
-            "sha256": "1l14p6wkzfhlqxnd9fpw123vg9q5k20ld7rciyzbfdb99pk9z02i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "smartrep": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -20570,7 +18004,7 @@
         },
         "recipe": {
             "sha256": "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -20585,7 +18019,7 @@
         },
         "recipe": {
             "sha256": "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.0",
         "deps": [
@@ -20605,7 +18039,7 @@
         },
         "recipe": {
             "sha256": "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.0",
         "deps": []
@@ -20615,67 +18049,14 @@
             "tag": "fetchFromGitHub",
             "owner": "jorgenschaefer",
             "repo": "emacs-buttercup",
-            "sha256": "1xmzvl9l87adw7kqznnzhnh8l3iplbf82vmqax38bd8ykbw92jlf",
-            "rev": "87e0c0dab4b04d1c1a76a952b741ba6de3121bb5"
+            "sha256": "1qqy8rmx7d62hf6a8j9d5gc49mvhllgyi7rfpilqiwnfpxs8gxgl",
+            "rev": "d7ab5923f26bb4d2af4d2489ae3e4fb27fd08dc1"
         },
         "recipe": {
             "sha256": "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "1.1",
-        "deps": []
-    },
-    "maude-mode": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "svn://svn.code.sf.net/p/maude-mode/code/trunk",
-            "sha256": "06k07qvhm2mbqasn72649lx3pwzb0r466854a18g6lciwhiww7vy",
-            "rev": "63"
-        },
-        "recipe": {
-            "sha256": "04b6q328hj0w33z4c50nqyark0pn5sqi0s8096m9di4rjwxaw0ma",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "list-register": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/list-register.el",
-            "sha256": "1sv1x2bc1xg7z3q4r9pbvjspj041q4zn883w9m071h7dgx8i9a6l"
-        },
-        "recipe": {
-            "sha256": "06q7q3j9qvqbp25cx9as2ckmgcz2myfvi2n34jp60v3ayhna79r4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "thingatpt+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/thingatpt+.el",
-            "sha256": "1fyx4z7ci5yisfng0ps2q1nwvziidamam1m2n53rkfmm2gprxqhb"
-        },
-        "recipe": {
-            "sha256": "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "hide-comnt": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hide-comnt.el",
-            "sha256": "1xvchpbrfwnqlh32pj0fg7n0x8csfm0mn09z7p45w3wf1mz0ckbn"
-        },
-        "recipe": {
-            "sha256": "181kns2rg4rc0pyyxw305qc06d10v025ad7v2m037y72vfwb0igx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
+        "version": "1.2",
         "deps": []
     },
     "emms-player-mpv": {
@@ -20688,7 +18069,7 @@
         },
         "recipe": {
             "sha256": "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.7",
         "deps": [
@@ -20705,7 +18086,7 @@
         },
         "recipe": {
             "sha256": "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -20723,7 +18104,7 @@
         },
         "recipe": {
             "sha256": "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.15",
         "deps": [
@@ -20740,27 +18121,13 @@
         },
         "recipe": {
             "sha256": "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
             "emacs"
         ]
     },
-    "zeitgeist": {
-        "fetch": {
-            "tag": "fetchbzr",
-            "url": "lp:zeitgeist-datasources",
-            "sha256": "0f80fxh0y9lfa08fnic7ln0jn8vngfbiygy6sizdmrcxz67559vc",
-            "rev": "181"
-        },
-        "recipe": {
-            "sha256": "0gzmiwxmzcrl5mf0s7vs09p2wl7slq8xbl6ynl76iwzwjxjizahk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ecukes": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -20771,7 +18138,7 @@
         },
         "recipe": {
             "sha256": "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.15",
         "deps": [
@@ -20793,7 +18160,7 @@
         },
         "recipe": {
             "sha256": "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.1",
         "deps": []
@@ -20808,7 +18175,7 @@
         },
         "recipe": {
             "sha256": "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.12.1",
         "deps": []
@@ -20823,7 +18190,7 @@
         },
         "recipe": {
             "sha256": "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "3.1.9",
         "deps": [
@@ -20840,7 +18207,7 @@
         },
         "recipe": {
             "sha256": "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.2",
         "deps": [
@@ -20858,7 +18225,7 @@
         },
         "recipe": {
             "sha256": "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": []
@@ -20873,7 +18240,7 @@
         },
         "recipe": {
             "sha256": "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -20881,19 +18248,6 @@
             "dash"
         ]
     },
-    "anchored-transpose": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/anchored-transpose.el",
-            "sha256": "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651"
-        },
-        "recipe": {
-            "sha256": "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "smeargle": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -20904,9 +18258,9 @@
         },
         "recipe": {
             "sha256": "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.02",
+        "version": "0.2",
         "deps": [
             "cl-lib",
             "emacs"
@@ -20922,7 +18276,7 @@
         },
         "recipe": {
             "sha256": "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -20940,7 +18294,7 @@
         },
         "recipe": {
             "sha256": "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2015.11.29",
         "deps": []
@@ -20955,22 +18309,9 @@
         },
         "recipe": {
             "sha256": "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.02",
-        "deps": []
-    },
-    "font-lock+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/font-lock+.el",
-            "sha256": "1w159k5hn9z7ydx5gq4hph7gvbqs4ml4qbfgpsib5z39v7x6wkv4"
-        },
-        "recipe": {
-            "sha256": "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
+        "version": "0.2",
         "deps": []
     },
     "session": {
@@ -20983,9 +18324,9 @@
         },
         "recipe": {
             "sha256": "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "2.3a",
+        "version": "2.3.1",
         "deps": []
     },
     "bundler": {
@@ -20998,7 +18339,7 @@
         },
         "recipe": {
             "sha256": "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": [
@@ -21015,7 +18356,7 @@
         },
         "recipe": {
             "sha256": "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": []
@@ -21030,7 +18371,7 @@
         },
         "recipe": {
             "sha256": "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.1",
         "deps": []
@@ -21045,7 +18386,7 @@
         },
         "recipe": {
             "sha256": "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": [
@@ -21062,24 +18403,11 @@
         },
         "recipe": {
             "sha256": "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
     },
-    "speck": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/speck.el",
-            "sha256": "1i2z57aasljia6xd2xn1mryklc2gc9c2q1fad8wn7982sl277d10"
-        },
-        "recipe": {
-            "sha256": "19h3syk4kjmcy7jy9nlsbq6gyxwl4xsi84dy66a3cpvmknm25kyg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "lispyscript-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -21090,11 +18418,26 @@
         },
         "recipe": {
             "sha256": "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "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",
@@ -21105,7 +18448,7 @@
         },
         "recipe": {
             "sha256": "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -21114,19 +18457,6 @@
             "dash"
         ]
     },
-    "fliptext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/fliptext.el",
-            "sha256": "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw"
-        },
-        "recipe": {
-            "sha256": "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "magit": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -21137,7 +18467,7 @@
         },
         "recipe": {
             "sha256": "0kcx8pqzvl7xgx7f8q7xck83ghkx6cjsa2nczxj1virap1nkfhkw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.3.1",
         "deps": [
@@ -21159,7 +18489,7 @@
         },
         "recipe": {
             "sha256": "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.14",
         "deps": []
@@ -21174,7 +18504,7 @@
         },
         "recipe": {
             "sha256": "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.1.2",
         "deps": [
@@ -21192,7 +18522,7 @@
         },
         "recipe": {
             "sha256": "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -21207,7 +18537,7 @@
         },
         "recipe": {
             "sha256": "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4.0",
         "deps": [
@@ -21225,7 +18555,7 @@
         },
         "recipe": {
             "sha256": "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0",
         "deps": []
@@ -21240,7 +18570,7 @@
         },
         "recipe": {
             "sha256": "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6",
         "deps": [
@@ -21257,7 +18587,7 @@
         },
         "recipe": {
             "sha256": "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8.2",
         "deps": []
@@ -21272,7 +18602,7 @@
         },
         "recipe": {
             "sha256": "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.2",
         "deps": [
@@ -21291,7 +18621,7 @@
         },
         "recipe": {
             "sha256": "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.1",
         "deps": [
@@ -21308,7 +18638,7 @@
         },
         "recipe": {
             "sha256": "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": [
@@ -21327,7 +18657,7 @@
         },
         "recipe": {
             "sha256": "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2.8",
         "deps": [
@@ -21345,7 +18675,7 @@
         },
         "recipe": {
             "sha256": "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.1",
         "deps": []
@@ -21360,7 +18690,7 @@
         },
         "recipe": {
             "sha256": "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.18.0",
         "deps": [
@@ -21378,7 +18708,7 @@
         },
         "recipe": {
             "sha256": "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": [
@@ -21396,39 +18726,11 @@
         },
         "recipe": {
             "sha256": "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7",
         "deps": []
     },
-    "irfc": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/irfc.el",
-            "sha256": "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca"
-        },
-        "recipe": {
-            "sha256": "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "swbuff-x": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/swbuff-x.el",
-            "sha256": "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5"
-        },
-        "recipe": {
-            "sha256": "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "swbuff"
-        ]
-    },
     "sound-wav": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -21439,9 +18741,9 @@
         },
         "recipe": {
             "sha256": "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.01",
+        "version": "0.1",
         "deps": [
             "cl-lib",
             "deferred"
@@ -21457,7 +18759,7 @@
         },
         "recipe": {
             "sha256": "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": [
@@ -21470,14 +18772,14 @@
             "tag": "fetchFromGitHub",
             "owner": "skeeto",
             "repo": "elfeed",
-            "sha256": "0132jl4fl2ycais9l0csykg466ppq8cc4181d3dx87zf7fdhrgwp",
-            "rev": "4c15ed9f9559285df196c9b793bd5168662b6532"
+            "sha256": "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j",
+            "rev": "9fd3cf8833e26bf41f52a7e2149734858d2eeb96"
         },
         "recipe": {
             "sha256": "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "1.3.0",
+        "version": "1.4.0",
         "deps": [
             "elfeed",
             "emacs",
@@ -21494,7 +18796,7 @@
         },
         "recipe": {
             "sha256": "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7",
         "deps": [
@@ -21512,7 +18814,7 @@
         },
         "recipe": {
             "sha256": "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -21530,7 +18832,7 @@
         },
         "recipe": {
             "sha256": "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.1",
         "deps": []
@@ -21545,7 +18847,7 @@
         },
         "recipe": {
             "sha256": "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -21560,7 +18862,7 @@
         },
         "recipe": {
             "sha256": "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.3.1",
         "deps": [
@@ -21579,7 +18881,7 @@
         },
         "recipe": {
             "sha256": "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.6.0",
         "deps": [
@@ -21597,7 +18899,7 @@
         },
         "recipe": {
             "sha256": "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5.0",
         "deps": [
@@ -21614,7 +18916,7 @@
         },
         "recipe": {
             "sha256": "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0",
         "deps": []
@@ -21629,7 +18931,7 @@
         },
         "recipe": {
             "sha256": "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": [
@@ -21647,7 +18949,7 @@
         },
         "recipe": {
             "sha256": "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -21662,37 +18964,11 @@
         },
         "recipe": {
             "sha256": "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.20",
         "deps": []
     },
-    "strings": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/strings.el",
-            "sha256": "0svvgrssd4r027d25g167lf9cpks3la5zhvyd50gjrhryyxkf225"
-        },
-        "recipe": {
-            "sha256": "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "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": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "git-gutter-fringe": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -21703,7 +18979,7 @@
         },
         "recipe": {
             "sha256": "14wyiyyi2rram2sz3habvmygy5a5m2jfi6x9fqcyfr3vpcjn1k4i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.22",
         "deps": [
@@ -21723,7 +18999,7 @@
         },
         "recipe": {
             "sha256": "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.6.10",
         "deps": []
@@ -21738,7 +19014,7 @@
         },
         "recipe": {
             "sha256": "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.4",
         "deps": []
@@ -21753,7 +19029,7 @@
         },
         "recipe": {
             "sha256": "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": [
@@ -21770,7 +19046,7 @@
         },
         "recipe": {
             "sha256": "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7.0",
         "deps": []
@@ -21784,7 +19060,7 @@
         },
         "recipe": {
             "sha256": "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
@@ -21799,7 +19075,7 @@
         },
         "recipe": {
             "sha256": "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
@@ -21814,7 +19090,7 @@
         },
         "recipe": {
             "sha256": "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": [
@@ -21831,7 +19107,7 @@
         },
         "recipe": {
             "sha256": "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20140225.944",
         "deps": []
@@ -21846,7 +19122,7 @@
         },
         "recipe": {
             "sha256": "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.3",
         "deps": []
@@ -21861,7 +19137,7 @@
         },
         "recipe": {
             "sha256": "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.11",
         "deps": []
@@ -21876,7 +19152,7 @@
         },
         "recipe": {
             "sha256": "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -21886,16 +19162,17 @@
             "tag": "fetchFromGitHub",
             "owner": "ancane",
             "repo": "scala-outline-popup",
-            "sha256": "1sq0p0na0yxkipv6fv4wcrfpl1k9sb8nyqmwg0ql2i7gwlpiqrx9",
-            "rev": "f950e026ffbf471046f02edea56f0d329cca0e01"
+            "sha256": "0hhsgyil8aqdkkip5325yrdq89gnijglcbf1dsvl4wvnmq7a1rik",
+            "rev": "c79a06fb99cbf6f29d94da77a8a22cfafb15a1b6"
         },
         "recipe": {
             "sha256": "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.3.4",
+        "version": "0.4",
         "deps": [
             "dash",
+            "flx-ido",
             "popup",
             "scala-mode2"
         ]
@@ -21910,7 +19187,7 @@
         },
         "recipe": {
             "sha256": "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -21925,7 +19202,7 @@
         },
         "recipe": {
             "sha256": "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -21948,7 +19225,7 @@
         },
         "recipe": {
             "sha256": "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20151025",
         "deps": []
@@ -21963,7 +19240,7 @@
         },
         "recipe": {
             "sha256": "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.0",
         "deps": [
@@ -21980,7 +19257,7 @@
         },
         "recipe": {
             "sha256": "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -21999,9 +19276,9 @@
         },
         "recipe": {
             "sha256": "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.02",
+        "version": "0.2",
         "deps": []
     },
     "ghc-imported-from": {
@@ -22014,7 +19291,7 @@
         },
         "recipe": {
             "sha256": "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.2",
         "deps": [
@@ -22031,7 +19308,7 @@
         },
         "recipe": {
             "sha256": "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.3.0",
         "deps": [
@@ -22049,7 +19326,7 @@
         },
         "recipe": {
             "sha256": "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": []
@@ -22064,7 +19341,7 @@
         },
         "recipe": {
             "sha256": "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.5",
         "deps": [
@@ -22073,19 +19350,6 @@
             "yaxception"
         ]
     },
-    "files+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/files+.el",
-            "sha256": "0yl98k1yxmqidyc08dn20dmqkb450xnanqr0iqs01z3q6agpqc0v"
-        },
-        "recipe": {
-            "sha256": "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "x86-lookup": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -22096,7 +19360,7 @@
         },
         "recipe": {
             "sha256": "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -22114,7 +19378,7 @@
         },
         "recipe": {
             "sha256": "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2",
         "deps": [
@@ -22131,7 +19395,7 @@
         },
         "recipe": {
             "sha256": "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.11",
         "deps": [
@@ -22149,7 +19413,7 @@
         },
         "recipe": {
             "sha256": "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.3",
         "deps": [
@@ -22166,7 +19430,7 @@
         },
         "recipe": {
             "sha256": "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.1",
         "deps": []
@@ -22181,7 +19445,7 @@
         },
         "recipe": {
             "sha256": "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -22196,7 +19460,7 @@
         },
         "recipe": {
             "sha256": "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.2",
         "deps": [
@@ -22213,27 +19477,11 @@
         },
         "recipe": {
             "sha256": "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
     },
-    "clang-format": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format",
-            "sha256": "1rzax55darnj4h8i3qyrm2rqdwcvqggsz7kv6gi2i174fbdkbzfr",
-            "rev": "256039"
-        },
-        "recipe": {
-            "sha256": "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "cl-lib"
-        ]
-    },
     "yagist": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -22244,7 +19492,7 @@
         },
         "recipe": {
             "sha256": "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8.12",
         "deps": [
@@ -22261,7 +19509,7 @@
         },
         "recipe": {
             "sha256": "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5",
         "deps": []
@@ -22276,7 +19524,7 @@
         },
         "recipe": {
             "sha256": "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -22296,7 +19544,7 @@
         },
         "recipe": {
             "sha256": "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.3",
         "deps": [
@@ -22314,7 +19562,7 @@
         },
         "recipe": {
             "sha256": "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5.0",
         "deps": []
@@ -22329,7 +19577,7 @@
         },
         "recipe": {
             "sha256": "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.10",
         "deps": []
@@ -22344,7 +19592,7 @@
         },
         "recipe": {
             "sha256": "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.3",
         "deps": [
@@ -22362,7 +19610,7 @@
         },
         "recipe": {
             "sha256": "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
@@ -22379,7 +19627,7 @@
         },
         "recipe": {
             "sha256": "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.4",
         "deps": []
@@ -22394,7 +19642,7 @@
         },
         "recipe": {
             "sha256": "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": []
@@ -22409,7 +19657,7 @@
         },
         "recipe": {
             "sha256": "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -22424,7 +19672,7 @@
         },
         "recipe": {
             "sha256": "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.3",
         "deps": [
@@ -22442,23 +19690,27 @@
         },
         "recipe": {
             "sha256": "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": []
     },
-    "faces+": {
+    "import-js": {
         "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/faces+.el",
-            "sha256": "0mgj7mdadc62wpav7z138jsjvbvkxg05h5z9kmjw8jl5x4m334lq"
+            "tag": "fetchFromGitHub",
+            "owner": "trotzig",
+            "repo": "import-js",
+            "sha256": "029dsxll790f76mdjwjgx4ccsh08hq2haq6l7xj2y0rzi81a51an",
+            "rev": "92f298873e1c2a6d79c6aa936173db36b39029b7"
         },
         "recipe": {
-            "sha256": "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "sha256": "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "nil",
-        "deps": []
+        "version": "0.0.3",
+        "deps": [
+            "emacs"
+        ]
     },
     "rvm": {
         "fetch": {
@@ -22470,7 +19722,7 @@
         },
         "recipe": {
             "sha256": "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4.0",
         "deps": []
@@ -22485,7 +19737,7 @@
         },
         "recipe": {
             "sha256": "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -22500,7 +19752,7 @@
         },
         "recipe": {
             "sha256": "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -22517,26 +19769,13 @@
         },
         "recipe": {
             "sha256": "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.2",
         "deps": [
             "emacs"
         ]
     },
-    "facemenu+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/facemenu+.el",
-            "sha256": "0b8all1l4v98iz1y4zbc0l9zxrdbgkljzahs2yrbl9md2qj3j91d"
-        },
-        "recipe": {
-            "sha256": "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "narrow-reindent": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -22547,7 +19786,7 @@
         },
         "recipe": {
             "sha256": "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.0",
         "deps": [
@@ -22564,7 +19803,7 @@
         },
         "recipe": {
             "sha256": "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": [
@@ -22581,7 +19820,7 @@
         },
         "recipe": {
             "sha256": "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.3.6",
         "deps": [
@@ -22604,7 +19843,7 @@
         },
         "recipe": {
             "sha256": "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7",
         "deps": [
@@ -22621,7 +19860,7 @@
         },
         "recipe": {
             "sha256": "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9",
         "deps": [
@@ -22640,25 +19879,11 @@
         },
         "recipe": {
             "sha256": "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.7",
         "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": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "org-time-budgets": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -22669,7 +19894,7 @@
         },
         "recipe": {
             "sha256": "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.1",
         "deps": [
@@ -22687,27 +19912,11 @@
         },
         "recipe": {
             "sha256": "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.4",
         "deps": []
     },
-    "dirtree": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dirtree.el",
-            "sha256": "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx"
-        },
-        "recipe": {
-            "sha256": "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": [
-            "tree-mode",
-            "windata"
-        ]
-    },
     "test-case-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -22718,7 +19927,7 @@
         },
         "recipe": {
             "sha256": "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0",
         "deps": [
@@ -22735,7 +19944,7 @@
         },
         "recipe": {
             "sha256": "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.4",
         "deps": [
@@ -22752,37 +19961,11 @@
         },
         "recipe": {
             "sha256": "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": []
     },
-    "ucs-cmds": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/ucs-cmds.el",
-            "sha256": "0s65g6rdrjn4ypdny68fjk58yddn921xkbl811izxyc3q6q2z0k4"
-        },
-        "recipe": {
-            "sha256": "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "dot-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dot-mode.el",
-            "sha256": "0xhbzq3yvfvvvl6mfihrzkd3pn5p5yxvbcyf2jhsppk7lscifsgk"
-        },
-        "recipe": {
-            "sha256": "1fik32635caq3r5f9k62qbj2dkwczz2z1v28mc7bcj7jv2p93nvh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ido-grid-mode": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -22793,7 +19976,7 @@
         },
         "recipe": {
             "sha256": "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.5",
         "deps": [
@@ -22810,7 +19993,7 @@
         },
         "recipe": {
             "sha256": "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.4",
         "deps": [
@@ -22831,7 +20014,7 @@
         },
         "recipe": {
             "sha256": "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9.0",
         "deps": [
@@ -22849,7 +20032,7 @@
         },
         "recipe": {
             "sha256": "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -22867,7 +20050,7 @@
         },
         "recipe": {
             "sha256": "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.2",
         "deps": [
@@ -22885,7 +20068,7 @@
         },
         "recipe": {
             "sha256": "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -22900,24 +20083,11 @@
         },
         "recipe": {
             "sha256": "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1.0",
         "deps": []
     },
-    "column-marker": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/column-marker.el",
-            "sha256": "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9"
-        },
-        "recipe": {
-            "sha256": "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "magit-popup": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -22928,7 +20098,7 @@
         },
         "recipe": {
             "sha256": "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.3.1",
         "deps": [
@@ -22947,7 +20117,7 @@
         },
         "recipe": {
             "sha256": "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": []
@@ -22962,7 +20132,7 @@
         },
         "recipe": {
             "sha256": "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.5",
         "deps": [
@@ -22971,19 +20141,6 @@
             "json"
         ]
     },
-    "igrep": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/igrep.el",
-            "sha256": "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29"
-        },
-        "recipe": {
-            "sha256": "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "gnome-calendar": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -22994,7 +20151,7 @@
         },
         "recipe": {
             "sha256": "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2",
         "deps": []
@@ -23009,7 +20166,7 @@
         },
         "recipe": {
             "sha256": "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -23027,7 +20184,7 @@
         },
         "recipe": {
             "sha256": "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -23044,24 +20201,11 @@
         },
         "recipe": {
             "sha256": "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
     },
-    "imenu+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/imenu+.el",
-            "sha256": "16f2a6jgwgczsaps55pnnyi38mw5z3fn4abybyr7hn0kf5xqip6q"
-        },
-        "recipe": {
-            "sha256": "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "phi-search-mc": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -23072,7 +20216,7 @@
         },
         "recipe": {
             "sha256": "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.2.1",
         "deps": [
@@ -23090,7 +20234,7 @@
         },
         "recipe": {
             "sha256": "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -23105,7 +20249,7 @@
         },
         "recipe": {
             "sha256": "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.5.1",
         "deps": []
@@ -23120,7 +20264,7 @@
         },
         "recipe": {
             "sha256": "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.5",
         "deps": [
@@ -23137,7 +20281,7 @@
         },
         "recipe": {
             "sha256": "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.2",
         "deps": [
@@ -23155,7 +20299,7 @@
         },
         "recipe": {
             "sha256": "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.1",
         "deps": [
@@ -23174,7 +20318,7 @@
         },
         "recipe": {
             "sha256": "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.3.1",
         "deps": [
@@ -23182,19 +20326,6 @@
             "yasnippet"
         ]
     },
-    "summarye": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/summarye.el",
-            "sha256": "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py"
-        },
-        "recipe": {
-            "sha256": "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "helm-ls-git": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -23205,7 +20336,7 @@
         },
         "recipe": {
             "sha256": "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.8.0",
         "deps": [
@@ -23222,7 +20353,7 @@
         },
         "recipe": {
             "sha256": "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.4.5",
         "deps": []
@@ -23237,7 +20368,7 @@
         },
         "recipe": {
             "sha256": "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.23.4",
         "deps": []
@@ -23252,7 +20383,7 @@
         },
         "recipe": {
             "sha256": "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.10.0",
         "deps": [
@@ -23264,32 +20395,6 @@
             "spinner"
         ]
     },
-    "sudo-ext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/sudo-ext.el",
-            "sha256": "0fpz73r52j7sk1w7my0002wg7isrp54w28nnrwk9xb9il4qpxag2"
-        },
-        "recipe": {
-            "sha256": "1iirrpa4rnz7rm85yjg60vdfca1ipxbk3qkld8lgwwm242pvvkw3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
-    "levenshtein": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/levenshtein.el",
-            "sha256": "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6"
-        },
-        "recipe": {
-            "sha256": "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "ac-slime": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -23300,7 +20405,7 @@
         },
         "recipe": {
             "sha256": "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.8",
         "deps": [
@@ -23319,24 +20424,11 @@
         },
         "recipe": {
             "sha256": "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.7",
         "deps": []
     },
-    "etags-select": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/etags-select.el",
-            "sha256": "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb"
-        },
-        "recipe": {
-            "sha256": "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "traad-autocomplete": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -23347,7 +20439,7 @@
         },
         "recipe": {
             "sha256": "0psk4gb903slcsppgplawz6gsv1w1nw1vqj4y0rfql6rxnbl3jf2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4",
         "deps": []
@@ -23362,7 +20454,7 @@
         },
         "recipe": {
             "sha256": "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -23384,7 +20476,7 @@
         },
         "recipe": {
             "sha256": "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.3.1",
         "deps": [
@@ -23402,7 +20494,7 @@
         },
         "recipe": {
             "sha256": "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "5.0.1",
         "deps": [
@@ -23419,7 +20511,7 @@
         },
         "recipe": {
             "sha256": "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "20130521",
         "deps": []
@@ -23434,7 +20526,7 @@
         },
         "recipe": {
             "sha256": "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.4.0",
         "deps": [
@@ -23452,7 +20544,7 @@
         },
         "recipe": {
             "sha256": "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3",
         "deps": [
@@ -23471,7 +20563,7 @@
         },
         "recipe": {
             "sha256": "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.2.1",
         "deps": [
@@ -23489,7 +20581,7 @@
         },
         "recipe": {
             "sha256": "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -23508,7 +20600,7 @@
         },
         "recipe": {
             "sha256": "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": [
@@ -23527,7 +20619,7 @@
         },
         "recipe": {
             "sha256": "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -23541,7 +20633,7 @@
         },
         "recipe": {
             "sha256": "02lmhihv495drv9cb40h6l0xsbx7yglbvsdzc4r0vf78j87rs33f",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "2.0",
         "deps": []
@@ -23556,7 +20648,7 @@
         },
         "recipe": {
             "sha256": "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": [
@@ -23574,7 +20666,7 @@
         },
         "recipe": {
             "sha256": "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.3.0",
         "deps": [
@@ -23594,7 +20686,7 @@
         },
         "recipe": {
             "sha256": "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1",
         "deps": []
@@ -23609,7 +20701,7 @@
         },
         "recipe": {
             "sha256": "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.1",
         "deps": []
@@ -23624,9 +20716,9 @@
         },
         "recipe": {
             "sha256": "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.02",
+        "version": "0.2",
         "deps": [
             "cl-lib",
             "emacs"
@@ -23642,26 +20734,13 @@
         },
         "recipe": {
             "sha256": "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "1.0.0",
         "deps": [
             "emacs"
         ]
     },
-    "dired-details": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired-details.el",
-            "sha256": "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza"
-        },
-        "recipe": {
-            "sha256": "1390vl3i4qbnl7lbia98wznhf6x887d24f8p7146fpqjsiwbm5ck",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
-        },
-        "version": "nil",
-        "deps": []
-    },
     "org-link-travis": {
         "fetch": {
             "tag": "fetchFromGitHub",
@@ -23672,7 +20751,7 @@
         },
         "recipe": {
             "sha256": "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.0.1",
         "deps": [
@@ -23689,7 +20768,7 @@
         },
         "recipe": {
             "sha256": "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.1.0",
         "deps": []
@@ -23704,7 +20783,7 @@
         },
         "recipe": {
             "sha256": "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
         "version": "0.9",
         "deps": [
@@ -23724,9 +20803,9 @@
         },
         "recipe": {
             "sha256": "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40",
-            "commit": "a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753"
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
         },
-        "version": "0.04",
+        "version": "0.4",
         "deps": [
             "coffee-mode"
         ]

From 688c005608146110bb0ad45c5d7d0734a82d4f07 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 27 Dec 2015 10:37:02 -0600
Subject: [PATCH 086/249] melpaBuild: update package-build.el

---
 pkgs/build-support/emacs/melpa.nix    |  4 ++--
 pkgs/build-support/emacs/melpa2nix.el | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index 5eaa995b412..a1f10ad3143 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -22,8 +22,8 @@ with lib;
 let
 
   packageBuild = fetchurl {
-    url = https://raw.githubusercontent.com/milkypostman/melpa/12a862e5c5c62ce627dab83d7cf2cca6e8b56c47/package-build.el;
-    sha256 = "1nviyyprypz7nmam9rwli4yv3kxh170glfbznryrp4czxkrjjdhk";
+    url = https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/package-build.el;
+    sha256 = "1biwg2pqmmdz5iwqbjdszljazqymvgyyjcnc255nr6qz8mhnx67j";
   };
 
   fname = "${pname}-${version}";
diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el
index d54e9d21e25..858ffd7593b 100644
--- a/pkgs/build-support/emacs/melpa2nix.el
+++ b/pkgs/build-support/emacs/melpa2nix.el
@@ -23,14 +23,14 @@
 
 (defun melpa2nix-package-build-archive (name version files)
   "Build a package archive for package NAME."
-  (pb/message "\n;;; %s\n" name)
+  (package-build--message "\n;;; %s\n" name)
   (let* ((start-time (current-time))
          (archive-entry (package-build-package name
                                                version
                                                files
                                                package-build-working-dir
                                                package-build-archive-dir)))
-    
-    (pb/message "Built in %.3fs, finished at %s"
-                (time-to-seconds (time-since start-time))
-                (current-time-string))))
+
+    (package-build--message "Built in %.3fs, finished at %s"
+                            (time-to-seconds (time-since start-time))
+                            (current-time-string))))

From 00aac09d24343b7beb8a07cbd5affdb110199c67 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 27 Dec 2015 11:05:53 -0600
Subject: [PATCH 087/249] melpaPackages: actually build latest packages

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index d7e894c672a..891bb5df567 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -18,7 +18,7 @@ let
 
   inherit (lib) makeScope mapAttrs;
 
-  json = builtins.readFile ./melpa-stable-packages.json;
+  json = builtins.readFile ./melpa-packages.json;
   manifest = builtins.fromJSON json;
 
   mkPackage = self: name: recipe:

From 3570bc30affa9b72c67e2f56d5de1cf9d9c42b7e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 27 Dec 2015 18:42:27 +0100
Subject: [PATCH 088/249] lilypond: add a workaround for fontforge version
 detection

A part of Fontforge store path was taken as a part of the version by
configure script leading to a version check failure.
---
 pkgs/misc/lilypond/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index 21df615d661..8b2be0914e3 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec{
 
   preConfigure=''
     sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl
+
+    # At some point our fontforge had path 2n…-fontforge-2015… and it
+    # confused the version detection…
+    sed -re 's%("[$]exe" --version .*)([|\\] *$)%\1 | sed -re "s@/nix/store/[a-z0-9]{32}-@@" \2%' \
+      -i configure
   '';
 
   postInstall = ''

From b88abaaf5e6fbf525e29357732b1f28648b5bad2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 27 Dec 2015 18:59:07 +0100
Subject: [PATCH 089/249] wireless-regdb: init at 2015-12-14

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

diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
new file mode 100644
index 00000000000..58328e9289c
--- /dev/null
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit }:
+
+let version = "2015-12-14"; in
+stdenv.mkDerivation {
+  name = "wireless-regdb-${version}";
+
+  src = fetchgit {
+    sha256 = "1ldfcxn3mdb104czy78b7nj1clsbfp8fc6mshix98zq0bg4k7rsm";
+    url = https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git;
+    rev = "refs/tags/master-${version}";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+  ];
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Wireless regulatory database for CRDA";
+    homepage = https://git.kernel.org/cgit/linux/kernel/git/sforshee/wireless-regdb.git/;
+    license = licenses.free;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88dc7faced3..eac8799e021 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10934,6 +10934,8 @@ let
 
   vistafonts = callPackage ../data/fonts/vista-fonts { };
 
+  wireless-regdb = callPackage ../data/misc/wireless-regdb { };
+
   wqy_microhei = callPackage ../data/fonts/wqy-microhei { };
 
   wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { };

From ee0fae473cea2ded7d3ea59967d3c751605e9939 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 27 Dec 2015 18:53:01 +0100
Subject: [PATCH 090/249] crda: init at 3.18

---
 pkgs/os-specific/linux/crda/default.nix | 50 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/os-specific/linux/crda/default.nix

diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix
new file mode 100644
index 00000000000..542fcae562d
--- /dev/null
+++ b/pkgs/os-specific/linux/crda/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, libgcrypt, libnl, pkgconfig, pythonPackages, wireless-regdb }:
+
+let version = "3.18"; in
+stdenv.mkDerivation {
+  name = "crda-${version}";
+
+  src = fetchurl {
+    sha256 = "1gydiqgb08d9gbx4l6gv98zg3pljc984m50hmn3ysxcbkxkvkz23";
+    url = "http://kernel.org/pub/software/network/crda/crda-${version}.tar.xz";
+  };
+
+  buildInputs = [ libgcrypt libnl ];
+  nativeBuildInputs = [
+    pkgconfig pythonPackages.m2crypto pythonPackages.python
+  ];
+
+  postPatch = ''
+    patchShebangs utils/
+    substituteInPlace Makefile --replace ldconfig true
+    sed -i crda.c \
+      -e "/\/usr\/.*\/regulatory.bin/d" \
+      -e "s|/lib/crda|${wireless-regdb}/lib/crda|g"
+  '';
+
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+    "REG_BIN=${wireless-regdb}/lib/crda/regulatory.bin"
+  ];
+
+  buildFlags = [ "all_noverify" ];
+  enableParallelBuilding = true;
+
+  doCheck = true;
+  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
+      userspace for regulatory compliance. It relies on nl80211 for communication.
+      CRDA is intended to be run only through udev communication from the kernel.
+    '';
+    homepage = http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/;
+    license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eac8799e021..092f03d777e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9717,6 +9717,8 @@ let
 
   cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
 
+  crda = callPackage ../os-specific/linux/crda { };
+
   darwin = let
     cmdline = callPackage ../os-specific/darwin/command-line-tools {};
     apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };

From 7c173028485f6edea118d3d1c16a31e5bec3fa7c Mon Sep 17 00:00:00 2001
From: Arda Xi <arda@ardaxi.com>
Date: Sun, 27 Dec 2015 20:56:52 +0100
Subject: [PATCH 091/249] Make gpgkey2ssh use absolute path to gpg2, fixes
 #11912

---
 pkgs/tools/security/gnupg/20.nix              |  6 +++++-
 pkgs/tools/security/gnupg/21.nix              |  4 ++++
 pkgs/tools/security/gnupg/gpgkey2ssh-20.patch | 14 ++++++++++++++
 pkgs/tools/security/gnupg/gpgkey2ssh-21.patch | 13 +++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
 create mode 100644 pkgs/tools/security/gnupg/gpgkey2ssh-21.patch

diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 36c877620f1..117fc41c1ab 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
     = [ readline zlib libgpgerror libgcrypt libassuan libksba pth
         openldap bzip2 libusb curl libiconv ];
 
-  patchPhase = ''
+  patches = [ ./gpgkey2ssh-20.patch ];
+
+  prePatch = ''
     find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i
   '' + stdenv.lib.optionalString stdenv.isLinux ''
     sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
@@ -35,6 +37,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry";
 
+  postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c";
+
   checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check";
 
   doCheck = true;
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 9390207e14a..bafcd88f1b9 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -20,10 +20,14 @@ stdenv.mkDerivation rec {
     sha256 = "1ybcsazjm21i2ys1wh49cz4azmqz7ghx5rb6hm4gm93i2zc5igck";
   };
 
+  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 :-(
 
+  postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c";
+
   buildInputs = [
     pkgconfig libgcrypt libassuan libksba libiconv npth
     autoreconfHook gettext texinfo
diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
new file mode 100644
index 00000000000..b536a4fe50e
--- /dev/null
+++ b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
@@ -0,0 +1,14 @@
+diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
+index 903fb5b..d5611dc 100644
+--- a/tools/gpgkey2ssh.c
++++ b/tools/gpgkey2ssh.c
+@@ -266,7 +266,7 @@ main (int argc, char **argv)
+   keyid = argv[1];
+ 
+   ret = asprintf (&command,
+-		  "gpg --list-keys --with-colons --with-key-data '%s'",
++		  "@out@/bin/gpg2 --list-keys --with-colons --with-key-data '%s'",
+ 		  keyid);
+   assert (ret > 0);
+ 
+
diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch
new file mode 100644
index 00000000000..198869423e5
--- /dev/null
+++ b/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch
@@ -0,0 +1,13 @@
+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 0cfa4fdbd4eb2330f18cd10723d2c5e6a5f8eac5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Dec 2015 19:55:44 +0000
Subject: [PATCH 092/249] strace: 4.10 -> 4.11

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

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 461e3c25a36..0232342bf84 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, libunwind }:
 
 stdenv.mkDerivation rec {
-  name = "strace-4.10";
+  name = "strace-4.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/strace/${name}.tar.xz";
-    sha256 = "1qhfwijxvblwdvvm70f8bhzs4fpbzqmwwbkfp636brzrds30s676";
+    sha256 = "0ll1rpjs441jac2689nga74qb49x1zkg8a2b7rzzchgrv1n5ysp8";
   };
 
   nativeBuildInputs = [ perl ];
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     description = "A system call tracer for Linux";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ mornfall jgeerds ];
+    maintainers = with maintainers; [ mornfall jgeerds globin ];
   };
 }

From 7de67f48a5c51e791951c9480ef18b1657ad74ba Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Dec 2015 20:21:43 +0000
Subject: [PATCH 093/249] thinkfan: 0.8.1 -> 0.9.2

---
 pkgs/tools/system/thinkfan/default.nix | 27 ++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index c513e475e58..3e97a4b64a3 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -1,22 +1,25 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, cmake }:
 
-let
-
-  version = "0.8.1";
-  
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "thinkfan-${version}";
+  version = "0.9.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/thinkfan/thinkfan-${version}.tar.gz";
-    sha256 = "04akla66r8k10x0jvmcpfi92hj2sppygcl7hhwn8n8zsvvf0yqxs";
+    sha256 = "0ydgabk2758f6j64g1r9vdsd221nqsv5rwnphm81s7i2vgra1nlh";
   };
-  
+
+  nativeBuildInputs = [ cmake ];
+
+  unpackPhase = ''
+    sourceRoot="$PWD/${name}";
+    mkdir $sourceRoot;
+    tar xzvf "$src" -C $sourceRoot;
+  '';
+
   installPhase = ''
-    mkdir -p $out/bin
-    mv thinkfan $out/bin/
+    mkdir -p $out/bin;
+    mv thinkfan $out/bin/;
   '';
 
   meta = {

From f50a719a4d163991dcac200a38ef16d07f0b6318 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 27 Dec 2015 19:04:17 +0100
Subject: [PATCH 094/249] wireless-regdb: licenses.{free -> isc}, apparently

---
 pkgs/data/misc/wireless-regdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index 58328e9289c..e8afb25b8b3 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     inherit version;
     description = "Wireless regulatory database for CRDA";
     homepage = https://git.kernel.org/cgit/linux/kernel/git/sforshee/wireless-regdb.git/;
-    license = licenses.free;
+    license = licenses.isc;
     platforms = platforms.all;
     maintainers = with maintainers; [ nckx ];
   };

From 330b89c68b17f24cbe1f1f4a4b53e2e687715bbd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 27 Dec 2015 20:03:47 +0100
Subject: [PATCH 095/249] crda: use PREFIX instead of DESTDIR

Otherwise, `$out/lib/udev/rules.d/85-regulatory.rules` will still refer to a
non-existent `/sbin/crda`.
---
 pkgs/os-specific/linux/crda/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix
index 542fcae562d..488a6ce1a0f 100644
--- a/pkgs/os-specific/linux/crda/default.nix
+++ b/pkgs/os-specific/linux/crda/default.nix
@@ -23,8 +23,9 @@ stdenv.mkDerivation {
   '';
 
   makeFlags = [
-    "DESTDIR=$(out)"
-    "PREFIX="
+    "PREFIX=$(out)"
+    "SBINDIR=$(out)/bin/"
+    "UDEV_RULE_DIR=$(out)/lib/udev/rules.d/"
     "REG_BIN=${wireless-regdb}/lib/crda/regulatory.bin"
   ];
 

From 566c06c5a77b20a22745f23917511eef7a600901 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Dec 2015 21:30:11 +0000
Subject: [PATCH 096/249] apacheHttpd: 2.4.17 -> 2.4.18

---
 pkgs/servers/http/apache-httpd/2.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index aa8dfdd45f5..ddb1ec443a0 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
 assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.17";
+  version = "2.4.18";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "165p5qgwyk1dwjypgcx5vb47xadiszs3dw28n2axplw1xifh67ik";
+    sha256 = "0k7xm6ldzvakzq39nw6b39190ihlkc28all2gkvckxa1vr8b0i06";
   };
 
   buildInputs = [perl] ++

From a219778acc53783411306cdcb9e2cd0d4cbcecc9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Dec 2015 21:39:19 +0000
Subject: [PATCH 097/249] dhcpcd: 6.9.3 -> 6.9.4

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

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index dfe2de9b96d..856f75f0633 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-6.9.3";
+  name = "dhcpcd-6.9.4";
 
   src = fetchurl {
     url = "mirror://roy/dhcpcd/${name}.tar.xz";
-    sha256 = "0lxfis066ijjlqha2mf49v8mydmnnjb6nijihfn65ylmsqg4g2b0";
+    sha256 = "184vpid8m5175xa2nkh6mmvk8b6z4isfm6nvf4g8l5ggfdsgzwy3";
   };
 
   buildInputs = [ pkgconfig udev ];

From 4ef9b7558f9f61910c9b39073cbef8883aa5ede1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 27 Dec 2015 22:56:42 +0100
Subject: [PATCH 098/249] saneBackendsGit: 2015-12-20 -> 2015-12-27

---
 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 7a76d8804d6..6c6838daef1 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 = "2015-12-20";
+  version = "2015-12-27";
   src = fetchgit {
-    sha256 = "998fdc9cdd3f9220c38244e0b87bba3ee623d7d20726479b04ed95b3836a37ed";
-    rev = "5136e664b8608604f54a2cc1d466019922b311e6";
+    sha256 = "4bf6e8815d2edbbc75255928d0fb030639a9fea9a5aa953dcf1f00e167eff527";
+    rev = "cadb4b0fff00540159625320416e5601c4704627";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From bb223bc3ad0b25ed53854e2131b56460d5fba9b9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Dec 2015 22:11:59 +0000
Subject: [PATCH 099/249] libressl_2_2: 2.2.4 -> 2.2.5

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

diff --git a/pkgs/development/libraries/libressl/2.2.nix b/pkgs/development/libraries/libressl/2.2.nix
index fd18c7f5652..89e7e6507e4 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.4";
+  version = "2.2.5";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "0zlsxw366n438dc14zqnim6fc5vh1574jj95hv1sym46prcrhh3b";
+    sha256 = "0jwidi7fafcdh5qml72dx0ad0kfsk94qxzm29i7wd3cx8v8dxjp3";
   };
 
   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 c0aada1e1fc8ae2f7e0fe51f7e4938a03a055d52 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 27 Sep 2015 07:02:10 +0300
Subject: [PATCH 100/249] rpm: Hack fix finding libpython when compiling for
 Python 3

Currently, building RPM with `python = python3` causes this:

checking for a Python interpreter with version >= 2.6... python3
checking for python3... /nix/store/dykqxnrwiz9drlcv2wy8lpvl3xvklx0g-python3-3.4.3/bin/python3
checking for python3 version... 3.4
checking for Python.h... yes
checking for library containing Py_Main... no
configure: error: missing python library

That comes from this snippet in configure.ac:
    AC_SEARCH_LIBS([Py_Main],[python${PYTHON_VERSION} python],[
      WITH_PYTHON_LIB="$ac_res"
    ],[AC_MSG_ERROR([missing python library])
    ])

So it's looking for (e.g) `libpython3.4.so` wheras we have `libpython3.4m.so`.
Patching the configure script to match seems to make that work (although
I don't really understand what the heck is this 'm' business about).
---
 pkgs/tools/package-management/rpm/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index ef7b9995296..7b5281220fa 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_LINK = "-L${elfutils}/lib";
 
+  postPatch = ''
+    # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here
+    substituteInPlace configure --replace 'python''${PYTHON_VERSION}' ${python.executable}
+  '';
+
   configureFlags = "--with-external-db --without-lua --enable-python";
 
   meta = with stdenv.lib; {

From f5b6ced7ec77303acadc85dbe3f112dec665c4ea Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 27 Sep 2015 07:05:27 +0300
Subject: [PATCH 101/249] pythonPackages.tlsh: init at 3.4.1

This C extension is a bit funky since it needs cmake to be run to
generate some header file before it can be built.
---
 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 45b8aec62fd..62e820c782b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21111,6 +21111,29 @@ in modules // {
     };
   };
 
+  tlsh = buildPythonPackage rec {
+    name = "tlsh-3.4.1";
+    src = pkgs.fetchFromGitHub {
+      owner = "trendmicro";
+      repo = "tlsh";
+      rev = "b319aed6a270cc765347296b442820c495018833";
+      sha256 = "08ysniihvidcyvh9zip64wwvj7mvxvsqs60ci8cxj28f1ip0n8wg";
+    };
+    buildInputs = with pkgs; [ cmake ];
+    preConfigure = ''
+      mkdir build
+      cd build
+      cmake ..
+      cd ../py_ext
+    '';
+    meta = with stdenv.lib; {
+      description = "Trend Micro Locality Sensitive Hash";
+      homepage = https://github.com/trendmicro/tlsh;
+      license = licenses.asl20;
+      platforms = platforms.linux;
+    };
+  };
+
   toposort = buildPythonPackage rec {
     name = "toposort-${version}";
     version = "1.1";

From 7e85fdc6df8bd280bb01a50285ae35e3afa9bc85 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 27 Sep 2015 07:10:25 +0300
Subject: [PATCH 102/249] diffoscope: 29 -> 44

Relevant changes:
 - Python version switched to Python 3
 - ssdeep library got replaced with tlsh
 - the 'magic' Python package got replaced with a different one
 - Minor build system improvements == less work for us
---
 pkgs/tools/misc/diffoscope/default.nix | 15 ++++++---------
 pkgs/top-level/all-packages.nix        |  5 ++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index e6c672d8344..f91cd143633 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -5,33 +5,30 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "diffoscope-${version}";
-  version = "29";
+  version = "44";
 
   namePrefix = "";
 
   src = fetchgit {
     url = "git://anonscm.debian.org/reproducible/diffoscope.git";
     rev = "refs/tags/${version}";
-    sha256 = "0q7hx2wm9gvzl1f7iilr9pjwpv8i2anscqan7cgk80v90s2pakrf";
+    sha256 = "1sisdmh1bl62b16yfjy9mxxdfzhskrabp0l3pl1kxn7db0c4vpac";
   };
 
   postPatch = ''
-    # Different pkg name in debian
-    sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@"
-
     # Upstream doesn't provide a PKG-INFO file
-    sed -i setup.py -e "/'rpm',/d"
+    sed -i setup.py -e "/'rpm-python',/d"
   '';
 
-  # Still missing these tools: ghc javap showttf sng
-  propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c magic ssdeep ]) ++
+  # Still missing these tools: enjarify ghc img2txt javap otool(maybe OS X only) ppudump showttf sng
+  # Also these libraries: python3-guestfs
+  propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++
     [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg
       gzip pdftk poppler_utils rpm sqlite squashfsTools unzip vim xz ];
 
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
 
   postInstall = ''
-    mv $out/bin/diffoscope.py $out/bin/diffoscope
     mkdir -p $out/share/man/man1
     ${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 986004c5642..03709f72803 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1285,7 +1285,10 @@ let
 
   di = callPackage ../tools/system/di { };
 
-  diffoscope = callPackage ../tools/misc/diffoscope { };
+  diffoscope = callPackage ../tools/misc/diffoscope {
+    pythonPackages = python3Packages;
+    rpm = rpm.override { python = python3; };
+  };
 
   diffstat = callPackage ../tools/text/diffstat { };
 

From eae60d2f40cc561c83fe30da221fa7964aa9969f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 23 Dec 2015 23:40:59 +0200
Subject: [PATCH 103/249] diffoscope: Add more tools to the runtime path

---
 pkgs/tools/misc/diffoscope/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix        |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index f91cd143633..7fe21e8b347 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, pythonPackages, docutils
-, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext
-, gnupg, gzip, pdftk, poppler_utils, rpm, sqlite, squashfsTools, unzip, vim, xz
+, 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
 }:
 
 pythonPackages.buildPythonPackage rec {
@@ -20,11 +20,11 @@ pythonPackages.buildPythonPackage rec {
     sed -i setup.py -e "/'rpm-python',/d"
   '';
 
-  # Still missing these tools: enjarify ghc img2txt javap otool(maybe OS X only) ppudump showttf sng
+  # Still missing these tools: enjarify otool(maybe OS X only) showttf
   # Also these libraries: python3-guestfs
   propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++
-    [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg
-      gzip pdftk poppler_utils rpm sqlite squashfsTools unzip vim xz ];
+    [ 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 ];
 
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03709f72803..3dd1d8e74bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1286,6 +1286,7 @@ let
   di = callPackage ../tools/system/di { };
 
   diffoscope = callPackage ../tools/misc/diffoscope {
+    jdk = jdk7;
     pythonPackages = python3Packages;
     rpm = rpm.override { python = python3; };
   };

From 7195e6e14f406b1de378d015a40911a2b195b8c0 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 27 Dec 2015 22:43:12 -0500
Subject: [PATCH 104/249] goPackages.hugo: init at 0.15

Also had to add tons of other packages used as dependencies
---
 pkgs/top-level/go-packages.nix | 194 +++++++++++++++++++++++++++++++--
 1 file changed, 183 insertions(+), 11 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8357971d0f9..e1825ace20d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -166,6 +166,14 @@ let
 
   ## THIRD PARTY
 
+  ace = buildFromGitHub {
+    rev    = "899eede6af0d99400b2c8886d86fd8d351074d37";
+    owner  = "yosssi";
+    repo   = "ace";
+    sha256 = "0xdzqfzaipyaa973j41yq9lbijw36kyaz523sw05kci4r5ivq4f5";
+    buildInputs = [ gohtml ];
+  };
+
   adapted = buildFromGitHub {
     rev = "eaea06aaff855227a71b1c58b18bc6de822e3e77";
     date = "2015-06-03";
@@ -175,6 +183,14 @@ let
     propagatedBuildInputs = [ sys ];
   };
 
+  afero = buildFromGitHub {
+    rev    = "90b5a9bd18a72dbf3e27160fc47acfaac6c08389";
+    owner  = "spf13";
+    repo   = "afero";
+    sha256 = "1xqvbwny61j85psymcs8hggmqyyg4yq3q4cssnvnvbsl3aq8kn4k";
+    propagatedBuildInputs = [ text ];
+  };
+
   airbrake-go = buildFromGitHub {
     rev    = "5b5e269e1bc398d43f67e43dafff3414a59cd5a2";
     owner  = "tobi";
@@ -182,6 +198,13 @@ let
     sha256 = "1bps4y3vpphpj63mshjg2aplh579cvqac0hz7qzvac0d1fqcgkdz";
   };
 
+  amber = buildFromGitHub {
+    rev    = "144da19a9994994c069f0693294a66dd310e14a4";
+    owner  = "eknkc";
+    repo   = "amber";
+    sha256 = "079wwdq4cn9i1vx5zik16z4bmghkc7zmmvbrp1q6y4cnpmq95rqk";
+  };
+
   ansicolor = buildFromGitHub {
     rev    = "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b";
     owner  = "shiena";
@@ -269,6 +292,14 @@ let
     sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3";
   };
 
+  blackfriday = buildFromGitHub {
+    rev    = "d18b67ae0afd61dae240896eae1785f00709aa31";
+    owner  = "russross";
+    repo   = "blackfriday";
+    sha256 = "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf";
+    propagatedBuildInputs = [ sanitized_anchor_name ];
+  };
+
   bolt = buildFromGitHub {
     rev    = "957d850b5158a4eebf915476058e720f43459584";
     owner  = "boltdb";
@@ -315,6 +346,14 @@ let
     };
   };
 
+  cast = buildFromGitHub {
+    rev    = "ee815aaf958c707ad07547cd62150d973710f747";
+    owner  = "spf13";
+    repo   = "cast";
+    sha256 = "144xwvmjbrv59zjj1gnq5j9qpy62dgyfamxg5l3smdwfwa8vpf5i";
+    buildInputs = [ jwalterweatherman ];
+  };
+
   check-v1 = buildGoPackage rec {
     rev = "871360013c92e1c715c2de6d06b54899468a8a2d";
     name = "check-v1-${stdenv.lib.strings.substring 0 7 rev}";
@@ -348,17 +387,12 @@ let
     sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c";
   };
 
-  cobra = buildGoPackage rec {
-    date = "20140617";
-    rev = "10a8494a87448bf5003222d9974f166437e7f042";
-    name = "cobra-${date}-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/spf13/cobra";
-    src = fetchgit {
-      inherit rev;
-      url = "https://${goPackagePath}.git";
-      sha256 = "1ydcccx0zdswca4v9hfmrn8ck42h485hy3wrd9k7y6mra3r6c08j";
-    };
-    propagatedBuildInputs = [ pflag ];
+  cobra = buildFromGitHub {
+    rev    = "ee6224d01f6a83f543ae90f881b703cf195782ba";
+    owner  = "spf13";
+    repo   = "cobra";
+    sha256 = "0skmq1lmkh2xzl731a2sfcnl2xbcy9v1050pcf10dahwqzsbx6ij";
+    propagatedBuildInputs = [ pflag-spf13 mousetrap go-md2man viper ];
   };
 
   cli-go = buildFromGitHub {
@@ -504,6 +538,26 @@ let
     sha256 = "1mxqnxddny43k1shsvd39sfzfs0d20gv3vm9lcjp04g3b0rplck1";
   };
 
+  crypt = buildFromGitHub {
+    rev    = "749e360c8f236773f28fc6d3ddfce4a470795227";
+    owner  = "xordataexchange";
+    repo   = "crypt";
+    sha256 = "17g9122b8bmbdpshyzhl7cxsp0nvhk0rc6syc92djavggmbpl6ig";
+    preBuild = ''
+      substituteInPlace go/src/github.com/xordataexchange/crypt/backend/consul/consul.go \
+        --replace 'github.com/armon/consul-api' 'github.com/hashicorp/consul/api' \
+        --replace 'consulapi' 'api'
+    '';
+    propagatedBuildInputs = [ go-etcd consul-api crypto ];
+  };
+
+  cssmin = buildFromGitHub {
+    rev    = "fb8d9b44afdc258bfff6052d3667521babcb2239";
+    owner  = "dchest";
+    repo   = "cssmin";
+    sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s";
+  };
+
   dbus = buildGoPackage rec {
     rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea";
     name = "dbus-${stdenv.lib.strings.substring 0 7 rev}";
@@ -685,6 +739,14 @@ let
     };
   };
 
+  fsync = buildFromGitHub {
+    rev    = "c2544e79b93fda5653255f907a30fba1c2ac2638";
+    owner  = "spf13";
+    repo   = "fsync";
+    sha256 = "0hzfk2f8pm756j10zgsk8b8gbfylcf8h6q4djz0ka9zpg76s26lz";
+    buildInputs = [ afero ];
+  };
+
   fzf = buildFromGitHub {
     rev = "0.11.1";
     owner = "junegunn";
@@ -907,6 +969,14 @@ let
     doCheck = false; # please check again
   };
 
+  gohtml = buildFromGitHub {
+    rev    = "ccf383eafddde21dfe37c6191343813822b30e6b";
+    owner  = "yosssi";
+    repo   = "gohtml";
+    sha256 = "1cghwgnx0zjdrqxzxw71riwiggd2rjs2i9p2ljhh76q3q3fd4s9f";
+    propagatedBuildInputs = [ net ];
+  };
+
   gomdb = buildFromGitHub {
     rev    = "151f2e08ef45cb0e57d694b2562f351955dff572";
     owner  = "armon";
@@ -1361,6 +1431,14 @@ let
     propagatedBuildInputs = [ prometheus.client_golang ];
   };
 
+  go-md2man = buildFromGitHub {
+    rev    = "71acacd42f85e5e82f70a55327789582a5200a90";
+    owner  = "cpuguy83";
+    repo   = "go-md2man";
+    sha256 = "0hmkrq4gdzb6mwllmh4p1y7vrz7hyr8xqagpk9nyr5dhygvnnq2v";
+    propagatedBuildInputs = [ blackfriday ];
+  };
+
   go-multierror = buildFromGitHub {
     rev    = "56912fb08d85084aa318edcf2bba735b97cf35c5";
     owner  = "hashicorp";
@@ -1645,6 +1723,18 @@ let
     sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl";
   };
 
+  hugo = buildFromGitHub {
+    rev    = "v0.15";
+    owner  = "spf13";
+    repo   = "hugo";
+    sha256 = "1v0z9ar5kakhib3c3c43ddwd1ga4b8icirg6kk3cnaqfckd638l5";
+    buildInputs = [
+      mapstructure text websocket cobra osext fsnotify.v1 afero
+      jwalterweatherman cast viper yaml-v2 ace purell mmark blackfriday amber
+      cssmin nitro inflect fsync
+    ];
+  };
+
   inf = buildFromGitHub {
     rev    = "c85f1217d51339c0fa3a498cc8b2075de695dae6";
     owner  = "go-inf";
@@ -1654,6 +1744,17 @@ let
     goPackageAliases = [ "github.com/go-inf/inf" ];
   };
 
+  inflect = buildGoPackage {
+    name = "inflect";
+    goPackagePath = "bitbucket.org/pkg/inflect";
+    src = fetchFromBitbucket {
+      rev    = "8961c3750a47b8c0b3e118d52513b97adf85a7e8";
+      owner  = "pkg";
+      repo   = "inflect";
+      sha256 = "04iln5b9iyvr6bcn5cj2zq6vqk3a2b4vsy48y2kylhk7qnakip99";
+    };
+  };
+
   influxdb8-client = buildFromGitHub{
     rev = "v0.8.8";
     owner = "influxdb";
@@ -1703,6 +1804,13 @@ let
     sha256 = "1fw0qqaz2wj9d4rj2jkfj7rb25ra106p4znfib69p4d3qibfjcsn";
   };
 
+  jwalterweatherman = buildFromGitHub {
+    rev    = "c2aa07df593850a04644d77bb757d002e517a296";
+    owner  = "spf13";
+    repo   = "jwalterweatherman";
+    sha256 = "0m8867afsvka5gp2idrmlarpjg7kxx7qacpwrz1wl8y3zxyn3945";
+  };
+
   ldap = buildGoPackage rec {
     rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29";
     name = "ldap-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1935,6 +2043,14 @@ let
     buildInputs = [ pkgs.cyrus_sasl tomb ];
   };
 
+  mmark = buildFromGitHub {
+    rev    = "eacb2132c31a489033ebb068432892ba791a2f1b";
+    owner  = "miekg";
+    repo   = "mmark";
+    sha256 = "0wsi6fb6f1qi1a8yv858bkgn8pmsspw2k6dx5fx38kvg8zsb4l1a";
+    buildInputs = [ toml ];
+  };
+
   mongo-tools = buildFromGitHub {
     rev    = "4fcfd3e57415de95c0c016def07b95bca63cccb4";
     owner  = "mongodb";
@@ -2048,6 +2164,13 @@ let
     buildFlags = [ "-tags release" ];
   };
 
+  nitro = buildFromGitHub {
+    rev    = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8";
+    owner  = "spf13";
+    repo   = "nitro";
+    sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
+  };
+
   nsq = buildFromGitHub {
     rev = "v0.3.5";
     owner = "bitly";
@@ -2237,6 +2360,13 @@ let
     doCheck = false; # bad import path in tests
   };
 
+  pflag-spf13 = buildFromGitHub rec {
+    rev    = "08b1a584251b5b62f458943640fc8ebd4d50aaa5";
+    owner  = "spf13";
+    repo   = "pflag";
+    sha256 = "139d08cq06jia0arc6cikdnhnaqms07xfay87pzq5ym86fv0agiq";
+  };
+
   pond = let
       isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64;
       gui = true; # Might be implemented with nixpkgs config.
@@ -2629,6 +2759,13 @@ let
     };
   };
 
+  properties = buildFromGitHub {
+    rev    = "v1.5.6";
+    owner  = "magiconair";
+    repo   = "properties";
+    sha256 = "043jhba7qbbinsij3yc475s1i42sxaqsb82mivh9gncpvnmnf6cl";
+  };
+
   gogo.protobuf = buildFromGitHub {
     rev = "932b70afa8b0bf4a8e167fdf0c3367cebba45903";
     owner = "gogo";
@@ -2647,6 +2784,14 @@ let
     sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d";
   };
 
+  purell = buildFromGitHub {
+    rev    = "d69616f51cdfcd7514d6a380847a152dfc2a749d";
+    owner  = "PuerkitoBio";
+    repo   = "purell";
+    sha256 = "0nma5i25j0y223ns7482lx4klcfhfwdr8v6r9kzrs0pwlq64ghs0";
+    propagatedBuildInputs = [ urlesc ];
+  };
+
   pushover = buildFromGitHub {
     rev    = "a8420a1935479cc266bda685cee558e86dad4b9f";
     owner  = "thorduri";
@@ -2799,6 +2944,15 @@ let
     buildInputs = [ net text ];
   };
 
+  # This is the upstream package name, underscores and all. I don't like it
+  # but it seems wrong to change their name when packaging it.
+  sanitized_anchor_name = buildFromGitHub {
+    rev    = "10ef21a441db47d8b13ebcc5fd2310f636973c77";
+    owner  = "shurcooL";
+    repo   = "sanitized_anchor_name";
+    sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01";
+  };
+
   scada-client = buildGoPackage rec {
     rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae";
     name = "scada-client-${stdenv.lib.strings.substring 0 7 rev}";
@@ -3072,6 +3226,13 @@ let
     sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
   };
 
+  urlesc = buildFromGitHub {
+    rev    = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587";
+    owner  = "opennota";
+    repo   = "urlesc";
+    sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni";
+  };
+
   usb = buildFromGitHub rec {
     rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1";
     date = "2014-12-17";
@@ -3121,6 +3282,17 @@ let
     sha256 = "1qav4lf4ln5gs81714876q2cy9gfaxblbvawg3hxznbwakd9zmd8";
   };
 
+  viper = buildFromGitHub {
+    rev    = "e37b56e207dda4d79b9defe0548e960658ee8b6b";
+    owner  = "spf13";
+    repo   = "viper";
+    sha256 = "0q0hkla23hgvc3ab6qdlrfwxa8lnhy2s2mh2c8zrh632gp8d6prl";
+    propagatedBuildInputs = [
+      mapstructure yaml-v2 jwalterweatherman crypt fsnotify.v1 cast properties
+      pretty toml pflag-spf13
+    ];
+  };
+
   vulcand = buildGoPackage rec {
     rev = "v0.8.0-beta.3";
     name = "vulcand-${rev}";

From 5120601c28977ac8681df1192b2008e681e21a05 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 21 Nov 2015 23:44:32 +0200
Subject: [PATCH 105/249] yle-dl: init at 2.9.1

---
 pkgs/tools/misc/yle-dl/default.nix | 36 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/misc/yle-dl/default.nix

diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
new file mode 100644
index 00000000000..c6efac3ffe6
--- /dev/null
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "yle-dl-${version}";
+  version = "2.9.1";
+
+  src = fetchFromGitHub {
+    owner = "aajanki";
+    repo = "yle-dl";
+    rev = version;
+    sha256 = "1irpcp9iw2cw85sj1kzndmrw8350p9q7cfghjx2xkh2czk9k7whq";
+  };
+
+  patchPhase = ''
+    substituteInPlace yle-dl --replace '/usr/local/share/' "$out/share/"
+
+    # HACK: work around https://github.com/NixOS/nixpkgs/issues/9593
+    substituteInPlace yle-dl --replace '/usr/bin/env python2' '/usr/bin/env python'
+  '';
+
+  buildInputs = [ pythonPackages.wrapPython ];
+  pythonPath = [ rtmpdump php ] ++ (with pythonPackages; [ pycrypto ]);
+
+  installPhase = ''
+    make install prefix=$out
+    wrapPythonPrograms
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Downloads videos from Yle (Finnish Broadcasting Company) servers";
+    homepage = https://aajanki.github.io/yle-dl/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 986004c5642..5af13ae3e7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3645,6 +3645,8 @@ let
   # To expose more packages for Yi, override the extraPackages arg.
   yi = callPackage ../applications/editors/yi/wrapper.nix { };
 
+  yle-dl = callPackage ../tools/misc/yle-dl {};
+
   zbackup = callPackage ../tools/backup/zbackup {};
 
   zbar = callPackage ../tools/graphics/zbar {

From cb0ddd9d6a4244961151578e01969d1692eff303 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 28 Dec 2015 11:00:18 +0100
Subject: [PATCH 106/249] qtile: 0.10.2 -> 0.10.3

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

diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index cd353c7c215..3f38be66927 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.2";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "qtile";
     repo = "qtile";
     rev = "v${version}";
-    sha256 = "0dhdwjr4pdlzli68fa8glrnsjzxp6agdab9cnmpsqlwiwh97x9a6";
+    sha256 = "02252sfcniijkpk5rfgb800wvdpl223xrx1bhrxpzgggpgfbnmn6";
   };
 
   patches = [

From 0fa8f6b36ba5f816e4ac31d68e370858007a57b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 28 Dec 2015 12:16:22 +0100
Subject: [PATCH 107/249] nodePackages_0_5: don't recurseIntoAttrs

Two reasons for this change:

- most of 5.0 packages don't build yet

- node packages are memory intensive and block Hydra evaluation
  (Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS)

PS: Removing node packages from evaluation goes from 7.5G down to
4.6G for whole nixos release job.

See #3594 and #11865
---
 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 467e4667a95..05a1525fd4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2099,7 +2099,7 @@ let
   else
     nodejs-4_x;
 
-  nodePackages_5_x = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_5_x; nodejs = nodejs-5_x; });
+  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; });
 

From 3af72cf6a3a330b1dbc1fe598dc7a0b03c426690 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 22 Dec 2015 13:30:52 +0100
Subject: [PATCH 108/249] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-3-gd4ae18a using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/236677809b56730af48b37057a05f1bb01cc076c
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/62b6b580fb6fa4d2ef029febe46dcc6c738ea926
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/d3e5ae70f97caffd4362b1511f3a2edfdc8a493d
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/ef03f60b53b318a4e78e3854942c1c224d9601c1
---
 .../haskell-modules/configuration-lts-0.0.nix |   21 +
 .../haskell-modules/configuration-lts-0.1.nix |   21 +
 .../haskell-modules/configuration-lts-0.2.nix |   21 +
 .../haskell-modules/configuration-lts-0.3.nix |   21 +
 .../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                |   24 +
 .../configuration-lts-2.18.nix                |   24 +
 .../configuration-lts-2.19.nix                |   24 +
 .../haskell-modules/configuration-lts-2.2.nix |   23 +
 .../configuration-lts-2.20.nix                |   24 +
 .../configuration-lts-2.21.nix                |   24 +
 .../configuration-lts-2.22.nix                |   25 +
 .../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 |   30 +
 .../haskell-modules/configuration-lts-3.1.nix |   30 +
 .../configuration-lts-3.10.nix                |   33 +
 .../configuration-lts-3.11.nix                |   34 +
 .../configuration-lts-3.12.nix                |   35 +
 .../configuration-lts-3.13.nix                |   35 +
 .../configuration-lts-3.14.nix                |   35 +
 .../configuration-lts-3.15.nix                |   35 +
 .../configuration-lts-3.16.nix                |   35 +
 .../configuration-lts-3.17.nix                |   35 +
 .../configuration-lts-3.18.nix                |   36 +
 .../configuration-lts-3.19.nix                |   38 +
 .../haskell-modules/configuration-lts-3.2.nix |   30 +
 .../configuration-lts-3.20.nix                | 8091 +++++++++++++++++
 .../haskell-modules/configuration-lts-3.3.nix |   30 +
 .../haskell-modules/configuration-lts-3.4.nix |   30 +
 .../haskell-modules/configuration-lts-3.5.nix |   30 +
 .../haskell-modules/configuration-lts-3.6.nix |   30 +
 .../haskell-modules/configuration-lts-3.7.nix |   30 +
 .../haskell-modules/configuration-lts-3.8.nix |   32 +
 .../haskell-modules/configuration-lts-3.9.nix |   32 +
 .../haskell-modules/hackage-packages.nix      | 1489 ++-
 67 files changed, 10941 insertions(+), 310 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-3.20.nix

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 3bc140253cf..accd8619305 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1161,6 +1161,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1590,6 +1591,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1774,6 +1776,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1814,6 +1817,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2054,6 +2058,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2998,6 +3003,7 @@ self: super: {
   "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";
@@ -3463,6 +3469,7 @@ self: super: {
   "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";
@@ -3531,6 +3538,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3681,6 +3692,7 @@ self: super: {
   "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";
@@ -5239,6 +5251,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5657,6 +5671,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5680,6 +5695,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7369,6 +7385,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7565,6 +7582,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = dontDistribute super."stackage";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -8011,6 +8029,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8456,6 +8475,7 @@ self: super: {
   "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";
@@ -8477,6 +8497,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
+  "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_0_0_3";
   "wai-conduit" = doDistribute super."wai-conduit_3_0_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 42253251403..0b7f7deb05b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1161,6 +1161,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1590,6 +1591,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1774,6 +1776,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1814,6 +1817,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2054,6 +2058,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2998,6 +3003,7 @@ self: super: {
   "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";
@@ -3463,6 +3469,7 @@ self: super: {
   "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";
@@ -3531,6 +3538,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3681,6 +3692,7 @@ self: super: {
   "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";
@@ -5239,6 +5251,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5657,6 +5671,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5680,6 +5695,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7369,6 +7385,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7565,6 +7582,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = dontDistribute super."stackage";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -8011,6 +8029,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8456,6 +8475,7 @@ self: super: {
   "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";
@@ -8477,6 +8497,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
+  "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_0_0_3";
   "wai-conduit" = doDistribute super."wai-conduit_3_0_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 96915c87e0b..71c04aad38d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1161,6 +1161,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1590,6 +1591,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1774,6 +1776,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1814,6 +1817,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2054,6 +2058,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2998,6 +3003,7 @@ self: super: {
   "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";
@@ -3463,6 +3469,7 @@ self: super: {
   "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";
@@ -3531,6 +3538,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3681,6 +3692,7 @@ self: super: {
   "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";
@@ -5239,6 +5251,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5657,6 +5671,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5680,6 +5695,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7369,6 +7385,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7565,6 +7582,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = dontDistribute super."stackage";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -8011,6 +8029,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8456,6 +8475,7 @@ self: super: {
   "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";
@@ -8477,6 +8497,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
+  "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_0_0_3";
   "wai-conduit" = doDistribute super."wai-conduit_3_0_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 9309f74d421..d9e9ce495cd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1161,6 +1161,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1590,6 +1591,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1774,6 +1776,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1814,6 +1817,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2054,6 +2058,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2998,6 +3003,7 @@ self: super: {
   "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";
@@ -3463,6 +3469,7 @@ self: super: {
   "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";
@@ -3531,6 +3538,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3681,6 +3692,7 @@ self: super: {
   "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";
@@ -5239,6 +5251,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5657,6 +5671,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5680,6 +5695,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7369,6 +7385,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7565,6 +7582,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = dontDistribute super."stackage";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -8011,6 +8029,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8456,6 +8475,7 @@ self: super: {
   "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";
@@ -8477,6 +8497,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
+  "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_0_0_3";
   "wai-conduit" = doDistribute super."wai-conduit_3_0_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index ce701dfe722..cdfbcb1943a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1161,6 +1161,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1590,6 +1591,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1774,6 +1776,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1814,6 +1817,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2054,6 +2058,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2997,6 +3002,7 @@ self: super: {
   "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";
@@ -3462,6 +3468,7 @@ self: super: {
   "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";
@@ -3530,6 +3537,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3680,6 +3691,7 @@ self: super: {
   "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";
@@ -5236,6 +5248,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5654,6 +5668,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5677,6 +5692,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7365,6 +7381,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7561,6 +7578,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = dontDistribute super."stackage";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7614,6 +7632,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -8006,6 +8025,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8451,6 +8471,7 @@ self: super: {
   "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";
@@ -8472,6 +8493,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
+  "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_0_0_4";
   "wai-conduit" = doDistribute super."wai-conduit_3_0_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 5ddb85c629c..f03d3e17a39 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1161,6 +1161,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1590,6 +1591,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1774,6 +1776,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1814,6 +1817,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2054,6 +2058,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2997,6 +3002,7 @@ self: super: {
   "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";
@@ -3462,6 +3468,7 @@ self: super: {
   "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";
@@ -3530,6 +3537,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3680,6 +3691,7 @@ self: super: {
   "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";
@@ -5236,6 +5248,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5654,6 +5668,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5677,6 +5692,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7365,6 +7381,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7561,6 +7578,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = dontDistribute super."stackage";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7614,6 +7632,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -8006,6 +8025,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8451,6 +8471,7 @@ self: super: {
   "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";
@@ -8472,6 +8493,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
+  "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_0_0_4";
   "wai-conduit" = doDistribute super."wai-conduit_3_0_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 17b887b8689..de83b28d2fa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1160,6 +1160,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1587,6 +1588,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1771,6 +1773,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1811,6 +1814,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2051,6 +2055,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2994,6 +2999,7 @@ self: super: {
   "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";
@@ -3459,6 +3465,7 @@ self: super: {
   "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";
@@ -3527,6 +3534,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3677,6 +3688,7 @@ self: super: {
   "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";
@@ -5232,6 +5244,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5650,6 +5664,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5673,6 +5688,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7359,6 +7375,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7555,6 +7572,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = dontDistribute super."stackage";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7608,6 +7626,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -8000,6 +8019,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8445,6 +8465,7 @@ self: super: {
   "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";
@@ -8466,6 +8487,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
+  "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_0_0_5";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index e9d3b12d37f..e01b0bc09a8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1160,6 +1160,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1587,6 +1588,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1771,6 +1773,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1811,6 +1814,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2051,6 +2055,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2994,6 +2999,7 @@ self: super: {
   "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";
@@ -3459,6 +3465,7 @@ self: super: {
   "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";
@@ -3527,6 +3534,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3677,6 +3688,7 @@ self: super: {
   "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";
@@ -5232,6 +5244,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5650,6 +5664,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5673,6 +5688,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7359,6 +7375,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7555,6 +7572,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = dontDistribute super."stackage";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7608,6 +7626,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -8000,6 +8019,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8445,6 +8465,7 @@ self: super: {
   "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";
@@ -8466,6 +8487,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
+  "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_0_0_5";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index ceddbc9f890..42db9c816da 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1156,6 +1156,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1583,6 +1584,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1766,6 +1768,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1805,6 +1808,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2043,6 +2047,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2984,6 +2989,7 @@ self: super: {
   "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";
@@ -3448,6 +3454,7 @@ self: super: {
   "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";
@@ -3516,6 +3523,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3666,6 +3677,7 @@ self: super: {
   "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";
@@ -5220,6 +5232,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5638,6 +5652,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5661,6 +5676,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7345,6 +7361,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7540,6 +7557,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7593,6 +7611,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7985,6 +8004,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8429,6 +8449,7 @@ self: super: {
   "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";
@@ -8450,6 +8471,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
+  "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_0_0_5";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 32288e9a7f7..fb68011ba87 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1156,6 +1156,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1583,6 +1584,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1766,6 +1768,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1804,6 +1807,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2041,6 +2045,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2980,6 +2985,7 @@ self: super: {
   "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";
@@ -3444,6 +3450,7 @@ self: super: {
   "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";
@@ -3512,6 +3519,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3662,6 +3673,7 @@ self: super: {
   "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";
@@ -5213,6 +5225,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5630,6 +5644,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5653,6 +5668,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7336,6 +7352,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7531,6 +7548,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7584,6 +7602,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7972,6 +7991,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8415,6 +8435,7 @@ self: super: {
   "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";
@@ -8436,6 +8457,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
+  "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_0_0_5";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 044678daee3..9c20fbc7982 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1155,6 +1155,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1582,6 +1583,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1764,6 +1766,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1802,6 +1805,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2037,6 +2041,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2975,6 +2980,7 @@ self: super: {
   "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";
@@ -3434,6 +3440,7 @@ self: super: {
   "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";
@@ -3502,6 +3509,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3652,6 +3663,7 @@ self: super: {
   "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";
@@ -5194,6 +5206,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5610,6 +5624,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5633,6 +5648,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7310,6 +7326,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7505,6 +7522,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7558,6 +7576,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7943,6 +7962,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8383,6 +8403,7 @@ self: super: {
   "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";
@@ -8404,6 +8425,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index dd03c8ce211..e1402193eb9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1155,6 +1155,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1582,6 +1583,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1764,6 +1766,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1802,6 +1805,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2037,6 +2041,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2975,6 +2980,7 @@ self: super: {
   "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";
@@ -3433,6 +3439,7 @@ self: super: {
   "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";
@@ -3501,6 +3508,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3651,6 +3662,7 @@ self: super: {
   "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";
@@ -5190,6 +5202,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5606,6 +5620,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5629,6 +5644,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7306,6 +7322,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7501,6 +7518,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7554,6 +7572,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7939,6 +7958,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8379,6 +8399,7 @@ self: super: {
   "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";
@@ -8400,6 +8421,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 04da2509ad2..4c5eaef6814 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1155,6 +1155,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1582,6 +1583,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1764,6 +1766,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1802,6 +1805,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2037,6 +2041,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2975,6 +2980,7 @@ self: super: {
   "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";
@@ -3433,6 +3439,7 @@ self: super: {
   "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";
@@ -3501,6 +3508,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3651,6 +3662,7 @@ self: super: {
   "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";
@@ -5189,6 +5201,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5605,6 +5619,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5628,6 +5643,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7305,6 +7321,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7499,6 +7516,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7552,6 +7570,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7936,6 +7955,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8376,6 +8396,7 @@ self: super: {
   "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";
@@ -8397,6 +8418,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index fe75d3a8e93..656be295da0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1155,6 +1155,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1582,6 +1583,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1764,6 +1766,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1802,6 +1805,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2037,6 +2041,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2975,6 +2980,7 @@ self: super: {
   "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";
@@ -3433,6 +3439,7 @@ self: super: {
   "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";
@@ -3501,6 +3508,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3651,6 +3662,7 @@ self: super: {
   "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";
@@ -5188,6 +5200,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5604,6 +5618,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5627,6 +5642,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7304,6 +7320,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7498,6 +7515,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7551,6 +7569,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7934,6 +7953,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8374,6 +8394,7 @@ self: super: {
   "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";
@@ -8395,6 +8416,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 88880efcca4..341459f7405 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1154,6 +1154,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1580,6 +1581,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1762,6 +1764,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1800,6 +1803,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2035,6 +2039,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2972,6 +2977,7 @@ self: super: {
   "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";
@@ -3430,6 +3436,7 @@ self: super: {
   "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";
@@ -3498,6 +3505,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3648,6 +3659,7 @@ self: super: {
   "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";
@@ -5183,6 +5195,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5598,6 +5612,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5621,6 +5636,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7296,6 +7312,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7490,6 +7507,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7543,6 +7561,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7926,6 +7945,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8366,6 +8386,7 @@ self: super: {
   "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";
@@ -8387,6 +8408,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 34f6cc66200..57889762d0c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1153,6 +1153,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1579,6 +1580,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1761,6 +1763,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1799,6 +1802,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2033,6 +2037,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2967,6 +2972,7 @@ self: super: {
   "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";
@@ -3425,6 +3431,7 @@ self: super: {
   "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";
@@ -3493,6 +3500,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3643,6 +3654,7 @@ self: super: {
   "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";
@@ -5178,6 +5190,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5593,6 +5607,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5616,6 +5631,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7287,6 +7303,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7481,6 +7498,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7533,6 +7551,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7915,6 +7934,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8355,6 +8375,7 @@ self: super: {
   "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";
@@ -8376,6 +8397,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 3f6a8c35c12..5f53f69d70c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1156,6 +1156,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1583,6 +1584,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1766,6 +1768,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1804,6 +1807,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2040,6 +2044,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2978,6 +2983,7 @@ self: super: {
   "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";
@@ -3441,6 +3447,7 @@ self: super: {
   "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";
@@ -3509,6 +3516,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3659,6 +3670,7 @@ self: super: {
   "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";
@@ -5210,6 +5222,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5627,6 +5641,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5650,6 +5665,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7330,6 +7346,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7525,6 +7542,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7578,6 +7596,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7966,6 +7985,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8409,6 +8429,7 @@ self: super: {
   "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";
@@ -8430,6 +8451,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 60ac68fa6af..6939da3619d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1155,6 +1155,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1582,6 +1583,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1765,6 +1767,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1803,6 +1806,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2039,6 +2043,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2977,6 +2982,7 @@ self: super: {
   "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";
@@ -3439,6 +3445,7 @@ self: super: {
   "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";
@@ -3507,6 +3514,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3657,6 +3668,7 @@ self: super: {
   "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";
@@ -5207,6 +5219,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5624,6 +5638,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5647,6 +5662,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7326,6 +7342,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7521,6 +7538,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7574,6 +7592,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7961,6 +7980,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8404,6 +8424,7 @@ self: super: {
   "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";
@@ -8425,6 +8446,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index d78bac500e3..a53cb354aba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1155,6 +1155,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1582,6 +1583,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1765,6 +1767,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1803,6 +1806,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2038,6 +2042,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2976,6 +2981,7 @@ self: super: {
   "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";
@@ -3438,6 +3444,7 @@ self: super: {
   "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";
@@ -3506,6 +3513,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3656,6 +3667,7 @@ self: super: {
   "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";
@@ -5205,6 +5217,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5622,6 +5636,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5645,6 +5660,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7324,6 +7340,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7519,6 +7536,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7572,6 +7590,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7959,6 +7978,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8400,6 +8420,7 @@ self: super: {
   "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";
@@ -8421,6 +8442,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 11e6d050e97..d4405a6ea7b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1155,6 +1155,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1582,6 +1583,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1765,6 +1767,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1803,6 +1806,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2038,6 +2042,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2976,6 +2981,7 @@ self: super: {
   "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";
@@ -3438,6 +3444,7 @@ self: super: {
   "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";
@@ -3506,6 +3513,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3656,6 +3667,7 @@ self: super: {
   "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";
@@ -5199,6 +5211,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5616,6 +5630,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5639,6 +5654,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7318,6 +7334,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7513,6 +7530,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7566,6 +7584,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7953,6 +7972,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8394,6 +8414,7 @@ self: super: {
   "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";
@@ -8415,6 +8436,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 140cb1f9f71..6a0e8545c28 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1155,6 +1155,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1582,6 +1583,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1765,6 +1767,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1803,6 +1806,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2038,6 +2042,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2976,6 +2981,7 @@ self: super: {
   "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";
@@ -3436,6 +3442,7 @@ self: super: {
   "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";
@@ -3504,6 +3511,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3654,6 +3665,7 @@ self: super: {
   "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";
@@ -5196,6 +5208,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5612,6 +5626,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5635,6 +5650,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7314,6 +7330,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7509,6 +7526,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7562,6 +7580,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7949,6 +7968,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8389,6 +8409,7 @@ self: super: {
   "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";
@@ -8410,6 +8431,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index cd3ac17033e..93ff9524400 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1155,6 +1155,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1582,6 +1583,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1765,6 +1767,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1803,6 +1806,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2038,6 +2042,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2976,6 +2981,7 @@ self: super: {
   "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";
@@ -3435,6 +3441,7 @@ self: super: {
   "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";
@@ -3503,6 +3510,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3653,6 +3664,7 @@ self: super: {
   "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";
@@ -5195,6 +5207,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5611,6 +5625,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5634,6 +5649,7 @@ self: super: {
   "monad-extras" = doDistribute super."monad-extras_0_5_9";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7313,6 +7329,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7508,6 +7525,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_3_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7561,6 +7579,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_2";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7948,6 +7967,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = dontDistribute super."time-locale-compat";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8388,6 +8408,7 @@ self: super: {
   "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";
@@ -8409,6 +8430,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 29e118c18a3..6e14e24c7ac 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -727,6 +727,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1144,6 +1145,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1568,6 +1570,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1748,6 +1751,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1786,6 +1790,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2020,6 +2025,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2948,6 +2954,7 @@ self: super: {
   "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";
@@ -3404,6 +3411,7 @@ self: super: {
   "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";
@@ -3471,6 +3479,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3618,6 +3630,7 @@ self: super: {
   "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";
@@ -5137,6 +5150,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5549,6 +5564,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5570,6 +5586,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7228,6 +7245,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7419,6 +7437,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_6_0_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7471,6 +7490,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7850,6 +7870,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8288,6 +8309,7 @@ self: super: {
   "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";
@@ -8309,6 +8331,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_0_6";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index c470c638e01..24a931f7d92 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -727,6 +727,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1144,6 +1145,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1568,6 +1570,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1748,6 +1751,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1786,6 +1790,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2019,6 +2024,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2947,6 +2953,7 @@ self: super: {
   "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";
@@ -3403,6 +3410,7 @@ self: super: {
   "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";
@@ -3470,6 +3478,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3617,6 +3629,7 @@ self: super: {
   "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";
@@ -5135,6 +5148,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5547,6 +5562,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5568,6 +5584,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7226,6 +7243,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7417,6 +7435,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_6_0_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7469,6 +7488,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7848,6 +7868,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8285,6 +8306,7 @@ self: super: {
   "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";
@@ -8306,6 +8328,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 78b5b034374..462a8aee2f1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -725,6 +725,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1139,6 +1140,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1560,6 +1562,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1739,6 +1742,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1777,6 +1781,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2007,6 +2012,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2930,6 +2936,7 @@ self: super: {
   "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";
@@ -3384,6 +3391,7 @@ self: super: {
   "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";
@@ -3450,6 +3458,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3597,6 +3609,7 @@ self: super: {
   "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";
@@ -5104,6 +5117,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5509,6 +5524,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5530,6 +5546,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7179,6 +7196,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7369,6 +7387,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7415,6 +7434,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7792,6 +7812,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8227,6 +8248,7 @@ self: super: {
   "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";
@@ -8248,6 +8270,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 3f14883bb14..4353c8d898c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -725,6 +725,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1139,6 +1140,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1559,6 +1561,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1738,6 +1741,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1776,6 +1780,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2006,6 +2011,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2929,6 +2935,7 @@ self: super: {
   "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";
@@ -3382,6 +3389,7 @@ self: super: {
   "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";
@@ -3448,6 +3456,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3595,6 +3607,7 @@ self: super: {
   "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";
@@ -5099,6 +5112,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5504,6 +5519,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5525,6 +5541,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
@@ -7171,6 +7188,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7361,6 +7379,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7407,6 +7426,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
@@ -7782,6 +7802,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8217,6 +8238,7 @@ self: super: {
   "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";
@@ -8238,6 +8260,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 9f79732a018..4f4ce4b86e1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -725,6 +725,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1139,6 +1140,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1559,6 +1561,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1738,6 +1741,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1776,6 +1780,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2006,6 +2011,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2929,6 +2935,7 @@ self: super: {
   "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";
@@ -3382,6 +3389,7 @@ self: super: {
   "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";
@@ -3448,6 +3456,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3595,6 +3607,7 @@ self: super: {
   "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";
@@ -5099,6 +5112,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5504,6 +5519,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5525,6 +5541,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
@@ -7170,6 +7187,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7360,6 +7378,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7406,6 +7425,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
@@ -7781,6 +7801,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8216,6 +8237,7 @@ self: super: {
   "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";
@@ -8237,6 +8259,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 813898be750..c9464238e84 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -725,6 +725,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1139,6 +1140,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1559,6 +1561,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1738,6 +1741,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1776,6 +1780,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2006,6 +2011,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2929,6 +2935,7 @@ self: super: {
   "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";
@@ -3382,6 +3389,7 @@ self: super: {
   "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";
@@ -3448,6 +3456,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3595,6 +3607,7 @@ self: super: {
   "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";
@@ -5097,6 +5110,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5502,6 +5517,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5523,6 +5539,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
@@ -7167,6 +7184,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7357,6 +7375,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7403,6 +7422,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
@@ -7778,6 +7798,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8213,6 +8234,7 @@ self: super: {
   "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";
@@ -8234,6 +8256,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 6ffc4a6b531..e2a9927cabf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -725,6 +725,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1139,6 +1140,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1558,6 +1560,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1737,6 +1740,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1775,6 +1779,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2005,6 +2010,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2928,6 +2934,7 @@ self: super: {
   "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";
@@ -3380,6 +3387,7 @@ self: super: {
   "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";
@@ -3446,6 +3454,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3593,6 +3605,7 @@ self: super: {
   "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";
@@ -5094,6 +5107,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5499,6 +5514,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5520,6 +5536,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
@@ -7162,6 +7179,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7352,6 +7370,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7398,6 +7417,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
@@ -7773,6 +7793,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8208,6 +8229,7 @@ self: super: {
   "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";
@@ -8229,6 +8251,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index c129a3ed578..53c0e3d69bd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -725,6 +725,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1139,6 +1140,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1558,6 +1560,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1737,6 +1740,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1775,6 +1779,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2005,6 +2010,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2927,6 +2933,7 @@ self: super: {
   "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";
@@ -3379,6 +3386,7 @@ self: super: {
   "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";
@@ -3445,6 +3453,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3592,6 +3604,7 @@ self: super: {
   "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";
@@ -5093,6 +5106,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5498,6 +5513,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5519,6 +5535,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
@@ -7158,6 +7175,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7347,6 +7365,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7393,6 +7412,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
@@ -7768,6 +7788,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8203,6 +8224,7 @@ self: super: {
   "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";
@@ -8224,6 +8246,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index dcd5a1cc4c5..14116331de7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -724,6 +724,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1138,6 +1139,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1557,6 +1559,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1736,6 +1739,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1774,6 +1778,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2003,6 +2008,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2923,6 +2929,7 @@ self: super: {
   "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";
@@ -3373,6 +3380,7 @@ self: super: {
   "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";
@@ -3439,6 +3447,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3586,6 +3598,7 @@ self: super: {
   "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";
@@ -5085,6 +5098,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5490,6 +5505,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5511,6 +5527,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
@@ -7150,6 +7167,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7339,6 +7357,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7385,6 +7404,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
@@ -7760,6 +7780,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8195,6 +8216,7 @@ self: super: {
   "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";
@@ -8216,6 +8238,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index cd7bd1d5b4e..e1a2bbbc968 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -724,6 +724,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1138,6 +1139,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1556,6 +1558,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1734,6 +1737,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1772,6 +1776,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2001,6 +2006,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2920,6 +2926,7 @@ self: super: {
   "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";
@@ -3368,6 +3375,7 @@ self: super: {
   "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";
@@ -3434,6 +3442,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3581,6 +3593,7 @@ self: super: {
   "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";
@@ -5080,6 +5093,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5485,6 +5500,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5506,6 +5522,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
@@ -6620,6 +6637,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -7143,6 +7161,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7332,6 +7351,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7378,6 +7398,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
@@ -7753,6 +7774,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8188,6 +8210,7 @@ self: super: {
   "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";
@@ -8209,6 +8232,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index ce2067384fe..28058c94292 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -724,6 +724,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1138,6 +1139,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1556,6 +1558,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1734,6 +1737,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1772,6 +1776,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2000,6 +2005,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2918,6 +2924,7 @@ self: super: {
   "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";
@@ -3366,6 +3373,7 @@ self: super: {
   "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";
@@ -3432,6 +3440,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3579,6 +3591,7 @@ self: super: {
   "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";
@@ -5077,6 +5090,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5482,6 +5497,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5503,6 +5519,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6615,6 +6632,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -7138,6 +7156,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7327,6 +7346,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7373,6 +7393,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
@@ -7747,6 +7768,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8182,6 +8204,7 @@ self: super: {
   "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";
@@ -8203,6 +8226,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 7496f0ff744..26cb22600e1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -724,6 +724,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1138,6 +1139,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1556,6 +1558,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1734,6 +1737,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1772,6 +1776,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2000,6 +2005,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2918,6 +2924,7 @@ self: super: {
   "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";
@@ -3365,6 +3372,7 @@ self: super: {
   "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";
@@ -3431,6 +3439,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3578,6 +3590,7 @@ self: super: {
   "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";
@@ -5076,6 +5089,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5480,6 +5495,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5501,6 +5517,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6612,6 +6629,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -7135,6 +7153,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7322,6 +7341,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7368,6 +7388,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
@@ -7742,6 +7763,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8177,6 +8199,7 @@ self: super: {
   "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";
@@ -8198,6 +8221,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index c8c572b01e5..86dc3b2988a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -727,6 +727,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1143,6 +1144,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1567,6 +1569,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1747,6 +1750,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1785,6 +1789,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2016,6 +2021,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2944,6 +2950,7 @@ self: super: {
   "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";
@@ -3400,6 +3407,7 @@ self: super: {
   "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";
@@ -3467,6 +3475,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3614,6 +3626,7 @@ self: super: {
   "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";
@@ -5132,6 +5145,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5544,6 +5559,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5565,6 +5581,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7223,6 +7240,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7414,6 +7432,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_6_0_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7466,6 +7485,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7845,6 +7865,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8282,6 +8303,7 @@ self: super: {
   "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";
@@ -8303,6 +8325,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 1e5174692ee..b931af0d41a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -724,6 +724,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1138,6 +1139,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1556,6 +1558,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1734,6 +1737,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1772,6 +1776,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2000,6 +2005,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2917,6 +2923,7 @@ self: super: {
   "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";
@@ -3364,6 +3371,7 @@ self: super: {
   "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";
@@ -3430,6 +3438,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3577,6 +3589,7 @@ self: super: {
   "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";
@@ -5074,6 +5087,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5478,6 +5493,7 @@ self: super: {
   "mockery" = doDistribute super."mockery_0_3_0";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5499,6 +5515,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6609,6 +6626,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -7131,6 +7149,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7318,6 +7337,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7364,6 +7384,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
@@ -7738,6 +7759,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8173,6 +8195,7 @@ self: super: {
   "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";
@@ -8194,6 +8217,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 3304e26b9e5..d9d7c49b0a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -724,6 +724,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1138,6 +1139,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1556,6 +1558,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1734,6 +1737,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1772,6 +1776,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2000,6 +2005,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2917,6 +2923,7 @@ self: super: {
   "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";
@@ -3364,6 +3371,7 @@ self: super: {
   "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";
@@ -3430,6 +3438,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3577,6 +3589,7 @@ self: super: {
   "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";
@@ -5073,6 +5086,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5477,6 +5492,7 @@ self: super: {
   "mockery" = doDistribute super."mockery_0_3_0";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5498,6 +5514,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6607,6 +6624,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -7129,6 +7147,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7316,6 +7335,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7362,6 +7382,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
@@ -7736,6 +7757,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8169,6 +8191,7 @@ self: super: {
   "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";
@@ -8190,6 +8213,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 4a2314c6157..032fc30dfae 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -724,6 +724,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -906,6 +907,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1137,6 +1139,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1555,6 +1558,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1733,6 +1737,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1771,6 +1776,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1999,6 +2005,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2916,6 +2923,7 @@ self: super: {
   "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";
@@ -3363,6 +3371,7 @@ self: super: {
   "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";
@@ -3429,6 +3438,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3576,6 +3589,7 @@ self: super: {
   "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";
@@ -5071,6 +5085,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5474,6 +5490,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5495,6 +5512,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6604,6 +6622,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -7126,6 +7145,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7313,6 +7333,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7359,6 +7380,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
@@ -7733,6 +7755,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8166,6 +8189,7 @@ self: super: {
   "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";
@@ -8187,6 +8211,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 484e836b508..a73b8c61ac7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -727,6 +727,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1143,6 +1144,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1567,6 +1569,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1747,6 +1750,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1785,6 +1789,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2016,6 +2021,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2944,6 +2950,7 @@ self: super: {
   "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";
@@ -3399,6 +3406,7 @@ self: super: {
   "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";
@@ -3466,6 +3474,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3613,6 +3625,7 @@ self: super: {
   "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";
@@ -5130,6 +5143,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5542,6 +5557,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5563,6 +5579,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7220,6 +7237,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7411,6 +7429,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_6_0_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7463,6 +7482,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7842,6 +7862,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8279,6 +8300,7 @@ self: super: {
   "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";
@@ -8300,6 +8322,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index b5cef3ba643..027b53e251f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -727,6 +727,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1143,6 +1144,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1567,6 +1569,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1746,6 +1749,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1784,6 +1788,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2015,6 +2020,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2943,6 +2949,7 @@ self: super: {
   "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";
@@ -3398,6 +3405,7 @@ self: super: {
   "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";
@@ -3465,6 +3473,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3612,6 +3624,7 @@ self: super: {
   "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";
@@ -5129,6 +5142,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5540,6 +5555,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5561,6 +5577,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7215,6 +7232,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7406,6 +7424,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_6_0_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7458,6 +7477,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7837,6 +7857,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8274,6 +8295,7 @@ self: super: {
   "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";
@@ -8295,6 +8317,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index d3360cbfc4f..d23b46cfd4b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -727,6 +727,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1143,6 +1144,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1567,6 +1569,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1746,6 +1749,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1784,6 +1788,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2015,6 +2020,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2942,6 +2948,7 @@ self: super: {
   "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";
@@ -3397,6 +3404,7 @@ self: super: {
   "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";
@@ -3464,6 +3472,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3611,6 +3623,7 @@ self: super: {
   "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";
@@ -5128,6 +5141,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5538,6 +5553,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5559,6 +5575,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7213,6 +7230,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7404,6 +7422,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_6_0_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7455,6 +7474,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7834,6 +7854,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8271,6 +8292,7 @@ self: super: {
   "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";
@@ -8292,6 +8314,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 335af123c93..079c34dca60 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -727,6 +727,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1141,6 +1142,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1564,6 +1566,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1743,6 +1746,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1781,6 +1785,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2012,6 +2017,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2939,6 +2945,7 @@ self: super: {
   "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";
@@ -3394,6 +3401,7 @@ self: super: {
   "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";
@@ -3461,6 +3469,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3608,6 +3620,7 @@ self: super: {
   "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";
@@ -5123,6 +5136,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5533,6 +5548,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5554,6 +5570,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7207,6 +7224,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7398,6 +7416,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_6_0_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7449,6 +7468,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7828,6 +7848,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8263,6 +8284,7 @@ self: super: {
   "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";
@@ -8284,6 +8306,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index c8cb9b91e07..992831b11e5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -726,6 +726,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1140,6 +1141,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1563,6 +1565,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1742,6 +1745,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1780,6 +1784,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2011,6 +2016,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2938,6 +2944,7 @@ self: super: {
   "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";
@@ -3393,6 +3400,7 @@ self: super: {
   "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";
@@ -3460,6 +3468,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3607,6 +3619,7 @@ self: super: {
   "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";
@@ -5122,6 +5135,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5532,6 +5547,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5553,6 +5569,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7206,6 +7223,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7397,6 +7415,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_6_0_1";
   "stackage-build-plan" = dontDistribute super."stackage-build-plan";
@@ -7448,6 +7467,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7827,6 +7847,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8262,6 +8283,7 @@ self: super: {
   "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";
@@ -8283,6 +8305,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 0683bd2553a..0ba988c6a2d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -725,6 +725,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1139,6 +1140,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1562,6 +1564,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1741,6 +1744,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1779,6 +1783,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2010,6 +2015,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2937,6 +2943,7 @@ self: super: {
   "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";
@@ -3391,6 +3398,7 @@ self: super: {
   "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";
@@ -3458,6 +3466,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3605,6 +3617,7 @@ self: super: {
   "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";
@@ -5118,6 +5131,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5528,6 +5543,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5549,6 +5565,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7201,6 +7218,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7391,6 +7409,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7440,6 +7459,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7819,6 +7839,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8254,6 +8275,7 @@ self: super: {
   "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";
@@ -8275,6 +8297,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 11080ff4358..122ffd8e54b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -725,6 +725,7 @@ self: super: {
   "OTP" = dontDistribute super."OTP";
   "Object" = dontDistribute super."Object";
   "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = doDistribute super."ObjectName_1_1_0_0";
   "Obsidian" = dontDistribute super."Obsidian";
   "OddWord" = dontDistribute super."OddWord";
   "Omega" = dontDistribute super."Omega";
@@ -1139,6 +1140,7 @@ self: super: {
   "aeson-better-errors" = dontDistribute super."aeson-better-errors";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1560,6 +1562,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_4_2_1";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1739,6 +1742,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bower-json" = dontDistribute super."bower-json";
+  "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1777,6 +1781,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -2007,6 +2012,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = dontDistribute super."clash-ghc";
   "clash-lib" = dontDistribute super."clash-lib";
@@ -2932,6 +2938,7 @@ self: super: {
   "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";
@@ -3386,6 +3393,7 @@ self: super: {
   "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";
@@ -3452,6 +3460,10 @@ self: super: {
   "gnuplot" = dontDistribute super."gnuplot";
   "gnutls" = dontDistribute super."gnutls";
   "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";
@@ -3599,6 +3611,7 @@ self: super: {
   "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";
@@ -5110,6 +5123,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5518,6 +5533,7 @@ self: super: {
   "mockery" = dontDistribute super."mockery";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5539,6 +5555,7 @@ self: super: {
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
@@ -7190,6 +7207,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7380,6 +7398,7 @@ self: super: {
   "stack" = dontDistribute super."stack";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage" = doDistribute super."stackage_0_7_2_0";
   "stackage-cabal" = dontDistribute super."stackage-cabal";
@@ -7427,6 +7446,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
@@ -7804,6 +7824,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_0_1";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -8239,6 +8260,7 @@ self: super: {
   "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";
@@ -8260,6 +8282,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
+  "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_0_1_1";
   "wai-cors" = dontDistribute super."wai-cors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index b60af8284b0..0ddbfe9d767 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -438,6 +438,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -886,6 +887,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1112,6 +1114,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1507,6 +1510,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1676,6 +1680,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1711,6 +1716,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1753,6 +1759,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_6_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";
@@ -1931,6 +1938,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_11";
   "clash-lib" = doDistribute super."clash-lib_0_5_10";
@@ -2820,6 +2828,7 @@ self: super: {
   "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";
@@ -3255,6 +3264,7 @@ self: super: {
   "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";
@@ -3318,6 +3328,10 @@ self: super: {
   "gnuidn" = doDistribute super."gnuidn_0_2_1";
   "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";
@@ -3464,6 +3478,7 @@ self: super: {
   "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";
@@ -4908,6 +4923,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5296,6 +5313,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5316,6 +5334,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6392,6 +6411,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6635,6 +6655,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6901,6 +6922,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7088,6 +7110,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_3_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5";
@@ -7128,6 +7151,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7403,6 +7427,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_2_2";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7494,6 +7519,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7720,6 +7746,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7907,6 +7934,7 @@ self: super: {
   "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";
@@ -7928,6 +7956,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -8084,6 +8113,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index d238767cf9a..7ee9850aed0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -438,6 +438,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -886,6 +887,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1112,6 +1114,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1506,6 +1509,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1675,6 +1679,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1710,6 +1715,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1752,6 +1758,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_6_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";
@@ -1930,6 +1937,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_11";
   "clash-lib" = doDistribute super."clash-lib_0_5_10";
@@ -2819,6 +2827,7 @@ self: super: {
   "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";
@@ -3251,6 +3260,7 @@ self: super: {
   "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";
@@ -3314,6 +3324,10 @@ self: super: {
   "gnuidn" = doDistribute super."gnuidn_0_2_1";
   "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";
@@ -3460,6 +3474,7 @@ self: super: {
   "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";
@@ -4903,6 +4918,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5290,6 +5307,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5310,6 +5328,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6384,6 +6403,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6626,6 +6646,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6892,6 +6913,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7079,6 +7101,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_3_1";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5";
@@ -7119,6 +7142,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7394,6 +7418,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_2_2";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7485,6 +7510,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7711,6 +7737,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7897,6 +7924,7 @@ self: super: {
   "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";
@@ -7918,6 +7946,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -8074,6 +8103,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 75e701cd9a0..fef41afa423 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -434,6 +434,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -879,6 +880,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1104,6 +1106,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1491,6 +1494,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1508,6 +1512,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_2_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1656,6 +1661,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1691,6 +1697,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1733,6 +1740,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_6_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";
@@ -1906,6 +1914,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2190,6 +2199,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_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
@@ -2774,6 +2784,7 @@ self: super: {
   "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";
@@ -3196,6 +3207,7 @@ self: super: {
   "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";
@@ -3257,6 +3269,10 @@ self: super: {
   "gnuidn" = doDistribute super."gnuidn_0_2_1";
   "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";
@@ -3403,6 +3419,7 @@ self: super: {
   "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";
@@ -4745,6 +4762,7 @@ self: super: {
   "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" = doDistribute super."language-c-quote_0_11_3";
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
@@ -4826,6 +4844,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5209,6 +5229,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5229,6 +5250,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_14";
@@ -6281,6 +6303,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6521,6 +6544,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6777,6 +6801,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -6959,6 +6984,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_6_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -6998,6 +7024,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7267,6 +7294,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_4";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7358,6 +7386,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7582,6 +7611,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7765,6 +7795,7 @@ self: super: {
   "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";
@@ -7785,6 +7816,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -7935,6 +7967,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 4440a97361f..bf8a60ac2a8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -434,6 +434,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -879,6 +880,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1104,6 +1106,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1491,6 +1494,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1508,6 +1512,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_2_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1655,6 +1660,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1690,6 +1696,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1731,6 +1738,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_6_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";
@@ -1904,6 +1912,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2188,6 +2197,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_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
@@ -2771,6 +2781,7 @@ self: super: {
   "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";
@@ -3192,6 +3203,7 @@ self: super: {
   "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";
@@ -3253,6 +3265,10 @@ self: super: {
   "gnuidn" = doDistribute super."gnuidn_0_2_1";
   "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";
@@ -3399,6 +3415,7 @@ self: super: {
   "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";
@@ -4741,6 +4758,7 @@ self: super: {
   "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" = doDistribute super."language-c-quote_0_11_3";
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
@@ -4822,6 +4840,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5205,6 +5225,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5225,6 +5246,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_14";
@@ -5801,6 +5823,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_4";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -6275,6 +6298,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6514,6 +6538,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6769,6 +6794,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -6951,6 +6977,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_6_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -6990,6 +7017,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7258,6 +7286,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_4";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7349,6 +7378,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7573,6 +7603,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7756,6 +7787,7 @@ self: super: {
   "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";
@@ -7776,6 +7808,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -7926,6 +7959,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 563ad632c51..1cb9c893f80 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -433,6 +433,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -878,6 +879,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1103,6 +1105,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1490,6 +1493,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1507,6 +1511,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_2_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1654,6 +1659,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1689,6 +1695,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1730,6 +1737,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_6_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";
@@ -1902,6 +1910,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2183,6 +2192,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_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
@@ -2766,6 +2776,7 @@ self: super: {
   "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";
@@ -3187,6 +3198,7 @@ self: super: {
   "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";
@@ -3247,6 +3259,10 @@ self: super: {
   "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";
@@ -3393,6 +3409,7 @@ self: super: {
   "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";
@@ -4735,6 +4752,7 @@ self: super: {
   "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" = doDistribute super."language-c-quote_0_11_3";
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
@@ -4816,6 +4834,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5199,6 +5219,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5219,6 +5240,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_15";
@@ -5794,6 +5816,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_4";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -6268,6 +6291,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6507,6 +6531,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6762,6 +6787,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -6944,6 +6970,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_6_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -6983,6 +7010,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7158,6 +7186,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -7249,6 +7278,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_4";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7339,6 +7369,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7563,6 +7594,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7746,6 +7778,7 @@ self: super: {
   "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";
@@ -7766,6 +7799,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -7916,6 +7950,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index bfd7fcfa430..271da896c6e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -433,6 +433,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -878,6 +879,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1103,6 +1105,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1490,6 +1493,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1507,6 +1511,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_2_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1654,6 +1659,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1689,6 +1695,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1730,6 +1737,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_6_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";
@@ -1902,6 +1910,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2183,6 +2192,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_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
@@ -2766,6 +2776,7 @@ self: super: {
   "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";
@@ -3187,6 +3198,7 @@ self: super: {
   "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";
@@ -3247,6 +3259,10 @@ self: super: {
   "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";
@@ -3393,6 +3409,7 @@ self: super: {
   "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";
@@ -4734,6 +4751,7 @@ self: super: {
   "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" = doDistribute super."language-c-quote_0_11_3";
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
@@ -4814,6 +4832,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5197,6 +5217,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5217,6 +5238,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_15";
@@ -5790,6 +5812,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_4";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -6264,6 +6287,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6503,6 +6527,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6758,6 +6783,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -6940,6 +6966,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_6_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -6979,6 +7006,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7153,6 +7181,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -7244,6 +7273,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_4";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7334,6 +7364,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7558,6 +7589,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7741,6 +7773,7 @@ self: super: {
   "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";
@@ -7761,6 +7794,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_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_1";
   "wai-devel" = dontDistribute super."wai-devel";
@@ -7910,6 +7944,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 3c09a095fa5..99ac875508e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -433,6 +433,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -878,6 +879,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1101,6 +1103,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_2_2_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1488,6 +1491,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1505,6 +1509,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_2_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1652,6 +1657,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1686,6 +1692,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1727,6 +1734,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_6_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";
@@ -1899,6 +1907,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2179,6 +2188,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_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
@@ -2758,6 +2768,7 @@ self: super: {
   "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";
@@ -3179,6 +3190,7 @@ self: super: {
   "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";
@@ -3239,6 +3251,10 @@ self: super: {
   "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";
@@ -3385,6 +3401,7 @@ self: super: {
   "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";
@@ -4725,6 +4742,7 @@ self: super: {
   "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" = doDistribute super."language-c-quote_0_11_3";
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
@@ -4805,6 +4823,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5187,6 +5207,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5207,6 +5228,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_15";
@@ -5779,6 +5801,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_4";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -6252,6 +6275,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6491,6 +6515,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6746,6 +6771,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -6928,6 +6954,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_6_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -6967,6 +6994,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7141,6 +7169,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -7231,6 +7260,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_4";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7321,6 +7351,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7545,6 +7576,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7728,6 +7760,7 @@ self: super: {
   "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";
@@ -7748,6 +7781,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_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_2";
   "wai-devel" = dontDistribute super."wai-devel";
@@ -7895,6 +7929,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 95baf86efab..2096bbe0e0f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -433,6 +433,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -877,6 +878,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1100,6 +1102,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_2_2_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1487,6 +1490,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1504,6 +1508,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_2_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1651,6 +1656,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1685,6 +1691,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1726,6 +1733,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_6_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";
@@ -1898,6 +1906,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2178,6 +2187,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_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
@@ -2757,6 +2767,7 @@ self: super: {
   "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";
@@ -3177,6 +3188,7 @@ self: super: {
   "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";
@@ -3237,6 +3249,10 @@ self: super: {
   "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";
@@ -3383,6 +3399,7 @@ self: super: {
   "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";
@@ -4720,6 +4737,7 @@ self: super: {
   "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" = doDistribute super."language-c-quote_0_11_3";
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
@@ -4800,6 +4818,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5182,6 +5202,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5202,6 +5223,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_15";
@@ -5773,6 +5795,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_4";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -6245,6 +6268,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6484,6 +6508,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6738,6 +6763,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -6920,6 +6946,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_8_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -6959,6 +6986,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7133,6 +7161,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -7223,6 +7252,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_4";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7312,6 +7342,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7536,6 +7567,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7719,6 +7751,7 @@ self: super: {
   "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";
@@ -7739,6 +7772,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_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";
   "wai-devel" = dontDistribute super."wai-devel";
@@ -7885,6 +7919,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index ec3c7dae2a8..985b46e2af4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -433,6 +433,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -876,6 +877,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1099,6 +1101,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_2_2_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1485,6 +1488,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1502,6 +1506,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_2_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1649,6 +1654,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1683,6 +1689,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1724,6 +1731,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_6_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";
@@ -1896,6 +1904,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2176,6 +2185,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_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
@@ -2754,6 +2764,7 @@ self: super: {
   "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";
@@ -3174,6 +3185,7 @@ self: super: {
   "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";
@@ -3234,6 +3246,10 @@ self: super: {
   "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";
@@ -3380,6 +3396,7 @@ self: super: {
   "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";
@@ -4716,6 +4733,7 @@ self: super: {
   "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" = doDistribute super."language-c-quote_0_11_3";
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
@@ -4795,6 +4813,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5175,6 +5195,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5195,6 +5216,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_15";
@@ -5765,6 +5787,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_4";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -6235,6 +6258,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6473,6 +6497,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6726,6 +6751,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -6908,6 +6934,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_8_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -6947,6 +6974,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7120,6 +7148,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -7208,6 +7237,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_4";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7296,6 +7326,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7520,6 +7551,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7703,6 +7735,7 @@ self: super: {
   "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";
@@ -7723,6 +7756,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_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";
   "wai-devel" = dontDistribute super."wai-devel";
@@ -7869,6 +7903,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 9c402b10e5b..0793e3e1cae 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -433,6 +433,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -874,6 +875,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1097,6 +1099,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_2_2_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1481,6 +1484,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1498,6 +1502,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_2_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1645,6 +1650,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1679,6 +1685,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1719,6 +1726,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_6_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";
@@ -1890,6 +1898,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2168,6 +2177,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_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
@@ -2745,6 +2755,7 @@ self: super: {
   "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";
@@ -3165,6 +3176,7 @@ self: super: {
   "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";
@@ -3225,6 +3237,10 @@ self: super: {
   "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";
@@ -3371,6 +3387,7 @@ self: super: {
   "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";
@@ -4704,6 +4721,7 @@ self: super: {
   "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" = doDistribute super."language-c-quote_0_11_3";
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
@@ -4783,6 +4801,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5162,6 +5182,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5182,6 +5203,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_15";
@@ -5750,6 +5772,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_4";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -6219,6 +6242,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6456,6 +6480,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6709,6 +6734,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -6891,6 +6917,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_10_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -6930,6 +6957,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7103,6 +7131,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -7191,6 +7220,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_4";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7279,6 +7309,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7503,6 +7534,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7685,6 +7717,7 @@ self: super: {
   "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";
@@ -7705,6 +7738,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_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";
   "wai-devel" = dontDistribute super."wai-devel";
@@ -7850,6 +7884,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index dca96a944ae..de54f3f85ee 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -433,6 +433,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -874,6 +875,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1097,7 +1099,9 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_3_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
@@ -1481,6 +1485,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1498,6 +1503,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_2_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1645,6 +1651,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1679,6 +1686,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1719,6 +1727,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_6_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";
@@ -1889,6 +1898,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2167,6 +2177,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_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
@@ -2744,6 +2755,7 @@ self: super: {
   "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";
@@ -3163,6 +3175,7 @@ self: super: {
   "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";
@@ -3222,6 +3235,10 @@ self: super: {
   "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";
@@ -3368,6 +3385,7 @@ self: super: {
   "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";
@@ -4694,6 +4712,7 @@ self: super: {
   "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" = doDistribute super."language-c-quote_0_11_3";
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
@@ -4773,6 +4792,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5152,6 +5173,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5172,6 +5194,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5738,6 +5761,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_4";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -6205,6 +6229,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6442,6 +6467,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6694,6 +6720,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -6876,6 +6903,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_10_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -6915,6 +6943,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7088,6 +7117,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -7175,6 +7205,7 @@ self: super: {
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7263,6 +7294,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7487,6 +7519,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7668,6 +7701,7 @@ self: super: {
   "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";
@@ -7687,6 +7721,7 @@ self: super: {
   "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-app-static" = doDistribute super."wai-app-static_3_1_3";
   "wai-devel" = dontDistribute super."wai-devel";
@@ -7831,6 +7866,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index f49e3fc7214..9a3e399043a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -432,6 +432,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -873,6 +874,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1096,7 +1098,9 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_3_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
@@ -1476,6 +1480,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1493,6 +1498,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_2_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1639,6 +1645,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1672,6 +1679,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1712,6 +1720,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_6_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";
@@ -1882,6 +1891,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2159,6 +2169,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_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
@@ -2736,6 +2747,7 @@ self: super: {
   "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";
@@ -3155,6 +3167,7 @@ self: super: {
   "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";
@@ -3214,6 +3227,10 @@ self: super: {
   "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";
@@ -3360,6 +3377,7 @@ self: super: {
   "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";
@@ -4232,6 +4250,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_1";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
   "http-client-lens" = dontDistribute super."http-client-lens";
@@ -4680,6 +4699,7 @@ self: super: {
   "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" = doDistribute super."language-c-quote_0_11_3";
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
@@ -4759,6 +4779,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5137,6 +5159,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5157,6 +5180,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5721,6 +5745,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_4";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -6186,6 +6211,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6422,6 +6448,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6674,6 +6701,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -6852,8 +6880,10 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_0_1_10_1";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -6893,6 +6923,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7066,6 +7097,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -7153,6 +7185,7 @@ self: super: {
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7241,6 +7274,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7464,6 +7498,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7645,6 +7680,7 @@ self: super: {
   "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";
@@ -7664,6 +7700,7 @@ self: super: {
   "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";
@@ -7807,6 +7844,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 29e012e9069..4461c0812ff 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -437,6 +437,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -884,6 +885,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1110,6 +1112,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1503,6 +1506,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1672,6 +1676,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1707,6 +1712,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1749,6 +1755,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_6_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";
@@ -1927,6 +1934,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_11";
   "clash-lib" = doDistribute super."clash-lib_0_5_10";
@@ -2815,6 +2823,7 @@ self: super: {
   "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";
@@ -3246,6 +3255,7 @@ self: super: {
   "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";
@@ -3309,6 +3319,10 @@ self: super: {
   "gnuidn" = doDistribute super."gnuidn_0_2_1";
   "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";
@@ -3455,6 +3469,7 @@ self: super: {
   "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";
@@ -4896,6 +4911,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5283,6 +5300,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5303,6 +5321,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6375,6 +6394,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6616,6 +6636,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6880,6 +6901,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7066,6 +7088,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_3_1";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5";
@@ -7106,6 +7129,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7380,6 +7404,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_3";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7471,6 +7496,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7697,6 +7723,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7883,6 +7910,7 @@ self: super: {
   "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";
@@ -7904,6 +7932,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -8059,6 +8088,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
new file mode 100644
index 00000000000..407b9840cdd
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -0,0 +1,8091 @@
+{ 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-3.20 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-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";
+  "ClustalParser" = dontDistribute super."ClustalParser";
+  "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";
+  "DAV" = doDistribute super."DAV_1_0_7";
+  "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";
+  "Earley" = doDistribute super."Earley_0_9_0";
+  "Ebnf2ps" = dontDistribute super."Ebnf2ps";
+  "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";
+  "EntrezHTTP" = dontDistribute super."EntrezHTTP";
+  "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" = dontDistribute super."GLFW-b";
+  "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";
+  "GLURaw" = dontDistribute super."GLURaw";
+  "GLUT" = dontDistribute super."GLUT";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe" = dontDistribute super."GPipe";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = dontDistribute super."GPipe-GLFW";
+  "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";
+  "Genbank" = dontDistribute super."Genbank";
+  "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" = dontDistribute super."HDBC";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql" = dontDistribute super."HDBC-postgresql";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDBC-sqlite3" = dontDistribute super."HDBC-sqlite3";
+  "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";
+  "HPDF" = dontDistribute super."HPDF";
+  "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" = doDistribute super."HUnit_1_2_5_2";
+  "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";
+  "HaRe" = dontDistribute super."HaRe";
+  "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";
+  "HaskellNet" = doDistribute super."HaskellNet_0_4_5";
+  "HaskellNet-SSL" = dontDistribute super."HaskellNet-SSL";
+  "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";
+  "HsSyck" = dontDistribute super."HsSyck";
+  "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";
+  "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" = dontDistribute super."IntervalMap";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa";
+  "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct";
+  "JuicyPixels-util" = dontDistribute super."JuicyPixels-util";
+  "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";
+  "MFlow" = dontDistribute super."MFlow";
+  "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" = dontDistribute super."MusicBrainz";
+  "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";
+  "ObjectName" = dontDistribute super."ObjectName";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGL" = dontDistribute super."OpenGL";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw" = dontDistribute super."OpenGLRaw";
+  "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";
+  "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";
+  "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" = dontDistribute super."RNAlien";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "RSA" = doDistribute super."RSA_2_1_0_3";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "SegmentTree" = dontDistribute super."SegmentTree";
+  "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" = doDistribute super."Spock_0_8_1_0";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
+  "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";
+  "Strafunski-StrategyLib" = dontDistribute super."Strafunski-StrategyLib";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "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";
+  "Taxonomy" = dontDistribute super."Taxonomy";
+  "TaxonomyTools" = dontDistribute super."TaxonomyTools";
+  "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";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "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-extras" = dontDistribute super."Win32-extras";
+  "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";
+  "Xauth" = dontDistribute super."Xauth";
+  "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" = doDistribute super."acid-state_0_12_4";
+  "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";
+  "ad" = doDistribute super."ad_4_2_4";
+  "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";
+  "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_8_0_2";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_3_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" = doDistribute super."aeson-schema_0_3_0_7";
+  "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";
+  "airship" = dontDistribute super."airship";
+  "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" = doDistribute super."alex_3_1_4";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "amazonka" = doDistribute super."amazonka_0_3_6";
+  "amazonka-apigateway" = dontDistribute super."amazonka-apigateway";
+  "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_0_3_6";
+  "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_0_3_6";
+  "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_0_3_6";
+  "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_0_3_6";
+  "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_0_3_6";
+  "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_0_3_6";
+  "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_0_3_6";
+  "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_0_3_6";
+  "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_0_3_6";
+  "amazonka-codecommit" = dontDistribute super."amazonka-codecommit";
+  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6";
+  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
+  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6";
+  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6";
+  "amazonka-config" = doDistribute super."amazonka-config_0_3_6";
+  "amazonka-core" = doDistribute super."amazonka-core_0_3_6";
+  "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_0_3_6";
+  "amazonka-devicefarm" = dontDistribute super."amazonka-devicefarm";
+  "amazonka-directconnect" = doDistribute super."amazonka-directconnect_0_3_6";
+  "amazonka-ds" = dontDistribute super."amazonka-ds";
+  "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_0_3_6";
+  "amazonka-dynamodb-streams" = dontDistribute super."amazonka-dynamodb-streams";
+  "amazonka-ec2" = doDistribute super."amazonka-ec2_0_3_6_1";
+  "amazonka-ecs" = doDistribute super."amazonka-ecs_0_3_6";
+  "amazonka-efs" = dontDistribute super."amazonka-efs";
+  "amazonka-elasticache" = doDistribute super."amazonka-elasticache_0_3_6";
+  "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_0_3_6";
+  "amazonka-elasticsearch" = dontDistribute super."amazonka-elasticsearch";
+  "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_0_3_6";
+  "amazonka-elb" = doDistribute super."amazonka-elb_0_3_6";
+  "amazonka-emr" = doDistribute super."amazonka-emr_0_3_6";
+  "amazonka-glacier" = doDistribute super."amazonka-glacier_0_3_6";
+  "amazonka-iam" = doDistribute super."amazonka-iam_0_3_6";
+  "amazonka-importexport" = doDistribute super."amazonka-importexport_0_3_6";
+  "amazonka-inspector" = dontDistribute super."amazonka-inspector";
+  "amazonka-iot" = dontDistribute super."amazonka-iot";
+  "amazonka-iot-dataplane" = dontDistribute super."amazonka-iot-dataplane";
+  "amazonka-kinesis" = doDistribute super."amazonka-kinesis_0_3_6";
+  "amazonka-kinesis-firehose" = dontDistribute super."amazonka-kinesis-firehose";
+  "amazonka-kms" = doDistribute super."amazonka-kms_0_3_6";
+  "amazonka-lambda" = doDistribute super."amazonka-lambda_0_3_6";
+  "amazonka-marketplace-analytics" = dontDistribute super."amazonka-marketplace-analytics";
+  "amazonka-ml" = doDistribute super."amazonka-ml_0_3_6";
+  "amazonka-opsworks" = doDistribute super."amazonka-opsworks_0_3_6";
+  "amazonka-rds" = doDistribute super."amazonka-rds_0_3_6";
+  "amazonka-redshift" = doDistribute super."amazonka-redshift_0_3_6";
+  "amazonka-route53" = doDistribute super."amazonka-route53_0_3_6_1";
+  "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_0_3_6";
+  "amazonka-s3" = doDistribute super."amazonka-s3_0_3_6";
+  "amazonka-sdb" = doDistribute super."amazonka-sdb_0_3_6";
+  "amazonka-ses" = doDistribute super."amazonka-ses_0_3_6";
+  "amazonka-sns" = doDistribute super."amazonka-sns_0_3_6";
+  "amazonka-sqs" = doDistribute super."amazonka-sqs_0_3_6";
+  "amazonka-ssm" = doDistribute super."amazonka-ssm_0_3_6";
+  "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_0_3_6";
+  "amazonka-sts" = doDistribute super."amazonka-sts_0_3_6";
+  "amazonka-support" = doDistribute super."amazonka-support_0_3_6";
+  "amazonka-swf" = doDistribute super."amazonka-swf_0_3_6";
+  "amazonka-test" = dontDistribute super."amazonka-test";
+  "amazonka-waf" = dontDistribute super."amazonka-waf";
+  "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
+  "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";
+  "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
+  "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";
+  "app-settings" = dontDistribute super."app-settings";
+  "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";
+  "apply-refact" = dontDistribute super."apply-refact";
+  "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";
+  "argon" = dontDistribute super."argon";
+  "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";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-progress" = dontDistribute super."ascii-progress";
+  "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-dejafu" = dontDistribute super."async-dejafu";
+  "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";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
+  "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";
+  "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" = doDistribute super."aws_0_12_1";
+  "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" = dontDistribute super."barrier";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base-noprelude" = dontDistribute super."base-noprelude";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bcrypt" = doDistribute super."bcrypt_0_0_6";
+  "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";
+  "benchpress" = dontDistribute super."benchpress";
+  "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";
+  "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" = dontDistribute super."bimap";
+  "bimap-server" = dontDistribute super."bimap-server";
+  "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-parser" = dontDistribute super."binary-parser";
+  "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";
+  "binary-typed" = dontDistribute super."binary-typed";
+  "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-GLFW" = dontDistribute super."bindings-GLFW";
+  "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-posix" = dontDistribute super."bindings-posix";
+  "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";
+  "bio" = dontDistribute super."bio";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biophd" = dontDistribute super."biophd";
+  "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";
+  "blake2" = dontDistribute super."blake2";
+  "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";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
+  "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" = doDistribute super."bloodhound_0_7_0_1";
+  "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";
+  "boomerang" = dontDistribute super."boomerang";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "both" = dontDistribute super."both";
+  "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";
+  "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" = dontDistribute super."brick";
+  "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-lens" = dontDistribute super."bson-lens";
+  "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";
+  "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";
+  "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "byteset" = dontDistribute super."byteset";
+  "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";
+  "c2hs" = doDistribute super."c2hs_0_25_2";
+  "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_30_2";
+  "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-helper" = dontDistribute super."cabal-helper";
+  "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-sort" = dontDistribute super."cabal-sort";
+  "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" = dontDistribute super."cacophony";
+  "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";
+  "calculator" = dontDistribute super."calculator";
+  "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";
+  "carray" = dontDistribute super."carray";
+  "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";
+  "cased" = dontDistribute super."cased";
+  "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";
+  "charsetdetect-ae" = dontDistribute super."charsetdetect-ae";
+  "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" = dontDistribute super."cheapskate";
+  "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-ghc" = doDistribute super."clash-ghc_0_5_15";
+  "clash-lib" = doDistribute super."clash-lib_0_5_13";
+  "clash-prelude" = doDistribute super."clash-prelude_0_9_3";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_10";
+  "clash-verilog" = doDistribute super."clash-verilog_0_5_10";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = dontDistribute super."clckwrks";
+  "clckwrks-cli" = dontDistribute super."clckwrks-cli";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = dontDistribute super."clckwrks-plugin-media";
+  "clckwrks-plugin-page" = dontDistribute super."clckwrks-plugin-page";
+  "clckwrks-theme-bootstrap" = dontDistribute super."clckwrks-theme-bootstrap";
+  "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";
+  "clock" = doDistribute super."clock_0_5_1";
+  "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";
+  "codex" = doDistribute super."codex_0_3_0_10";
+  "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";
+  "commutative" = dontDistribute super."commutative";
+  "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";
+  "compactmap" = dontDistribute super."compactmap";
+  "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";
+  "composition-extra" = doDistribute super."composition-extra_1_1_0";
+  "composition-tree" = dontDistribute super."composition-tree";
+  "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-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-output" = dontDistribute super."concurrent-output";
+  "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";
+  "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-connection" = dontDistribute super."conduit-connection";
+  "conduit-iconv" = dontDistribute super."conduit-iconv";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = dontDistribute super."conduit-parse";
+  "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";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consul-haskell" = doDistribute super."consul-haskell_0_2_1";
+  "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";
+  "contravariant-extras" = dontDistribute super."contravariant-extras";
+  "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" = doDistribute super."cron_0_3_0";
+  "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";
+  "cryptol" = doDistribute super."cryptol_2_2_5";
+  "cryptonite" = doDistribute super."cryptonite_0_6";
+  "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";
+  "css-syntax" = dontDistribute super."css-syntax";
+  "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";
+  "ctrie" = dontDistribute super."ctrie";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cubicspline" = doDistribute super."cubicspline_0_1_1";
+  "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-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-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";
+  "dbmigrations" = dontDistribute super."dbmigrations";
+  "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" = doDistribute super."debian_3_87_2";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "decepticons" = dontDistribute super."decepticons";
+  "declarative" = dontDistribute super."declarative";
+  "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";
+  "dejafu" = dontDistribute super."dejafu";
+  "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-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_22";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "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-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
+  "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-svg" = doDistribute super."diagrams-svg_1_3_1_7";
+  "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-bootstrap" = dontDistribute super."digestive-bootstrap";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
+  "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" = doDistribute super."dimensional_0_13_0_2";
+  "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" = dontDistribute super."distributed-process";
+  "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-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" = dontDistribute super."distributed-static";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "diversity" = dontDistribute super."diversity";
+  "dixi" = dontDistribute super."dixi";
+  "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";
+  "docopt" = dontDistribute super."docopt";
+  "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-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";
+  "drawille" = dontDistribute super."drawille";
+  "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";
+  "dynamic-state" = dontDistribute super."dynamic-state";
+  "dynobud" = dontDistribute super."dynobud";
+  "dyre" = dontDistribute super."dyre";
+  "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-distance-vector" = dontDistribute super."edit-distance-vector";
+  "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";
+  "either-unwrap" = dontDistribute super."either-unwrap";
+  "eithers" = dontDistribute super."eithers";
+  "ekg" = dontDistribute super."ekg";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-json" = dontDistribute super."ekg-json";
+  "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-bridge" = dontDistribute super."elm-bridge";
+  "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-snap" = dontDistribute super."engine-io-snap";
+  "engine-io-wai" = dontDistribute super."engine-io-wai";
+  "engine-io-yesod" = dontDistribute super."engine-io-yesod";
+  "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";
+  "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";
+  "etcd" = dontDistribute super."etcd";
+  "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";
+  "eventstore" = dontDistribute super."eventstore";
+  "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" = dontDistribute super."exact-pi";
+  "exact-real" = dontDistribute super."exact-real";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "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-exception" = dontDistribute super."explicit-exception";
+  "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";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
+  "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";
+  "farmhash" = dontDistribute super."farmhash";
+  "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" = dontDistribute super."fasta";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay" = doDistribute super."fay_0_23_1_8";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "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";
+  "fft" = dontDistribute super."fft";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-arbitrary" = dontDistribute super."fgl-arbitrary";
+  "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";
+  "file-modules" = dontDistribute super."file-modules";
+  "filecache" = dontDistribute super."filecache";
+  "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";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fn" = dontDistribute super."fn";
+  "fn-extra" = dontDistribute super."fn-extra";
+  "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";
+  "forecast-io" = dontDistribute super."forecast-io";
+  "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";
+  "freekick2" = dontDistribute super."freekick2";
+  "freenect" = doDistribute super."freenect_1_2";
+  "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";
+  "frontmatter" = dontDistribute super."frontmatter";
+  "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";
+  "funcmp" = dontDistribute super."funcmp";
+  "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";
+  "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_8_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-trie" = dontDistribute super."generic-trie";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
+  "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-generics" = doDistribute super."getopt-generics_0_10_0_1";
+  "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-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-exactprint" = dontDistribute super."ghc-exactprint";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-heap-view" = dontDistribute super."ghc-heap-view";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-mod" = dontDistribute super."ghc-mod";
+  "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" = dontDistribute super."ghc-session";
+  "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-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "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";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "gipeda" = doDistribute super."gipeda_0_1_2_1";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_5_20150727";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-fmt" = dontDistribute super."git-fmt";
+  "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-types" = dontDistribute super."github-types";
+  "github-utils" = dontDistribute super."github-utils";
+  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
+  "github-webhook-handler-snap" = dontDistribute super."github-webhook-handler-snap";
+  "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-cloud" = dontDistribute super."google-cloud";
+  "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";
+  "graphtype" = dontDistribute super."graphtype";
+  "graphviz" = dontDistribute super."graphviz";
+  "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";
+  "groom" = dontDistribute super."groom";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "grouped-list" = dontDistribute super."grouped-list";
+  "groupoid" = dontDistribute super."groupoid";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk" = doDistribute super."gtk_0_13_9";
+  "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" = dontDistribute super."hOpenPGP";
+  "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";
+  "hackage-whatsnew" = dontDistribute super."hackage-whatsnew";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackmanager" = dontDistribute super."hackmanager";
+  "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";
+  "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";
+  "hapistrano" = dontDistribute super."hapistrano";
+  "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" = dontDistribute super."happstack-authenticate";
+  "happstack-clientsession" = dontDistribute super."happstack-clientsession";
+  "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-hsp" = dontDistribute super."happstack-hsp";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-jmacro" = dontDistribute super."happstack-jmacro";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls" = dontDistribute super."happstack-server-tls";
+  "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";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harp" = dontDistribute super."harp";
+  "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";
+  "hashable-time" = dontDistribute super."hashable-time";
+  "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" = doDistribute super."haskell-names_0_5_3";
+  "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" = doDistribute super."haskell-src-exts_1_16_0_1";
+  "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";
+  "haskintex" = doDistribute super."haskintex_0_5_1_0";
+  "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_7_4";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "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";
+  "hasty-hamiltonian" = dontDistribute super."hasty-hamiltonian";
+  "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" = dontDistribute super."haxl";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "hgettext" = dontDistribute super."hgettext";
+  "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";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hidapi" = dontDistribute super."hidapi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering" = dontDistribute super."hierarchical-clustering";
+  "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";
+  "hindent" = doDistribute super."hindent_4_5_5";
+  "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";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-interest" = dontDistribute super."hledger-interest";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
+  "hledger-ui" = dontDistribute super."hledger-ui";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_22";
+  "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" = doDistribute super."hmatrix_0_16_1_5";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-gsl" = doDistribute super."hmatrix-gsl_0_16_0_3";
+  "hmatrix-gsl-stats" = doDistribute super."hmatrix-gsl-stats_0_4_1_1";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "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";
+  "hopenpgp-tools" = dontDistribute super."hopenpgp-tools";
+  "hopenssl" = dontDistribute super."hopenssl";
+  "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-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
+  "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";
+  "hsass" = doDistribute super."hsass_0_3_0";
+  "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";
+  "hsexif" = dontDistribute super."hsexif";
+  "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";
+  "hsignal" = doDistribute super."hsignal_0_2_7_1";
+  "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" = dontDistribute super."hsndfile";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsndfile-vector" = dontDistribute super."hsndfile-vector";
+  "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" = dontDistribute super."hsp";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_1_10";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_1_10";
+  "hspec-discover" = doDistribute super."hspec-discover_2_1_10";
+  "hspec-expectations" = doDistribute super."hspec-expectations_0_7_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-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-setup" = dontDistribute super."hspec-setup";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
+  "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
+  "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";
+  "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3";
+  "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";
+  "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
+  "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-jmacro" = dontDistribute super."hsx-jmacro";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsx2hs" = dontDistribute super."hsx2hs";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htaglib" = dontDistribute super."htaglib";
+  "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-accept" = dontDistribute super."http-accept";
+  "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-openssl" = dontDistribute super."http-client-openssl";
+  "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-link-header" = dontDistribute super."http-link-header";
+  "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-types" = doDistribute super."http-types_0_8_6";
+  "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_0_4";
+  "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" = dontDistribute super."human-readable-duration";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = dontDistribute super."hunit-dejafu";
+  "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";
+  "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hworker" = dontDistribute super."hworker";
+  "hworker-ses" = dontDistribute super."hworker-ses";
+  "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";
+  "hybrid-vectors" = dontDistribute super."hybrid-vectors";
+  "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";
+  "hyperloglog" = doDistribute super."hyperloglog_0_3_4";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzk" = dontDistribute super."hzk";
+  "hzulip" = dontDistribute super."hzulip";
+  "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";
+  "ical" = dontDistribute super."ical";
+  "iconv" = dontDistribute super."iconv";
+  "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";
+  "ig" = dontDistribute super."ig";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell" = doDistribute super."ihaskell_0_6_5_0";
+  "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" = dontDistribute super."inline-c";
+  "inline-c-cpp" = dontDistribute super."inline-c-cpp";
+  "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";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-region" = dontDistribute super."io-region";
+  "io-storage" = dontDistribute super."io-storage";
+  "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";
+  "iproute" = doDistribute super."iproute_1_5_0";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "ipython-kernel" = doDistribute super."ipython-kernel_0_6_1_3";
+  "irc" = dontDistribute super."irc";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-client" = dontDistribute super."irc-client";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = dontDistribute super."irc-conduit";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-ctcp" = dontDistribute super."irc-ctcp";
+  "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";
+  "iso8601-time" = dontDistribute super."iso8601-time";
+  "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";
+  "ix-shapable" = dontDistribute super."ix-shapable";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "ixset" = dontDistribute super."ixset";
+  "ixset-typed" = dontDistribute super."ixset-typed";
+  "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-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";
+  "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
+  "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-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";
+  "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";
+  "kraken" = dontDistribute super."kraken";
+  "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-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-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-lua2" = dontDistribute super."language-lua2";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-nix" = dontDistribute super."language-nix";
+  "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" = dontDistribute super."language-thrift";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "largeword" = doDistribute super."largeword_1_2_3";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = dontDistribute super."latex-formulae-hakyll";
+  "latex-formulae-image" = dontDistribute super."latex-formulae-image";
+  "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc";
+  "lattices" = doDistribute super."lattices_1_3";
+  "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";
+  "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" = doDistribute super."lens_4_12_3";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-regex" = dontDistribute super."lens-regex";
+  "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" = dontDistribute super."leveldb-haskell";
+  "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";
+  "libinfluxdb" = dontDistribute super."libinfluxdb";
+  "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";
+  "libsystemd-journal" = dontDistribute super."libsystemd-journal";
+  "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" = doDistribute super."linear_1_19_1_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-prompt" = dontDistribute super."list-prompt";
+  "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";
+  "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-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" = doDistribute super."loop_0_2_0";
+  "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";
+  "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";
+  "lucid-svg" = doDistribute super."lucid-svg_0_5_0_0";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luka" = dontDistribute super."luka";
+  "luminance" = dontDistribute super."luminance";
+  "luminance-samples" = dontDistribute super."luminance-samples";
+  "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";
+  "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";
+  "mandrill" = doDistribute super."mandrill_0_3_0_0";
+  "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";
+  "markdown-unlit" = dontDistribute super."markdown-unlit";
+  "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" = doDistribute super."markup_1_1_0";
+  "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";
+  "mcmc-types" = dontDistribute super."mcmc-types";
+  "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" = dontDistribute super."megaparsec";
+  "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";
+  "memoization-utils" = dontDistribute super."memoization-utils";
+  "memory" = doDistribute super."memory_0_7";
+  "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-parser" = dontDistribute super."microformats2-parser";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
+  "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
+  "microlens-platform" = dontDistribute super."microlens-platform";
+  "microlens-th" = doDistribute super."microlens-th_0_2_1_1";
+  "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";
+  "mighty-metropolis" = dontDistribute super."mighty-metropolis";
+  "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";
+  "modify-fasta" = dontDistribute super."modify-fasta";
+  "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";
+  "moesocks" = dontDistribute super."moesocks";
+  "mohws" = dontDistribute super."mohws";
+  "mole" = dontDistribute super."mole";
+  "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-http" = dontDistribute super."monad-http";
+  "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-time" = dontDistribute super."monad-time";
+  "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";
+  "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
+  "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" = dontDistribute super."monadloc";
+  "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_9_3";
+  "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";
+  "morte" = dontDistribute super."morte";
+  "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";
+  "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" = dontDistribute super."multiplate";
+  "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-probability" = dontDistribute super."mwc-probability";
+  "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-check" = dontDistribute super."nagios-check";
+  "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";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "nats" = doDistribute super."nats_1";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-sort" = dontDistribute super."natural-sort";
+  "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_2_3";
+  "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" = dontDistribute super."nettle";
+  "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-anonymous-tor" = doDistribute super."network-anonymous-tor_0_9_2";
+  "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-house" = dontDistribute super."network-house";
+  "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-composed" = dontDistribute super."network-transport-composed";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = dontDistribute super."network-transport-tcp";
+  "network-transport-tests" = dontDistribute super."network-transport-tests";
+  "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";
+  "nix-paths" = dontDistribute super."nix-paths";
+  "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-extras" = doDistribute super."numeric-extras_0_0_3";
+  "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-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype-dk" = dontDistribute super."numtype-dk";
+  "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";
+  "off-simple" = dontDistribute super."off-simple";
+  "ofx" = dontDistribute super."ofx";
+  "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";
+  "omnifmt" = dontDistribute super."omnifmt";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "once" = dontDistribute super."once";
+  "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";
+  "oo-prototypes" = dontDistribute super."oo-prototypes";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-browser" = dontDistribute super."open-browser";
+  "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";
+  "opml-conduit" = dontDistribute super."opml-conduit";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
+  "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-description-remote" = dontDistribute super."package-description-remote";
+  "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" = doDistribute super."pagerduty_0_0_3_3";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4";
+  "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";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
+  "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-isomorphisms" = dontDistribute super."partial-isomorphisms";
+  "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";
+  "patches-vector" = dontDistribute super."patches-vector";
+  "path-extra" = dontDistribute super."path-extra";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "pathwalk" = dontDistribute super."pathwalk";
+  "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" = dontDistribute super."pcap";
+  "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-heavy" = doDistribute super."pcre-heavy_0_2_5";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pcre-utils" = dontDistribute super."pcre-utils";
+  "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content";
+  "pdf-toolbox-core" = dontDistribute super."pdf-toolbox-core";
+  "pdf-toolbox-document" = dontDistribute super."pdf-toolbox-document";
+  "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-mysql" = doDistribute super."persistent-mysql_2_2";
+  "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";
+  "pgp-wordlist" = dontDistribute super."pgp-wordlist";
+  "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";
+  "pinch" = dontDistribute super."pinch";
+  "pinchot" = dontDistribute super."pinchot";
+  "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-cacophony" = dontDistribute super."pipes-cacophony";
+  "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-csv" = dontDistribute super."pipes-csv";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = dontDistribute super."pipes-extras";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-mongodb" = dontDistribute super."pipes-mongodb";
+  "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";
+  "pkcs10" = dontDistribute super."pkcs10";
+  "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" = doDistribute super."plot_0_2_3_4";
+  "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2";
+  "plot-gtk-ui" = dontDistribute super."plot-gtk-ui";
+  "plot-gtk3" = doDistribute super."plot-gtk3_0_1_0_1";
+  "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";
+  "pointedlist" = dontDistribute super."pointedlist";
+  "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";
+  "post-mess-age" = doDistribute super."post-mess-age_0_1_0_0";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_5_2_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-orm" = dontDistribute super."postgresql-orm";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
+  "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" = doDistribute super."pred-trie_0_2_0";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefix-units" = doDistribute super."prefix-units_0_1_0_2";
+  "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";
+  "projectroot" = dontDistribute super."projectroot";
+  "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" = dontDistribute super."protobuf";
+  "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" = dontDistribute super."psc-ide";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = dontDistribute super."publicsuffix";
+  "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";
+  "pwstore-purehaskell" = dontDistribute super."pwstore-purehaskell";
+  "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";
+  "questioner" = dontDistribute super."questioner";
+  "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-text" = dontDistribute super."quickcheck-text";
+  "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";
+  "rank1dynamic" = dontDistribute super."rank1dynamic";
+  "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";
+  "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2";
+  "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";
+  "read-editor" = dontDistribute super."read-editor";
+  "readable" = dontDistribute super."readable";
+  "readline" = dontDistribute super."readline";
+  "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";
+  "reducers" = doDistribute super."reducers_3_10_3_2";
+  "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" = doDistribute super."reflection_2";
+  "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";
+  "reform" = dontDistribute super."reform";
+  "reform-blaze" = dontDistribute super."reform-blaze";
+  "reform-hamlet" = dontDistribute super."reform-hamlet";
+  "reform-happstack" = dontDistribute super."reform-happstack";
+  "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative-text" = dontDistribute super."regex-applicative-text";
+  "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-text" = dontDistribute super."regex-tdfa-text";
+  "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";
+  "reinterpret-cast" = dontDistribute super."reinterpret-cast";
+  "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" = doDistribute super."repa_3_4_0_1";
+  "repa-algorithms" = doDistribute super."repa-algorithms_3_4_0_1";
+  "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-io" = doDistribute super."repa-io_3_4_0_1";
+  "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";
+  "resolve-trivial-conflicts" = dontDistribute super."resolve-trivial-conflicts";
+  "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_36_0_6";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_17_1_3";
+  "rest-happstack" = doDistribute super."rest-happstack_0_2_10_8";
+  "rest-snap" = doDistribute super."rest-snap_0_1_17_18";
+  "rest-wai" = doDistribute super."rest-wai_0_1_0_8";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retry" = doDistribute super."retry_0_6";
+  "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";
+  "riak" = dontDistribute super."riak";
+  "riak-protobuf" = dontDistribute super."riak-protobuf";
+  "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-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "rosezipper" = dontDistribute super."rosezipper";
+  "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";
+  "sandman" = dontDistribute super."sandman";
+  "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_4_4";
+  "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" = doDistribute super."sdl2_1_3_1";
+  "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_6_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" = doDistribute super."semigroups_0_16_2_2";
+  "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-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
+  "servant-blaze" = dontDistribute super."servant-blaze";
+  "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";
+  "servant-yaml" = dontDistribute super."servant-yaml";
+  "servius" = dontDistribute super."servius";
+  "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";
+  "sets" = dontDistribute super."sets";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "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";
+  "shaker" = dontDistribute super."shaker";
+  "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";
+  "should-not-typecheck" = dontDistribute super."should-not-typecheck";
+  "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";
+  "signal" = dontDistribute super."signal";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple" = dontDistribute super."simple";
+  "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-postgresql-orm" = dontDistribute super."simple-postgresql-orm";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-session" = dontDistribute super."simple-session";
+  "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-templates" = dontDistribute super."simple-templates";
+  "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";
+  "singletons" = doDistribute super."singletons_1_1_2_1";
+  "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";
+  "skeletons" = dontDistribute super."skeletons";
+  "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";
+  "slug" = dontDistribute super."slug";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcaps" = dontDistribute super."smallcaps";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smsaero" = dontDistribute super."smsaero";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-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";
+  "soap" = dontDistribute super."soap";
+  "soap-openssl" = dontDistribute super."soap-openssl";
+  "soap-tls" = dontDistribute super."soap-tls";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = dontDistribute super."socket";
+  "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";
+  "sorted-list" = dontDistribute super."sorted-list";
+  "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";
+  "sourcemap" = doDistribute super."sourcemap_0_1_3_0";
+  "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";
+  "speedy-slice" = dontDistribute super."speedy-slice";
+  "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_0_1_10_1";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
+  "stackage-curator" = dontDistribute super."stackage-curator";
+  "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";
+  "stateWriter" = dontDistribute super."stateWriter";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "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" = dontDistribute super."streaming";
+  "streaming-bytestring" = dontDistribute super."streaming-bytestring";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "streamproc" = dontDistribute super."streamproc";
+  "strict-base-types" = dontDistribute super."strict-base-types";
+  "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-qq" = dontDistribute super."string-qq";
+  "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";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3";
+  "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" = dontDistribute super."success";
+  "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" = dontDistribute super."swagger2";
+  "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" = doDistribute super."syb_0_5_1";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class" = dontDistribute super."syb-with-class";
+  "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";
+  "sync" = dontDistribute super."sync";
+  "sync-mht" = dontDistribute super."sync-mht";
+  "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";
+  "syz" = dontDistribute super."syz";
+  "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" = doDistribute super."tasty_0_10_1_2";
+  "tasty-dejafu" = dontDistribute super."tasty-dejafu";
+  "tasty-expected-failure" = dontDistribute super."tasty-expected-failure";
+  "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
+  "tasty-html" = dontDistribute super."tasty-html";
+  "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-tap" = dontDistribute super."tasty-tap";
+  "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";
+  "tellbot" = dontDistribute super."tellbot";
+  "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";
+  "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-smallcheck" = dontDistribute super."test-framework-smallcheck";
+  "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-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show" = doDistribute super."text-show_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";
+  "text-zipper" = dontDistribute super."text-zipper";
+  "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-orphans" = doDistribute super."th-orphans_0_12_2";
+  "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";
+  "these" = dontDistribute super."these";
+  "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-parsers" = dontDistribute super."time-parsers";
+  "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-units" = dontDistribute super."time-units";
+  "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";
+  "tinytemplate" = dontDistribute super."tinytemplate";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls" = doDistribute super."tls_1_3_2";
+  "tls-debug" = doDistribute super."tls-debug_0_4_0";
+  "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";
+  "tracy" = dontDistribute super."tracy";
+  "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";
+  "tries" = dontDistribute super."tries";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "true-name" = dontDistribute super."true-name";
+  "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";
+  "ttrie" = dontDistribute super."ttrie";
+  "tttool" = doDistribute super."tttool_1_4_0_5";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tuple-th" = dontDistribute super."tuple-th";
+  "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-list" = doDistribute super."type-list_0_2_0_0";
+  "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" = dontDistribute super."typelits-witnesses";
+  "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";
+  "tz" = dontDistribute super."tz";
+  "tzdata" = dontDistribute super."tzdata";
+  "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";
+  "uglymemo" = dontDistribute super."uglymemo";
+  "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";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
+  "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";
+  "unification-fd" = dontDistribute super."unification-fd";
+  "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" = dontDistribute super."universe";
+  "universe-base" = dontDistribute super."universe-base";
+  "universe-instances-base" = dontDistribute super."universe-instances-base";
+  "universe-instances-extended" = dontDistribute super."universe-instances-extended";
+  "universe-instances-trans" = dontDistribute super."universe-instances-trans";
+  "universe-reverse-instances" = dontDistribute super."universe-reverse-instances";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-bytestring" = dontDistribute super."unix-bytestring";
+  "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";
+  "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";
+  "urlpath" = doDistribute super."urlpath_2_1_0";
+  "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" = dontDistribute super."userid";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "utility-ht" = dontDistribute super."utility-ht";
+  "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-orphans" = dontDistribute super."uuid-orphans";
+  "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";
+  "validate-input" = doDistribute super."validate-input_0_2_0_0";
+  "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" = doDistribute super."vector_0_10_12_3";
+  "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-fftw" = dontDistribute super."vector-fftw";
+  "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" = dontDistribute super."vinyl";
+  "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" = dontDistribute super."vty";
+  "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-caching" = dontDistribute super."wai-middleware-caching";
+  "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru";
+  "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-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-metrics" = dontDistribute super."wai-middleware-metrics";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "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-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-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
+  "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";
+  "wai-transformers" = dontDistribute super."wai-transformers";
+  "wai-util" = dontDistribute super."wai-util";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_1_3_1";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_1_3";
+  "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-plugins" = dontDistribute super."web-plugins";
+  "web-routes" = dontDistribute super."web-routes";
+  "web-routes-boomerang" = dontDistribute super."web-routes-boomerang";
+  "web-routes-happstack" = dontDistribute super."web-routes-happstack";
+  "web-routes-hsp" = dontDistribute super."web-routes-hsp";
+  "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-th" = dontDistribute super."web-routes-th";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "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";
+  "withdependencies" = dontDistribute super."withdependencies";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word-trie" = dontDistribute super."word-trie";
+  "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";
+  "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-basedir" = dontDistribute super."xdg-basedir";
+  "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_1_2";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
+  "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
+  "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" = dontDistribute super."xmonad";
+  "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" = dontDistribute super."yaml-light";
+  "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";
+  "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";
+  "yes-precure5-command" = dontDistribute super."yes-precure5-command";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "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";
+  "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-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_4_0_1";
+  "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-table" = doDistribute super."yesod-table_1_0_6";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_4_4";
+  "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" = dontDistribute super."yi";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-fuzzy-open" = dontDistribute super."yi-fuzzy-open";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-language" = dontDistribute super."yi-language";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-rope" = dontDistribute super."yi-rope";
+  "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";
+  "zim-parser" = dontDistribute super."zim-parser";
+  "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/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 5b7a20c9342..ebe29e181a8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -437,6 +437,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -884,6 +885,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1110,6 +1112,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1502,6 +1505,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1671,6 +1675,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1706,6 +1711,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1748,6 +1754,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_6_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";
@@ -1926,6 +1933,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_11";
   "clash-lib" = doDistribute super."clash-lib_0_5_10";
@@ -2811,6 +2819,7 @@ self: super: {
   "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";
@@ -3241,6 +3250,7 @@ self: super: {
   "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";
@@ -3304,6 +3314,10 @@ self: super: {
   "gnuidn" = doDistribute super."gnuidn_0_2_1";
   "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";
@@ -3450,6 +3464,7 @@ self: super: {
   "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";
@@ -4889,6 +4904,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5276,6 +5293,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5296,6 +5314,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6368,6 +6387,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6608,6 +6628,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6872,6 +6893,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7057,6 +7079,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_3_1";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5";
@@ -7097,6 +7120,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7370,6 +7394,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_3";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7461,6 +7486,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7687,6 +7713,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7872,6 +7899,7 @@ self: super: {
   "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";
@@ -7893,6 +7921,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -8048,6 +8077,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 9f50937f4f6..8a8faeb8829 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -437,6 +437,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -884,6 +885,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1110,6 +1112,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1502,6 +1505,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1671,6 +1675,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1706,6 +1711,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1748,6 +1754,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_6_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";
@@ -1925,6 +1932,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_11";
   "clash-lib" = doDistribute super."clash-lib_0_5_10";
@@ -2810,6 +2818,7 @@ self: super: {
   "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";
@@ -3240,6 +3249,7 @@ self: super: {
   "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";
@@ -3303,6 +3313,10 @@ self: super: {
   "gnuidn" = doDistribute super."gnuidn_0_2_1";
   "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";
@@ -3449,6 +3463,7 @@ self: super: {
   "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";
@@ -4888,6 +4903,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5275,6 +5292,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5295,6 +5313,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6367,6 +6386,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6607,6 +6627,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6870,6 +6891,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7055,6 +7077,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_3_1";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -7094,6 +7117,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7367,6 +7391,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_3";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7458,6 +7483,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7684,6 +7710,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7869,6 +7896,7 @@ self: super: {
   "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";
@@ -7890,6 +7918,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -8044,6 +8073,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 386c865253d..b4746be3310 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -437,6 +437,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -884,6 +885,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1110,6 +1112,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1501,6 +1504,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1670,6 +1674,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1705,6 +1710,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1747,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_6_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";
@@ -1923,6 +1930,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_13";
   "clash-lib" = doDistribute super."clash-lib_0_5_11";
@@ -2807,6 +2815,7 @@ self: super: {
   "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";
@@ -3235,6 +3244,7 @@ self: super: {
   "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";
@@ -3298,6 +3308,10 @@ self: super: {
   "gnuidn" = doDistribute super."gnuidn_0_2_1";
   "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";
@@ -3444,6 +3458,7 @@ self: super: {
   "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";
@@ -4877,6 +4892,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5264,6 +5281,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5284,6 +5302,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6351,6 +6370,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6591,6 +6611,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6853,6 +6874,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7038,6 +7060,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_4_1";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -7077,6 +7100,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7347,6 +7371,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_3";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7438,6 +7463,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7664,6 +7690,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7849,6 +7876,7 @@ self: super: {
   "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";
@@ -7870,6 +7898,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -8024,6 +8053,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 8b9e2b4b2d5..83635b005ae 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -437,6 +437,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -884,6 +885,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1109,6 +1111,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1500,6 +1503,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1669,6 +1673,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1704,6 +1709,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1746,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_6_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";
@@ -1921,6 +1928,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_14";
   "clash-lib" = doDistribute super."clash-lib_0_5_12";
@@ -2804,6 +2812,7 @@ self: super: {
   "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";
@@ -3230,6 +3239,7 @@ self: super: {
   "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";
@@ -3291,6 +3301,10 @@ self: super: {
   "gnuidn" = doDistribute super."gnuidn_0_2_1";
   "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";
@@ -3437,6 +3451,7 @@ self: super: {
   "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";
@@ -4866,6 +4881,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5253,6 +5270,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5273,6 +5291,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6338,6 +6357,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6578,6 +6598,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6840,6 +6861,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7025,6 +7047,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_4_1";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -7064,6 +7087,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7334,6 +7358,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_3";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7425,6 +7450,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7650,6 +7676,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7835,6 +7862,7 @@ self: super: {
   "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";
@@ -7855,6 +7883,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -8008,6 +8037,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 9078c3be23c..706ac59c44b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -437,6 +437,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -884,6 +885,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1109,6 +1111,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1497,6 +1500,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1666,6 +1670,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1701,6 +1706,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1743,6 +1749,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_6_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";
@@ -1918,6 +1925,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2799,6 +2807,7 @@ self: super: {
   "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";
@@ -3223,6 +3232,7 @@ self: super: {
   "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";
@@ -3284,6 +3294,10 @@ self: super: {
   "gnuidn" = doDistribute super."gnuidn_0_2_1";
   "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";
@@ -3430,6 +3444,7 @@ self: super: {
   "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";
@@ -4856,6 +4871,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5241,6 +5258,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5261,6 +5279,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
@@ -6321,6 +6340,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6561,6 +6581,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6823,6 +6844,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -7006,6 +7028,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_5_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -7045,6 +7068,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7315,6 +7339,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_3";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7406,6 +7431,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7630,6 +7656,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7815,6 +7842,7 @@ self: super: {
   "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";
@@ -7835,6 +7863,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -7988,6 +8017,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 3a476ae5983..50f10a62620 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -437,6 +437,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -884,6 +885,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1109,6 +1111,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1497,6 +1500,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1514,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_2_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1663,6 +1668,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1698,6 +1704,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1740,6 +1747,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_6_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";
@@ -1914,6 +1922,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2198,6 +2207,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_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
@@ -2788,6 +2798,7 @@ self: super: {
   "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";
@@ -3212,6 +3223,7 @@ self: super: {
   "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";
@@ -3273,6 +3285,10 @@ self: super: {
   "gnuidn" = doDistribute super."gnuidn_0_2_1";
   "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";
@@ -3419,6 +3435,7 @@ self: super: {
   "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";
@@ -4845,6 +4862,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5228,6 +5247,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5248,6 +5268,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_14";
@@ -6305,6 +6326,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6545,6 +6567,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6807,6 +6830,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -6990,6 +7014,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_5_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -7029,6 +7054,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7298,6 +7324,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_3";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7389,6 +7416,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7613,6 +7641,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7798,6 +7827,7 @@ self: super: {
   "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";
@@ -7818,6 +7848,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -7971,6 +8002,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index f3f2fec1982..a05341eb8b4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -437,6 +437,7 @@ self: super: {
   "HLearn-classification" = dontDistribute super."HLearn-classification";
   "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
   "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HList" = doDistribute super."HList_0_4_1_0";
   "HListPP" = dontDistribute super."HListPP";
   "HLogger" = dontDistribute super."HLogger";
   "HMM" = dontDistribute super."HMM";
@@ -882,6 +883,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_1";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1107,6 +1109,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = dontDistribute super."aeson-compat";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1495,6 +1498,7 @@ self: super: {
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
   "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
   "billeksah-main" = dontDistribute super."billeksah-main";
@@ -1512,6 +1516,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_2_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1660,6 +1665,7 @@ self: super: {
   "bound-gen" = dontDistribute super."bound-gen";
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1695,6 +1701,7 @@ self: super: {
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
   "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
@@ -1737,6 +1744,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_6_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";
@@ -1910,6 +1918,7 @@ self: super: {
   "claferwiki" = dontDistribute super."claferwiki";
   "clang-pure" = dontDistribute super."clang-pure";
   "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
   "clash-lib" = doDistribute super."clash-lib_0_5_13";
@@ -2194,6 +2203,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_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
@@ -2781,6 +2791,7 @@ self: super: {
   "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";
@@ -3204,6 +3215,7 @@ self: super: {
   "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";
@@ -3265,6 +3277,10 @@ self: super: {
   "gnuidn" = doDistribute super."gnuidn_0_2_1";
   "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";
@@ -3411,6 +3427,7 @@ self: super: {
   "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";
@@ -4837,6 +4854,8 @@ self: super: {
   "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" = dontDistribute super."leveldb-haskell";
   "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
@@ -5220,6 +5239,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5240,6 +5260,7 @@ self: super: {
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
   "monad-logger" = doDistribute super."monad-logger_0_3_14";
@@ -6296,6 +6317,7 @@ self: super: {
   "reform-hamlet" = dontDistribute super."reform-hamlet";
   "reform-happstack" = dontDistribute super."reform-happstack";
   "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative" = doDistribute super."regex-applicative_0_3_2_1";
   "regex-applicative-text" = dontDistribute super."regex-applicative-text";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
@@ -6536,6 +6558,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6798,6 +6821,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
   "smallarray" = dontDistribute super."smallarray";
   "smallcaps" = dontDistribute super."smallcaps";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
@@ -6981,6 +7005,7 @@ self: super: {
   "stack" = doDistribute super."stack_0_1_5_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
@@ -7020,6 +7045,7 @@ self: super: {
   "stepwise" = dontDistribute super."stepwise";
   "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
   "stitch" = dontDistribute super."stitch";
+  "stm" = doDistribute super."stm_2_4_4";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
@@ -7289,6 +7315,7 @@ self: super: {
   "tex2txt" = dontDistribute super."tex2txt";
   "texmath" = doDistribute super."texmath_0_8_3";
   "texrunner" = dontDistribute super."texrunner";
+  "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
   "text-icu-translit" = dontDistribute super."text-icu-translit";
@@ -7380,6 +7407,7 @@ self: super: {
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
   "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_0";
+  "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
   "time-recurrence" = dontDistribute super."time-recurrence";
@@ -7604,6 +7632,7 @@ self: super: {
   "unamb" = dontDistribute super."unamb";
   "unamb-custom" = dontDistribute super."unamb-custom";
   "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
   "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
   "unboxed-containers" = dontDistribute super."unboxed-containers";
   "unbreak" = dontDistribute super."unbreak";
@@ -7789,6 +7818,7 @@ self: super: {
   "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";
@@ -7809,6 +7839,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_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_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
@@ -7962,6 +7993,7 @@ self: super: {
   "wp-archivebot" = dontDistribute super."wp-archivebot";
   "wraparound" = dontDistribute super."wraparound";
   "wraxml" = dontDistribute super."wraxml";
+  "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
   "wsedit" = dontDistribute super."wsedit";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ddbc2109dd5..26288e13884 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2495,6 +2495,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Cabal_1_22_6_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.6.0";
+       sha256 = "e6a58714bd33ea107b5e99c7f149b48ddd3fbfa72e6105abbab4478bcf4f2433";
+       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
@@ -6303,20 +6330,6 @@ self: {
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLURaw" = callPackage
-    ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
-     mkDerivation {
-       pname = "GLURaw";
-       version = "1.5.0.2";
-       sha256 = "dd24af039bef7f44dc580692b57a7a16a36a44b7261c8d3008aba60b696a4c3f";
-       libraryHaskellDepends = [ base OpenGLRaw transformers ];
-       librarySystemDepends = [ freeglut mesa ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
-       description = "A raw binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
-
-  "GLURaw_1_5_0_3" = callPackage
     ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
      mkDerivation {
        pname = "GLURaw";
@@ -6327,7 +6340,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT_2_5_1_1" = callPackage
@@ -6387,24 +6400,6 @@ self: {
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT" = callPackage
-    ({ mkDerivation, array, base, containers, freeglut, mesa, OpenGL
-     , OpenGLRaw, StateVar, transformers
-     }:
-     mkDerivation {
-       pname = "GLUT";
-       version = "2.7.0.3";
-       sha256 = "6292074f55c781f98468a526b09b70e6c08a3c108c10abac3aa44a10d8a5d1e1";
-       libraryHaskellDepends = [
-         array base containers OpenGL OpenGLRaw StateVar transformers
-       ];
-       librarySystemDepends = [ freeglut mesa ];
-       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;};
-
-  "GLUT_2_7_0_4" = callPackage
     ({ mkDerivation, array, base, containers, freeglut, mesa, OpenGL
      , OpenGLRaw, StateVar, transformers
      }:
@@ -6419,7 +6414,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUtil" = callPackage
@@ -8150,7 +8145,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HList" = callPackage
+  "HList_0_4_1_0" = callPackage
     ({ mkDerivation, array, base, cmdargs, directory, doctest, filepath
      , ghc-prim, hspec, lens, mtl, process, profunctors, QuickCheck, syb
      , tagged, template-haskell
@@ -8169,6 +8164,29 @@ self: {
        doCheck = false;
        description = "Heterogeneous lists";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "HList" = callPackage
+    ({ mkDerivation, array, base, base-orphans, cmdargs, directory
+     , doctest, filepath, ghc-prim, hspec, lens, mtl, process
+     , profunctors, QuickCheck, syb, tagged, template-haskell
+     }:
+     mkDerivation {
+       pname = "HList";
+       version = "0.4.2.0";
+       sha256 = "cd99545a1dc4df7ceca09a93e4c4d391654a337882a25791f1c48e21317d7795";
+       libraryHaskellDepends = [
+         array base base-orphans ghc-prim mtl profunctors tagged
+         template-haskell
+       ];
+       testHaskellDepends = [
+         array base cmdargs directory doctest filepath hspec lens mtl
+         process QuickCheck syb template-haskell
+       ];
+       doCheck = false;
+       description = "Heterogeneous lists";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "HListPP" = callPackage
@@ -13987,7 +14005,7 @@ self: {
          kernel32 = null; ole32 = null; shell32 = null; user32 = null; 
          winmm = null; winspool = null;};
 
-  "ObjectName" = callPackage
+  "ObjectName_1_1_0_0" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "ObjectName";
@@ -13997,9 +14015,10 @@ self: {
        homepage = "https://github.com/svenpanne/ObjectName";
        description = "Explicitly handled object names";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ObjectName_1_1_0_1" = callPackage
+  "ObjectName" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "ObjectName";
@@ -14009,7 +14028,6 @@ self: {
        homepage = "https://github.com/svenpanne/ObjectName";
        description = "Explicitly handled object names";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Obsidian" = callPackage
@@ -14276,24 +14294,6 @@ self: {
      }) {};
 
   "OpenGL" = callPackage
-    ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName
-     , OpenGLRaw, StateVar, text, transformers
-     }:
-     mkDerivation {
-       pname = "OpenGL";
-       version = "2.13.2.0";
-       sha256 = "512573572b89242ecf834ca7669c18a689d6a694594ca94bb725ef1db37f46f2";
-       libraryHaskellDepends = [
-         base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
-         text transformers
-       ];
-       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" ];
-     }) {};
-
-  "OpenGL_2_13_2_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName
      , OpenGLRaw, StateVar, text, transformers
      }:
@@ -14308,7 +14308,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "OpenGLCheck" = callPackage
@@ -14368,23 +14368,6 @@ self: {
      }) {inherit (pkgs) mesa;};
 
   "OpenGLRaw" = callPackage
-    ({ mkDerivation, base, bytestring, containers, half, mesa, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "OpenGLRaw";
-       version = "2.6.1.0";
-       sha256 = "3d41249d8feb456889d79939a59e3f2a7b1c771b514fbdcc352ae4f676aa9db0";
-       libraryHaskellDepends = [
-         base bytestring containers half text transformers
-       ];
-       librarySystemDepends = [ mesa ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
-       description = "A raw binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) mesa;};
-
-  "OpenGLRaw_2_6_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, half, mesa, text
      , transformers
      }:
@@ -14399,7 +14382,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mesa;};
 
   "OpenGLRaw21" = callPackage
@@ -17784,7 +17766,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "StateVar" = callPackage
+  "StateVar_1_1_0_1" = callPackage
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "StateVar";
@@ -17794,9 +17776,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_2" = callPackage
+  "StateVar" = callPackage
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "StateVar";
@@ -17806,7 +17789,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
@@ -20785,6 +20767,8 @@ self: {
        pname = "acid-state";
        version = "0.14.0";
        sha256 = "db7cc0fdfe0af9757f448a4184c88d5a8f2ac5e014bea1623a6272821a510621";
+       revision = "2";
+       editedCabalFile = "8aa8c1e14d8dcfec861e9ef4198a9084b54c64719b77e9b505c53024a6ad7f51";
        libraryHaskellDepends = [
          array base bytestring cereal containers directory
          extensible-exceptions filepath mtl network safecopy stm
@@ -21640,20 +21624,20 @@ self: {
      }) {};
 
   "adblock2privoxy" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath
-     , http-conduit, MissingH, mtl, network, network-uri, old-locale
-     , parsec, parsec-permutation, strict, text, time
+    ({ mkDerivation, base, case-insensitive, containers, directory
+     , filepath, http-conduit, MissingH, mtl, network, network-uri
+     , old-locale, parsec, parsec-permutation, strict, text, time
      }:
      mkDerivation {
        pname = "adblock2privoxy";
-       version = "1.3.3";
-       sha256 = "b47dd438b54d2fdcf5bb329f4978f8b052158a0da453cc087edb22c2556dc0c7";
+       version = "1.4.0";
+       sha256 = "2503df4fb073fd03d2f66467b5a14eb31cf5a6a315823cbef09dd96db7c7e1cb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base containers directory filepath http-conduit MissingH mtl
-         network network-uri old-locale parsec parsec-permutation strict
-         text time
+         base case-insensitive containers directory filepath http-conduit
+         MissingH mtl network network-uri old-locale parsec
+         parsec-permutation strict text time
        ];
        homepage = "https://projects.zubr.me/wiki/adblock2privoxy";
        description = "Convert adblock config files to privoxy format";
@@ -21978,8 +21962,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-casing";
-       version = "0.1.0.4";
-       sha256 = "706139db4d17cae7a770802b3103584b3fa1c0d7db5ae2d463cfbaa99549bb5b";
+       version = "0.1.0.5";
+       sha256 = "cfec563dc6822f035858a7190153d8818c200be565806b43b70f198bf5410577";
        libraryHaskellDepends = [ aeson base ];
        testHaskellDepends = [
          aeson base tasty tasty-hunit tasty-quickcheck tasty-th
@@ -21988,6 +21972,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "aeson-compat" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , exceptions, hashable, quickcheck-instances, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "aeson-compat";
+       version = "0.3.0.0";
+       sha256 = "697b2f86628bd6665db153b84ef40c699d372b4b429a7c4ef28719313b9c97ef";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring containers exceptions hashable
+         scientific text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring containers exceptions hashable
+         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
+         text time unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/aeson-compat#readme";
+       description = "Compatibility layer for aeson";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson-diff" = callPackage
     ({ mkDerivation, aeson, base, bytestring, edit-distance-vector
      , hashable, mtl, optparse-applicative, QuickCheck
@@ -22069,7 +22077,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson-extra" = callPackage
+  "aeson-extra_0_2_3_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , exceptions, hashable, quickcheck-instances, scientific, tasty
      , tasty-hunit, tasty-quickcheck, template-haskell, text, time
@@ -22091,6 +22099,34 @@ 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" = 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.0";
+       sha256 = "b9e54cf293c25bbd5646a777cf71a23c4158b708dd358fe3e705add326d5870f";
+       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;
      }) {};
 
   "aeson-filthy" = callPackage
@@ -30204,15 +30240,16 @@ self: {
      }) {};
 
   "atp-haskell" = callPackage
-    ({ mkDerivation, base, containers, HUnit, mtl, parsec, pretty
-     , template-haskell, time
+    ({ mkDerivation, applicative-extras, base, containers, HUnit, mtl
+     , parsec, pretty, template-haskell, time
      }:
      mkDerivation {
        pname = "atp-haskell";
-       version = "1.7";
-       sha256 = "d746df532106f4237d23a1f191ea6dcc0211b5f810b923f7556466bb081f860e";
+       version = "1.8";
+       sha256 = "4bac41afc35571b2ad1a711d08e6f0cb223bb165615e511f2fc22ff9397fb467";
        libraryHaskellDepends = [
-         base containers HUnit mtl parsec pretty template-haskell time
+         applicative-extras base containers HUnit mtl parsec pretty
+         template-haskell time
        ];
        testHaskellDepends = [ base containers HUnit time ];
        homepage = "https://github.com/seereason/atp-haskell";
@@ -33822,6 +33859,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bighugethesaurus" = callPackage
+    ({ mkDerivation, base, HTTP, split }:
+     mkDerivation {
+       pname = "bighugethesaurus";
+       version = "0.1.0.0";
+       sha256 = "3af008b07f35f4a83f53d5c119956195e2cc897396b63f3415cfa0f7561f13c8";
+       libraryHaskellDepends = [ base HTTP split ];
+       description = "API wrapper for Big Huge Thesaurus";
+       license = "GPL";
+     }) {};
+
   "billboard-parser" = callPackage
     ({ mkDerivation, base, directory, filepath, HarmTrace-Base, HUnit
      , ListLike, mtl, parseargs, uu-parsinglib
@@ -34247,7 +34295,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary-orphans" = callPackage
+  "binary-orphans_0_1_2_0" = callPackage
     ({ mkDerivation, aeson, base, binary, hashable
      , quickcheck-instances, scientific, tagged, tasty, tasty-quickcheck
      , text, text-binary, time, unordered-containers, vector
@@ -34270,6 +34318,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.3.0";
+       sha256 = "a42edfe603aea009310a0139acda6a7c385f5b65dfbc084dd17323bd786366cb";
+       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
@@ -36487,6 +36561,7 @@ self: {
          base blaze-builder bytestring bytestring-builder enumerator
          streaming-commons transformers
        ];
+       doHaddock = false;
        homepage = "https://github.com/meiersi/blaze-builder-enumerator";
        description = "Enumeratees for the incremental conversion of builders to bytestrings";
        license = stdenv.lib.licenses.bsd3;
@@ -37687,6 +37762,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bowntz" = callPackage
+    ({ mkDerivation, base, containers, GLUT, hosc, hsc3, random }:
+     mkDerivation {
+       pname = "bowntz";
+       version = "0";
+       sha256 = "771d0f4b4fccefd96e58d6c6ddf71d111aaa0c49180f1e0cab6ad61ec0d9b378";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers GLUT hosc hsc3 random
+       ];
+       homepage = "http://code.mathr.co.uk/bowntz";
+       description = "audio-visual pseudo-physical simulation of colliding circles";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "boxes" = callPackage
     ({ mkDerivation, base, QuickCheck, split }:
      mkDerivation {
@@ -37979,6 +38070,7 @@ self: {
          base binary bytestring cryptohash data-binary-ieee754 mtl network
          QuickCheck test-framework test-framework-quickcheck2 text time
        ];
+       doHaddock = false;
        doCheck = false;
        homepage = "http://github.com/mongodb-haskell/bson";
        description = "BSON documents are JSON-like objects with a standard binary encoding";
@@ -38471,6 +38563,26 @@ self: {
        license = "unknown";
      }) {};
 
+  "butterflies" = callPackage
+    ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw
+     , OpenGLRaw21, repa, repa-devil
+     }:
+     mkDerivation {
+       pname = "butterflies";
+       version = "0.3.0.1";
+       sha256 = "631cdc6b4e299c14f2687cb6ed7baab5b0ae353aa34fb6f09e46594a9a93f235";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base bytestring gl-capture GLUT OpenGLRaw OpenGLRaw21 repa
+         repa-devil
+       ];
+       homepage = "http://code.mathr.co.uk/butterflies";
+       description = "butterfly tilings";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "bv" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -39910,7 +40022,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
-  "cabal-install" = callPackage
+  "cabal-install_1_22_6_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl
      , network, network-uri, pretty, process, QuickCheck, random
@@ -39942,6 +40054,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.7.0";
+       sha256 = "b30fd14f20fdd11b028cba68fefeed7eeadcacf919e7c29bc4d7289a656d19f3";
+       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 ];
      }) {};
 
@@ -40026,13 +40173,14 @@ self: {
      }) {};
 
   "cabal-macosx" = callPackage
-    ({ mkDerivation, base, Cabal, directory, fgl, filepath, parsec
-     , process, text
+    ({ mkDerivation, base, Cabal, directory, fgl, filepath, HUnit
+     , parsec, process, temporary, test-framework, test-framework-hunit
+     , text
      }:
      mkDerivation {
        pname = "cabal-macosx";
-       version = "0.2.3.1";
-       sha256 = "7fcb0d9483896a8a99a2fd4fd56451c3579b0caf413e47e2a44eff8fd1b2b032";
+       version = "0.2.3.2";
+       sha256 = "054f891068c9ce0161610e929716e8fa2022ef0bc093fb42bcb30733c38026b7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40041,6 +40189,9 @@ self: {
        executableHaskellDepends = [
          base Cabal directory fgl filepath parsec process text
        ];
+       testHaskellDepends = [
+         base HUnit temporary test-framework test-framework-hunit
+       ];
        homepage = "http://github.com/danfran/cabal-macosx";
        description = "Cabal support for creating Mac OSX application bundles";
        license = stdenv.lib.licenses.bsd3;
@@ -41466,8 +41617,8 @@ self: {
      }:
      mkDerivation {
        pname = "carray";
-       version = "0.1.6.1";
-       sha256 = "256aa21d8c39f4e737769e0e6635eae664a65f37f950cedabad7b9d4677b9e4f";
+       version = "0.1.6.2";
+       sha256 = "7e71c800472376631cf6933243a0a0190376afab77593ac86825cc2d52b21588";
        libraryHaskellDepends = [
          array base binary bytestring ix-shapable QuickCheck syb
        ];
@@ -44046,8 +44197,8 @@ self: {
      }:
      mkDerivation {
        pname = "clafer";
-       version = "0.4.2.1";
-       sha256 = "35bd00e22e143755b6c66026f1266ec046990ed998f9f89c0198b973909069dd";
+       version = "0.4.3";
+       sha256 = "0be4dd9ab5551e247e69bf9b8863de4f6615a38e26e4c51d3f0bf214478585e4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44081,8 +44232,8 @@ self: {
      }:
      mkDerivation {
        pname = "claferIG";
-       version = "0.4.2.1";
-       sha256 = "519cbe18e8f2519d878f1aa3ca2b77ad19d099f0fc54d5144d1c4cc8690c5bdc";
+       version = "0.4.3";
+       sha256 = "e3afbf8d5a057a54bf0e41a0ad19259f284ab2b7c33f208b08426f1436c52fc3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44112,8 +44263,8 @@ self: {
      }:
      mkDerivation {
        pname = "claferwiki";
-       version = "0.4.2.1";
-       sha256 = "04c7ed51e92e27e3dfe2b7fdfa9bc02fcf698b78cfc33d8241673fb0a361b7b1";
+       version = "0.4.3";
+       sha256 = "7a582f4e59757ea00346f01ced2ef917ea8640941c45c3a407fe7760a5aa483c";
        libraryHaskellDepends = [
          base clafer containers directory gitit MissingH mtl network
          network-uri process SHA split time transformers transformers-compat
@@ -44157,6 +44308,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "clarifai" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, easy-file
+     , HTTP, http-client, lens, lens-aeson, scientific, text
+     , unordered-containers, vector, wreq
+     }:
+     mkDerivation {
+       pname = "clarifai";
+       version = "0.1.1.0";
+       sha256 = "40ef0baf628d4569138192128dd5f6f07a38b2963ec54e4968646f5953caf718";
+       libraryHaskellDepends = [
+         aeson base bytestring containers easy-file HTTP http-client lens
+         lens-aeson scientific text unordered-containers vector wreq
+       ];
+       description = "API Client for the Clarifai API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "clash" = callPackage
     ({ mkDerivation, base, containers, data-accessor
      , data-accessor-template, directory, filepath, ghc, haskell98
@@ -44338,6 +44506,7 @@ self: {
          pretty process template-haskell text time transformers
          unbound-generics unordered-containers uu-parsinglib wl-pprint-text
        ];
+       jailbreak = true;
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
@@ -44361,6 +44530,7 @@ self: {
          pretty process template-haskell text time transformers
          unbound-generics unordered-containers uu-parsinglib wl-pprint-text
        ];
+       jailbreak = true;
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
@@ -44384,6 +44554,7 @@ self: {
          pretty process template-haskell text time transformers
          unbound-generics unordered-containers uu-parsinglib wl-pprint-text
        ];
+       jailbreak = true;
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
@@ -44407,6 +44578,7 @@ self: {
          pretty process template-haskell text time transformers
          unbound-generics unordered-containers uu-parsinglib wl-pprint-text
        ];
+       jailbreak = true;
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
@@ -49237,18 +49409,19 @@ self: {
      }) {};
 
   "conduit-parse" = callPackage
-    ({ mkDerivation, base, conduit, exceptions, hlint, parsers
-     , resourcet, tasty, tasty-hunit, text, transformers
+    ({ mkDerivation, base, conduit, dlist, exceptions, hlint, mtl
+     , parsers, resourcet, tasty, tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "conduit-parse";
-       version = "0.1.0.0";
-       sha256 = "63eb07881e50c146701e0a1934d3a8978189beede4ba15d48f1fd96c05627824";
+       version = "0.1.1.0";
+       sha256 = "94c279c5065f996dd4ad6e4fdb1514ce072c69cdf6dddf6835a20424790b5950";
        libraryHaskellDepends = [
-         base conduit exceptions parsers text transformers
+         base conduit dlist exceptions mtl parsers text transformers
        ];
        testHaskellDepends = [
-         base conduit exceptions hlint parsers resourcet tasty tasty-hunit
+         base conduit exceptions hlint mtl parsers resourcet tasty
+         tasty-hunit
        ];
        homepage = "https://github.com/k0ral/conduit-parse";
        description = "Parsing framework based on conduit";
@@ -50842,7 +51015,6 @@ self: {
        libraryHaskellDepends = [
          base containers copilot-core directory filepath pretty sbv
        ];
-       jailbreak = true;
        description = "A compiler for CoPilot targeting SBV";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52858,7 +53030,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cryptol" = callPackage
+  "cryptol_2_2_5" = callPackage
     ({ mkDerivation, alex, ansi-terminal, array, async, base
      , containers, deepseq, directory, filepath, gitrev, GraphSCC, happy
      , haskeline, heredoc, monadLib, old-time, presburger, pretty
@@ -52882,6 +53054,37 @@ self: {
          ansi-terminal base containers deepseq directory filepath haskeline
          monadLib process random sbv tf-random transformers
        ];
+       jailbreak = true;
+       homepage = "http://www.cryptol.net/";
+       description = "Cryptol: The Language of Cryptography";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cryptol" = callPackage
+    ({ mkDerivation, alex, ansi-terminal, array, async, base
+     , base-compat, containers, deepseq, directory, filepath, gitrev
+     , GraphSCC, happy, haskeline, heredoc, monadLib, old-time
+     , presburger, pretty, process, QuickCheck, random, sbv, smtLib, syb
+     , template-haskell, text, tf-random, transformers, utf8-string
+     }:
+     mkDerivation {
+       pname = "cryptol";
+       version = "2.2.6";
+       sha256 = "8fb05368e34f78b5c3872ff7b495bd3d4c21e9de7a0d72fc07cc79f93dc18cf3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array async base base-compat containers deepseq directory filepath
+         gitrev GraphSCC heredoc monadLib old-time presburger pretty process
+         QuickCheck random sbv smtLib syb template-haskell text tf-random
+         transformers utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         ansi-terminal base containers deepseq directory filepath haskeline
+         monadLib process random sbv tf-random transformers
+       ];
        homepage = "http://www.cryptol.net/";
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
@@ -52916,8 +53119,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptonite";
-       version = "0.9";
-       sha256 = "9f50dc254c20e535d0d490dd004765ab080a6a0745966d0a81a80a4c85e842c0";
+       version = "0.10";
+       sha256 = "55343f018f78de480ea1e7f09dd72307ce0b5eb5e82331512370d5b01ac9735b";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
@@ -56539,6 +56742,8 @@ self: {
        pname = "deeplearning-hs";
        version = "0.1.0.2";
        sha256 = "0da58dd777b5a9d097cef43dede6f72cca18d56577cab131106bfaa7634f82b3";
+       revision = "1";
+       editedCabalFile = "eca23efe079b6311afd52bf1a70f8b9617c2b943e13b2ddb0ac2be5249622afa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59375,8 +59580,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.3.1.9";
-       sha256 = "c344798fc057123229a7c3ba679297398b82fe872c6798fdcb30279bd00a67c7";
+       version = "1.3.1.10";
+       sha256 = "a8293856f359d7d9656bb0b5ca5c97cc13b6ab18eaa71ed30112038cfe0a39a7";
        libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
@@ -67013,17 +67218,17 @@ self: {
      }) {};
 
   "eventstore" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal
-     , containers, network, protobuf, random, stm, tasty, tasty-hunit
-     , text, time, unordered-containers, uuid
+    ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
+     , network, protobuf, random, stm, tasty, tasty-hunit, text, time
+     , unordered-containers, uuid
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.9.1.3";
-       sha256 = "b69dd264dfc8ed432b9ce22d99e19a99eaface579150fadc8593ffa3dc1b856c";
+       version = "0.10.0.0";
+       sha256 = "1800b181c0228090597d63db7fd99dc0ba434d34d5da290b1b0e22aa39510f99";
        libraryHaskellDepends = [
-         aeson async attoparsec base bytestring cereal containers network
-         protobuf random stm text time unordered-containers uuid
+         aeson async base bytestring cereal containers network protobuf
+         random stm text time unordered-containers uuid
        ];
        testHaskellDepends = [
          aeson base stm tasty tasty-hunit text time
@@ -67548,6 +67753,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exp-extended" = callPackage
+    ({ mkDerivation, base, compensated, log-domain }:
+     mkDerivation {
+       pname = "exp-extended";
+       version = "0.1.0.1";
+       sha256 = "a78427101de6fb57975be3310a3c59ba5504c3b5edef6da2b9c89fd0730b0f6d";
+       libraryHaskellDepends = [ base compensated log-domain ];
+       homepage = "http://code.mathr.co.uk/exp-extended";
+       description = "floating point with extended exponent range";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "exp-pairs" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, matrix, memoize
      , QuickCheck, random, smallcheck, tasty, tasty-hunit
@@ -68297,11 +68514,10 @@ self: {
     ({ mkDerivation, base, bytestring, hspec, QuickCheck }:
      mkDerivation {
        pname = "farmhash";
-       version = "0.1.0.3";
-       sha256 = "c6bde8e127af0dbb2b6e426ef34eb3fafe32ccb32358b8482774e6fc4ab91e7f";
+       version = "0.1.0.4";
+       sha256 = "71e43616fe48c0454db551110229bd50ca4b4625f255478cb45f4a6480e113d7";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
-       jailbreak = true;
        homepage = "https://github.com/abhinav/farmhash";
        description = "Fast hash functions";
        license = stdenv.lib.licenses.bsd3;
@@ -69899,19 +70115,20 @@ self: {
 
   "ffmpeg-light" = callPackage
     ({ mkDerivation, base, either, exceptions, ffmpeg, JuicyPixels
-     , libavcodec, libavformat, libswscale, mtl, transformers, vector
+     , libavcodec, libavdevice, libavformat, libswscale, mtl
+     , transformers, vector
      }:
      mkDerivation {
        pname = "ffmpeg-light";
-       version = "0.8.2";
-       sha256 = "dcc6f0988458c47738505a1fb16e1e5206c483a75c8a7b997e0606aea56ef38e";
+       version = "0.9.0";
+       sha256 = "309ce75c56dfef61ad0e08ef34324873b24cdeb32ae2ace406caf0e9ca788897";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base either exceptions JuicyPixels mtl transformers vector
        ];
        libraryPkgconfigDepends = [
-         ffmpeg libavcodec libavformat libswscale
+         ffmpeg libavcodec libavdevice libavformat libswscale
        ];
        executableHaskellDepends = [
          base JuicyPixels mtl transformers vector
@@ -69919,8 +70136,8 @@ self: {
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {inherit (pkgs) ffmpeg; libavcodec = null; libavformat = null; 
-         libswscale = null;};
+     }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; 
+         libavformat = null; libswscale = null;};
 
   "ffmpeg-tutorials" = callPackage
     ({ mkDerivation, base, bytestring, haskell98, hs-ffmpeg, SDL, stm
@@ -74763,8 +74980,8 @@ self: {
     ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }:
      mkDerivation {
        pname = "gearbox";
-       version = "1.0.0.3";
-       sha256 = "fd1b71bfc2ec9c3bb2bb7185fdb0c1a86fb09d0ab1e001a9864c770756dec8c8";
+       version = "1.0.0.4";
+       sha256 = "fdebdad6326aaa5202e1aece1049c06d5c5c91acd57070c5953bf141019723df";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT OpenGLRaw Vec ];
@@ -76311,6 +76528,7 @@ self: {
        libraryHaskellDepends = [
          base exceptions extensible-exceptions ghc mtl
        ];
+       doHaddock = false;
        homepage = "http://hub.darcs.net/jcpetruzza/ghc-mtl";
        description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -76873,8 +77091,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcjs-dom";
-       version = "0.2.3.0";
-       sha256 = "9ffc3bf9255196a5fbddf2ffc6320547a2a2f641d8682a4d89a51fd680f93c52";
+       version = "0.2.3.1";
+       sha256 = "dfdee3dcd46ad5707a09488ccf0d2c69dbb47d2044212aeadec0a44f3facee39";
        libraryHaskellDepends = [
          base glib gtk3 text transformers webkitgtk3
        ];
@@ -77885,6 +78103,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gitHUD" = callPackage
+    ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "gitHUD";
+       version = "1.0.0.0";
+       sha256 = "27f85577fa0826470927652a783ad8364c8cda2070a1905d3efecc5aa0e1941d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl parsec process ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "http://github.com/gbataille/gitHUD#readme";
+       description = "More efficient replacement to the great git-radar";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gitcache" = callPackage
     ({ mkDerivation, base, cryptohash, directory, filepath, process
      , utf8-string
@@ -78031,8 +78269,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-webhook-handler";
-       version = "0.0.5";
-       sha256 = "52f1bcbf4a39205f81c940342e2de45b0ac0d8d0b89942b19a9431f1fc782271";
+       version = "0.0.7";
+       sha256 = "b80ff37df283fe72e9b933b05aa4159adba8aac4ae242bbd78e40ddd45f8cce0";
        libraryHaskellDepends = [
          aeson base bytestring cryptohash github-types text transformers
          uuid vector
@@ -78047,8 +78285,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-webhook-handler-snap";
-       version = "0.0.5";
-       sha256 = "65806df9708c909a9daf5beceb9e3db4bd4258755c8e8b31b181f29a21e1b267";
+       version = "0.0.6";
+       sha256 = "ec62b61aeb429492b347ed327b14a4c1bcf44d3791ac61ee6989f8a0a608a80e";
        libraryHaskellDepends = [
          base bytestring case-insensitive github-types
          github-webhook-handler snap-core uuid
@@ -79556,6 +79794,81 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "goal-core" = callPackage
+    ({ mkDerivation, base, cairo, Chart, Chart-cairo, Chart-gtk, colour
+     , containers, data-default-class, gtk, lens
+     }:
+     mkDerivation {
+       pname = "goal-core";
+       version = "0.1";
+       sha256 = "84b932f82d35eeb3908f5c0c63c7f801de0307439794a1f2049d26bf8e346686";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cairo Chart Chart-cairo Chart-gtk colour containers
+         data-default-class gtk lens
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Core imports for Geometric Optimization Libraries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "goal-geometry" = callPackage
+    ({ mkDerivation, base, goal-core, hmatrix, vector }:
+     mkDerivation {
+       pname = "goal-geometry";
+       version = "0.1";
+       sha256 = "e0bf529b38ea7fa1ed9405db3386bd5206cced8fcc33761cfcbb220d373edc74";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base goal-core hmatrix vector ];
+       executableHaskellDepends = [ base goal-core ];
+       description = "Scientific computing on geometric objects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "goal-probability" = callPackage
+    ({ mkDerivation, base, goal-core, goal-geometry, hmatrix
+     , math-functions, mwc-random, mwc-random-monad, statistics, vector
+     }:
+     mkDerivation {
+       pname = "goal-probability";
+       version = "0.1";
+       sha256 = "d48a3518ef4de905dc0cf402dc1b658151e4394af5fc6cd23b39b3831915902d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base goal-core goal-geometry hmatrix math-functions mwc-random
+         mwc-random-monad statistics vector
+       ];
+       executableHaskellDepends = [ base goal-core goal-geometry vector ];
+       description = "Manifolds of probability distributions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "goal-simulation" = callPackage
+    ({ mkDerivation, base, cairo, clock, directory, goal-core
+     , goal-geometry, goal-probability, gtk, hmatrix, machines, mtl
+     , vector
+     }:
+     mkDerivation {
+       pname = "goal-simulation";
+       version = "0.1";
+       sha256 = "5787cc79ee00478faa9e89ac39c04b8589834c1635f31ba184f70df349678201";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cairo clock goal-core goal-geometry goal-probability gtk
+         hmatrix machines vector
+       ];
+       executableHaskellDepends = [
+         base directory goal-core goal-geometry goal-probability hmatrix mtl
+         vector
+       ];
+       description = "Mealy based simulation tools";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "goatee" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, parsec
      , template-haskell
@@ -81836,6 +82149,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gremlin-haskell" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, containers, hspec, lens
+     , lens-aeson, mtl, stm, text, unordered-containers, uuid
+     , websockets
+     }:
+     mkDerivation {
+       pname = "gremlin-haskell";
+       version = "0.1.0.1";
+       sha256 = "e73f628ffd27098147e51e301ab531ae01b964ddeaf4fa1104a508300cc15f8f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-qq base containers lens mtl stm text uuid websockets
+       ];
+       executableHaskellDepends = [
+         aeson base lens lens-aeson mtl text unordered-containers
+       ];
+       testHaskellDepends = [ aeson-qq base hspec lens lens-aeson mtl ];
+       homepage = "http://github.com/nakaji-dayo/gremlin-haskell";
+       description = "Graph database client for TinkerPop3 Gremlin Server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "grid" = callPackage
     ({ mkDerivation, base, cereal, containers, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -86207,15 +86543,15 @@ self: {
 
   "handa-opengl" = callPackage
     ({ mkDerivation, aeson, array, base, binary, data-default, GLUT
-     , OpenGL, opengl-dlp-stereo, vector-space
+     , OpenGL, opengl-dlp-stereo, split, vector-space
      }:
      mkDerivation {
        pname = "handa-opengl";
-       version = "0.1.11.2";
-       sha256 = "ccf110aae686a4a0aef749c0b05c05b8edd372f84f4cafa86f4ff6dc7dd5084d";
+       version = "0.1.13.0";
+       sha256 = "b6b357f2795366758cec289a64109e7c6b9c9a54b53f8b24ea8c73dcfe0bbbd5";
        libraryHaskellDepends = [
          aeson array base binary data-default GLUT OpenGL opengl-dlp-stereo
-         vector-space
+         split vector-space
        ];
        homepage = "https://bitbucket.org/bwbush/handa-opengl";
        description = "Utility functions for OpenGL and GLUT";
@@ -88569,6 +88905,8 @@ self: {
        pname = "haskell-names";
        version = "0.4.1";
        sha256 = "88ba49cdaf96d4e194e7ff816ffde28de3ba0883d07daccf7927d8a349c16efe";
+       revision = "1";
+       editedCabalFile = "d4674b37ad9690fec8dffd7311c6f27d6785a09914fbe1ceaa4103d05e73f741";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers data-lens-light filepath
          haskell-packages haskell-src-exts hse-cpp mtl tagged transformers
@@ -88579,6 +88917,7 @@ self: {
          haskell-packages haskell-src-exts hse-cpp mtl pretty-show tagged
          tasty tasty-golden traverse-with-class uniplate utf8-string
        ];
+       jailbreak = true;
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -88596,6 +88935,8 @@ self: {
        pname = "haskell-names";
        version = "0.5.2";
        sha256 = "eea76fb3c979cf2f5afb87beb8a4b1df6d5536ef7da8d48df79d4ea6dc18bb37";
+       revision = "1";
+       editedCabalFile = "4f45a86d9e262be3e9d08172072d57ddbcd6d6512923d0dfab26091811737c01";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers data-lens-light filepath
          haskell-packages haskell-src-exts hse-cpp mtl tagged transformers
@@ -88606,6 +88947,7 @@ self: {
          haskell-packages haskell-src-exts hse-cpp mtl pretty-show tagged
          tasty tasty-golden traverse-with-class uniplate utf8-string
        ];
+       jailbreak = true;
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -88623,6 +88965,8 @@ self: {
        pname = "haskell-names";
        version = "0.5.3";
        sha256 = "5517fc1e5d1c78a004b3b9d6f4ef8485c3f64b3227551bafb60836fa3081d518";
+       revision = "1";
+       editedCabalFile = "43a54712a54882de18c56c15e1a10a4d28ddf7d5269f194c214d322c976e4851";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers data-lens-light filepath
          haskell-packages haskell-src-exts hse-cpp mtl tagged transformers
@@ -88633,6 +88977,7 @@ self: {
          haskell-packages haskell-src-exts hse-cpp mtl pretty-show tagged
          tasty tasty-golden traverse-with-class uniplate utf8-string
        ];
+       jailbreak = true;
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -89231,6 +89576,7 @@ self: {
          pretty-hex QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 time x509
        ];
+       jailbreak = true;
        homepage = "http://github.com/GaloisInc/haskell-tor";
        description = "A Haskell Tor Node";
        license = stdenv.lib.licenses.bsd3;
@@ -89757,8 +90103,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskellscrabble";
-       version = "1.2.1";
-       sha256 = "d96c922eed1c4d008d02a4cf4ce6c4d9402dbea1e4c776f6f6e6833bb3189a92";
+       version = "1.2.2";
+       sha256 = "ceba6d9f16a052ff8164fdfafd6ce3f01c17e951794d3e5bf727531a750152e4";
        libraryHaskellDepends = [
          array arrows base containers errors listsafe mtl parsec QuickCheck
          random safe semigroups split transformers unordered-containers
@@ -90692,6 +91038,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql_0_15_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";
+       sha256 = "8eefdfca21975e215708126b805ee8ba1803e3e3ce32e5c29a1b3e5912ededf8";
+       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
+       ];
+       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
@@ -92783,6 +93160,7 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit mtl test-framework test-framework-hunit time
        ];
+       doHaddock = false;
        jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/informatikr/hedis";
@@ -93946,8 +94324,8 @@ self: {
      }:
      mkDerivation {
        pname = "hfmt";
-       version = "0.0.1.0";
-       sha256 = "78bd30bd0990c0145799a7abbd5e0ad66dfd62757bff898077b9e8adcab8661d";
+       version = "0.0.2.1";
+       sha256 = "1bf5c1e5b686af47739f8589134889812fd7313049777001acf74bae38011373";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -99093,25 +99471,25 @@ self: {
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, bytestring
      , conduit, conduit-extra, containers, deepseq, directory, filepath
      , http-conduit, http-types, optparse-applicative, parallel, process
-     , QuickCheck, resourcet, text, transformers, vector
+     , QuickCheck, resourcet, scientific, text, transformers, vector
      }:
      mkDerivation {
        pname = "hops";
-       version = "0.2.1";
-       sha256 = "00d23e9c1c536575cc3dff5eb9c0606e914f8914fec101f5b0bd6303a301fe9d";
+       version = "0.4.0";
+       sha256 = "7683f48ef77af14236a5a4f65f5292504cd1db333f76df91aab84a18925287d6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson ansi-terminal attoparsec base bytestring conduit
          conduit-extra containers deepseq directory filepath http-conduit
-         http-types optparse-applicative parallel resourcet text
+         http-types optparse-applicative parallel resourcet scientific text
          transformers vector
        ];
        testHaskellDepends = [
          aeson attoparsec base bytestring containers deepseq process
-         QuickCheck text vector
+         QuickCheck scientific text vector
        ];
-       homepage = "http://github.com/akc/hops";
+       homepage = "http://akc.is/hops";
        description = "Handy Operations on Power Series";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104509,14 +104887,14 @@ self: {
      }) {com_err = null; zephyr = null;};
 
   "htaglib" = callPackage
-    ({ mkDerivation, base, directory, filepath, HUnit, taglib
-     , test-framework, test-framework-hunit
+    ({ mkDerivation, base, bytestring, directory, filepath, HUnit
+     , taglib, test-framework, test-framework-hunit, text
      }:
      mkDerivation {
        pname = "htaglib";
-       version = "0.1.1";
-       sha256 = "8e0a2a4e7074fec8b2dd5b48c39abe95ffbab50b56b1dd7443ed4f7cd43d28e4";
-       libraryHaskellDepends = [ base ];
+       version = "1.0.0";
+       sha256 = "4d544ad9ca86b1e400393f3173d5416839440d5fefcde2b16ba2e50dd065d1fe";
+       libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ taglib ];
        testHaskellDepends = [
          base directory filepath HUnit test-framework test-framework-hunit
@@ -105751,6 +106129,41 @@ self: {
        pname = "http-client";
        version = "0.4.25";
        sha256 = "2aaefe7d75a0052b32a14cd3749c2a94602a64d87195722cebe75ebde014ec6d";
+       revision = "1";
+       editedCabalFile = "18bfde86302131a8378a0289610f8f860a0f2d1b3f58d8d450e62a79a0410c98";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "http-client_0_4_26_1" = 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.26.1";
+       sha256 = "38c264cdc0ad0dcc1f0fbd11a2fa638b55f65476ebcee0bdd9309c38fb5f1047";
+       revision = "1";
+       editedCabalFile = "8b6aa0fc4dba313afe69bc926a29a98638402f82b54fee6a9798b9bf90e83a62";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -105780,8 +106193,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.26.1";
-       sha256 = "38c264cdc0ad0dcc1f0fbd11a2fa638b55f65476ebcee0bdd9309c38fb5f1047";
+       version = "0.4.26.2";
+       sha256 = "5c06c7944da2489d0abb91f8807418e013e77610d2fd3245641f1235371e8c6d";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -106758,6 +107171,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http2_1_4_0" = 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.0";
+       sha256 = "26ffd2cb8ec5f44da3ca1c14640a356d55177ecb4e463fa6defef788902c409f";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "httpd-shed" = callPackage
     ({ mkDerivation, base, network, network-uri }:
      mkDerivation {
@@ -117772,17 +118216,19 @@ self: {
      }) {};
 
   "lambdatex" = callPackage
-    ({ mkDerivation, base, containers, directory, HaTeX, hspec, mtl
-     , QuickCheck, text, transformers
+    ({ mkDerivation, async, base, containers, directory, HaTeX, hspec
+     , mtl, QuickCheck, quickcheck-text, text, transformers
      }:
      mkDerivation {
        pname = "lambdatex";
-       version = "0.1.0.1";
-       sha256 = "c071927242a209cbcd404cd5d803da91ced655565178c8e72b438cd47a66320c";
+       version = "0.1.0.3";
+       sha256 = "d233ed18d1a6383544146832b45c0e56cbf1a95ececbb6b12963ccb27bcd4bc9";
        libraryHaskellDepends = [
-         base containers directory HaTeX mtl text transformers
+         async base containers directory HaTeX mtl text transformers
+       ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-text text
        ];
-       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "http://github.com/NorfairKing/lambdatex";
        description = "Type-Safe LaTeX EDSL";
        license = "GPL";
@@ -118175,7 +118621,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-c-quote" = callPackage
+  "language-c-quote_0_11_3" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , exception-mtl, exception-transformers, filepath, happy
      , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb
@@ -118199,6 +118645,33 @@ self: {
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "language-c-quote" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers
+     , exception-mtl, exception-transformers, filepath, happy
+     , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb
+     , symbol, template-haskell, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "language-c-quote";
+       version = "0.11.4";
+       sha256 = "5794da453deb5dbe4f875e2c16af0514f39c809895061c5bb96c7b1dd1732a89";
+       libraryHaskellDepends = [
+         array base bytestring containers exception-mtl
+         exception-transformers filepath haskell-src-meta mainland-pretty
+         mtl srcloc syb symbol template-haskell
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
+         base bytestring HUnit mainland-pretty srcloc symbol test-framework
+         test-framework-hunit
+       ];
+       doCheck = false;
+       homepage = "http://www.cs.drexel.edu/~mainland/";
+       description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "language-cil" = callPackage
@@ -118989,18 +119462,19 @@ self: {
      }) {};
 
   "language-thrift" = callPackage
-    ({ mkDerivation, base, hspec, hspec-discover, mtl, parsers
-     , QuickCheck, text, trifecta, wl-pprint
+    ({ mkDerivation, base, hspec, hspec-discover, lens, parsers
+     , QuickCheck, text, transformers, trifecta, wl-pprint
      }:
      mkDerivation {
        pname = "language-thrift";
-       version = "0.4.0.0";
-       sha256 = "5cc8e2d464065a9e388a79db912dd8fd73c2a94f150ceefc448a72986452862a";
+       version = "0.5.0.0";
+       sha256 = "3163d87531b108f0f85f3e1335cf7b755243722b9ac2e0b57f6e328dffcfca99";
        libraryHaskellDepends = [
-         base mtl parsers text trifecta wl-pprint
+         base lens parsers text transformers trifecta wl-pprint
        ];
        testHaskellDepends = [
-         base hspec hspec-discover QuickCheck text trifecta 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";
@@ -120336,6 +120810,32 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "lenz" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, transformers }:
+     mkDerivation {
+       pname = "lenz";
+       version = "0.1";
+       sha256 = "98b3aef14ca16218ecd6643812e9df5dde5c60af6e2f56f98ec523ecc0917397";
+       libraryHaskellDepends = [ base base-unicode-symbols transformers ];
+       description = "Van Laarhoven lenses";
+       license = "unknown";
+     }) {};
+
+  "lenz-template" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, containers, lenz
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "lenz-template";
+       version = "0.1";
+       sha256 = "f03ca02d69c19f34c191f7cc41a15f167cba9e60c0791069eac7cd302a5877b1";
+       libraryHaskellDepends = [
+         base base-unicode-symbols containers lenz template-haskell
+       ];
+       description = "Van Laarhoven lens templates";
+       license = "unknown";
+     }) {};
+
   "level-monad" = callPackage
     ({ mkDerivation, base, fmlist }:
      mkDerivation {
@@ -125222,8 +125722,8 @@ self: {
      }:
      mkDerivation {
        pname = "machinecell";
-       version = "3.0.0";
-       sha256 = "5930f7c4d8e0c539f93595b661ecb700506d7e03043d85cfee8ce32768ff2fa0";
+       version = "3.0.1";
+       sha256 = "a018aa83f998b5c94daf1886269fe442566039c26060e4705095b40fa3639236";
        libraryHaskellDepends = [
          arrows base free mtl profunctors semigroups
        ];
@@ -128393,8 +128893,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.3.4.1";
-       sha256 = "95725872270774d20e85e12639e3d0636f6ed6ede977dae67da168ba67baa1f9";
+       version = "0.3.5.0";
+       sha256 = "5bb84795005ae4a8f828c78127044858c9d83cb8adcd373a337b3ac4588d2d2c";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library with no dependencies";
@@ -128434,8 +128934,8 @@ self: {
     ({ mkDerivation, array, base, bytestring, containers, microlens }:
      mkDerivation {
        pname = "microlens-ghc";
-       version = "0.3.0.0";
-       sha256 = "d9bd1660bbfe8b988779c409e8fb770ebd57d0149a5b49002225033971dee67a";
+       version = "0.3.1.0";
+       sha256 = "cf9e78ca5abb459d4402a279c80ef07198d56ee4b0d51d7792dc0840e7217ef9";
        libraryHaskellDepends = [
          array base bytestring containers microlens
        ];
@@ -128501,8 +129001,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-platform";
-       version = "0.1.6.0";
-       sha256 = "7ddec415baac4a9f44d6cd1c14976990b5e9e5bc34cb399c29d2a0361b311194";
+       version = "0.1.7.0";
+       sha256 = "db74b98d8a8a0486c9f93e48ca7d9252b8f806a9bbbe9737457eeb91bb9555cd";
        libraryHaskellDepends = [
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
@@ -128547,8 +129047,8 @@ self: {
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
        pname = "microlens-th";
-       version = "0.2.1.3";
-       sha256 = "5701a5775e5204729d619dcedd81666dbd94c76574930beebb81cc943805d9a5";
+       version = "0.2.2.0";
+       sha256 = "bf52318c0898294ab356ba75f72b880b9453cbc9df809b71aeac8081105596f9";
        libraryHaskellDepends = [
          base containers microlens template-haskell
        ];
@@ -128747,8 +129247,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.2.9";
-       sha256 = "b7c8857b9384a3355b5716e2dc671a90855e24d5013786566384073e7b72ad3f";
+       version = "3.2.10";
+       sha256 = "b5d8b8a310598d952f3b4329808ef8211a6a0b224d66fcc18cef4f0a737d25f1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129705,6 +130205,30 @@ self: {
        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.0.4";
+       sha256 = "bab0205c7075337179b098b9445735033ec7b3d3e9a36730a2a085798c2eb543";
+       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
     ({ mkDerivation, base, directory, filepath, haskell98, mtl
      , utf8-string
@@ -130195,6 +130719,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-http" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, exceptions
+     , http-client, http-client-tls, http-types, monad-logger
+     , monadcryptorandom, MonadRandom, mtl, text, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-http";
+       version = "0.1.0.0";
+       sha256 = "a333b087835aa4902d0814e76fe4f32a523092fd7b13526aad415160a8317192";
+       libraryHaskellDepends = [
+         base base-compat bytestring exceptions http-client http-client-tls
+         http-types monad-logger monadcryptorandom MonadRandom mtl text
+         transformers transformers-compat
+       ];
+       homepage = "https://github.com/futurice/haskell-monad-http#readme";
+       description = "A class of monads which can do http requests";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "monad-interleave" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -131447,6 +131991,7 @@ self: {
          transformers-base
        ];
        testHaskellDepends = [ base hspec mtl old-locale text time ];
+       doHaddock = false;
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = "unknown";
@@ -139077,15 +139622,15 @@ self: {
      }) {};
 
   "open-typerep" = callPackage
-    ({ mkDerivation, base, base-orphans, constraints, mtl, syntactic
-     , tagged, template-haskell
+    ({ mkDerivation, base, constraints, mtl, syntactic, tagged
+     , template-haskell
      }:
      mkDerivation {
        pname = "open-typerep";
-       version = "0.4";
-       sha256 = "d849bf8302ba7dab351a2e1a4df679fdf4938e17cc1f81c455eb163836839caa";
+       version = "0.5";
+       sha256 = "8060a300cc6a3f72a0b3aba74574399c112362f74bbc69498203e82dd0986d22";
        libraryHaskellDepends = [
-         base base-orphans constraints mtl syntactic tagged template-haskell
+         base constraints mtl syntactic tagged template-haskell
        ];
        testHaskellDepends = [ base syntactic ];
        homepage = "https://github.com/emilaxelsson/open-typerep";
@@ -139227,8 +139772,8 @@ self: {
     ({ mkDerivation, base, binary, data-default, GLUT, OpenGL }:
      mkDerivation {
        pname = "opengl-spacenavigator";
-       version = "0.1.5.2";
-       sha256 = "5a170fb876359fde525cb11b8dc2df4465275df3a091d75e663b4b45177df5e7";
+       version = "0.1.5.4";
+       sha256 = "a6b1d313e0dce09ad4134b69df197acec6cc75ff5f3c2db9ca18cf384db64a54";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base binary data-default GLUT OpenGL ];
@@ -141531,8 +142076,8 @@ self: {
     ({ mkDerivation, base, containers, lens, pandoc-types }:
      mkDerivation {
        pname = "pandoc-lens";
-       version = "0.3.3";
-       sha256 = "69502fc2630bb482ed4211b9966a0446403af59ee4cab78dd89cebe11b236cdc";
+       version = "0.4.1";
+       sha256 = "bd319f64abf3ebaac915e20135aadb06ab1f77ab562f7bac87580ceda37fc12d";
        libraryHaskellDepends = [ base containers lens pandoc-types ];
        homepage = "http://github.com/bgamari/pandoc-lens";
        description = "Lenses for Pandoc documents";
@@ -145516,6 +146061,7 @@ 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;
@@ -145523,7 +146069,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-template" = callPackage
+  "persistent-template_2_1_4" = callPackage
     ({ mkDerivation, aeson, aeson-extra, base, bytestring, containers
      , ghc-prim, hspec, http-api-data, monad-control, monad-logger
      , path-pieces, persistent, QuickCheck, tagged, template-haskell
@@ -145543,6 +146089,32 @@ 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
+  "persistent-template" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
+     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
+     , path-pieces, persistent, QuickCheck, tagged, template-haskell
+     , text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "persistent-template";
+       version = "2.1.5";
+       sha256 = "d732a0e8114dae29874f3536592effc1626aea15ebef47f3355a4b426020acd1";
+       libraryHaskellDepends = [
+         aeson aeson-compat base bytestring containers ghc-prim
+         http-api-data monad-control monad-logger path-pieces persistent
+         tagged template-haskell text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec persistent QuickCheck text transformers
+       ];
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
@@ -145852,6 +146424,8 @@ self: {
        pname = "pgstream";
        version = "0.1.0.3";
        sha256 = "8f694b3f0e537fe61ae4d9904d4200f0c4e0c4010583b6e25157a481e2d66a7d";
+       revision = "1";
+       editedCabalFile = "6b08ae7064272e58cb3d6cd8df606d3d376de019febcffd042f8bbded7300426";
        libraryHaskellDepends = [
          async attoparsec base blaze-builder bytestring conduit
          conduit-extra deepseq mtl parallel postgresql-binary
@@ -145860,7 +146434,7 @@ self: {
          uuid vector
        ];
        jailbreak = true;
-       description = "Elsen Accelerated Computing Engine";
+       description = "Streaming Postgres bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -145937,10 +146511,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne";
-       version = "0.0.1.0";
-       sha256 = "c95571f5da2e8bf383f473a3750a4d1538bb543b3ad46e26d62218a56604f5fe";
-       revision = "1";
-       editedCabalFile = "a65bbf3246f27cbf6bff03bbb436b87e6ab05185b458d47159836a1e5815c621";
+       version = "0.0.1.1";
+       sha256 = "ccd94c94aa1c9b2bc435d49ba8c6049f8e747edd2c766c748b794081771f0b29";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -145948,7 +146520,6 @@ self: {
          containers directory filepath gtk3 hslogger HStringTemplate
          MissingH mtl parsec process resourcet safe text transformers
        ];
-       homepage = "under construction";
        description = "ghci debug viewer with simple editor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146322,10 +146893,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinch";
-       version = "0.1.0.1";
-       sha256 = "ed3ddee8deb594279d6759170144d23a445a49e93c5562da13322d6005ef58c7";
-       revision = "1";
-       editedCabalFile = "59a14772df78b19d44944e872c557184b631b29dcd60c478fceb33a7bc8e9696";
+       version = "0.1.0.2";
+       sha256 = "39add08af0cea1f818708fc69ecab07112b04aed575ab2724ced55e13ddf02ea";
        libraryHaskellDepends = [
          array base bytestring containers deepseq hashable text
          unordered-containers vector
@@ -146334,12 +146903,34 @@ self: {
          base bytestring containers hspec hspec-discover QuickCheck text
          unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/abhinav/pinch";
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pinch_0_2_0_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "pinch";
+       version = "0.2.0.0";
+       sha256 = "6f37594c6df1fb0539c3d44413db57869b5d450a201655141784c01c177dc5aa";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq ghc-prim hashable text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec hspec-discover QuickCheck text
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/abhinav/pinch";
+       description = "An alternative implementation of Thrift for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pinchot" = callPackage
     ({ mkDerivation, base, containers, Earley, lens, template-haskell
      , transformers
@@ -148172,8 +148763,8 @@ self: {
      }:
      mkDerivation {
        pname = "pointfree";
-       version = "1.1";
-       sha256 = "8e153171438680bb87b32283233eea2b1ba69406b15dc7c5a1d2a0b891557c52";
+       version = "1.1.1.1";
+       sha256 = "b7c12470eab0a9390f2de69f8860296cb7260ce57a40cb868aec717720479e7a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -148186,7 +148777,6 @@ self: {
          array base containers haskell-src-exts HUnit QuickCheck
          transformers
        ];
-       jailbreak = true;
        description = "Tool for refactoring expressions into pointfree form";
        license = "unknown";
      }) {};
@@ -148197,8 +148787,8 @@ self: {
      }:
      mkDerivation {
        pname = "pointful";
-       version = "1.0.6";
-       sha256 = "13f3e2a07a6ee08265607149918ae8436e7537dbeb32de56a1cc3c2286f72c94";
+       version = "1.0.7";
+       sha256 = "4a884725d0e4e5771ae1d653fd1b4948ccd8d290910a22a1318bb32a53fcef15";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155115,8 +155705,8 @@ self: {
      }:
      mkDerivation {
        pname = "rdf4h";
-       version = "1.3.5";
-       sha256 = "dfbe6dd5f6e26e7af696981bd2a9b51a601ba86779cbeb9da67552d923160f7e";
+       version = "1.3.6";
+       sha256 = "59b3f7a1893b1ec2c4ce967dd98d1dd1541e57ce1a697810d3b8fec27d21b1da";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155315,8 +155905,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-banana";
-       version = "1.0.0.0";
-       sha256 = "8fd90599b197d6df46c16bdcc308b6577a6a677fb77274f88401cb383b5016ec";
+       version = "1.0.0.1";
+       sha256 = "a2f50eff5ddce60303fa365a9d24c9062877e59c0f98bdfd84c2f5d71e16340b";
        libraryHaskellDepends = [
          base containers hashable pqueue transformers unordered-containers
          vault
@@ -156021,20 +156611,19 @@ self: {
     ({ mkDerivation, base, bytestring, bytestring-mmap, clock
      , criterion, deepseq, exceptions, filepath, gitrev, loop, mtl
      , optparse-applicative, primitive, profunctors, QuickCheck, random
-     , reedsolomon, statistics, tasty, tasty-ant-xml, tasty-hunit
-     , tasty-quickcheck, vector
+     , statistics, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck
+     , vector
      }:
      mkDerivation {
        pname = "reedsolomon";
-       version = "0.0.2.0";
-       sha256 = "f1e61e07374a43ba48d2e8a152a451328ea343432009681c80a87cce8cd85d1c";
+       version = "0.0.3.0";
+       sha256 = "553b52e35c3d8890673ec7053dde4d2187b121ac6191019a47477a38b72b902e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring exceptions gitrev loop mtl primitive profunctors
          vector
        ];
-       librarySystemDepends = [ reedsolomon ];
        executableHaskellDepends = [
          base bytestring bytestring-mmap clock criterion deepseq filepath
          optparse-applicative random statistics vector
@@ -156044,12 +156633,11 @@ self: {
          QuickCheck random tasty tasty-ant-xml tasty-hunit tasty-quickcheck
          vector
        ];
-       jailbreak = true;
        homepage = "http://github.com/NicolasT/reedsolomon";
        description = "Reed-Solomon Erasure Coding in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {reedsolomon = null;};
+     }) {};
 
   "reenact" = callPackage
     ({ mkDerivation, base, hamid, HCodecs, stm, time, vector-space }:
@@ -156095,6 +156683,7 @@ self: {
        version = "0.4";
        sha256 = "26c9d963f1ff3bb28840465d16a390ba13f0a3ded8f473d7c890a174b6910ce5";
        libraryHaskellDepends = [ base stm transformers ];
+       doHaddock = false;
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "A type class for monads with references using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -156511,6 +157100,8 @@ self: {
        pname = "reform-blaze";
        version = "0.2.4.1";
        sha256 = "d4acf094d75cef125e9d587646b9bbb66ce927b43ed16c99738f11e80569678b";
+       revision = "1";
+       editedCabalFile = "abe598582e2e9627ce899e3fe47c1d495da157d0059115aca220beecee6a05f1";
        libraryHaskellDepends = [
          base blaze-html blaze-markup reform text
        ];
@@ -156599,7 +157190,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "regex-applicative" = callPackage
+  "regex-applicative_0_3_2_1" = callPackage
     ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit
      , tasty-smallcheck, transformers
      }:
@@ -156615,6 +157206,25 @@ self: {
        homepage = "https://github.com/feuerbach/regex-applicative";
        description = "Regex-based parsing with applicative interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "regex-applicative" = callPackage
+    ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit
+     , tasty-smallcheck, transformers
+     }:
+     mkDerivation {
+       pname = "regex-applicative";
+       version = "0.3.3";
+       sha256 = "6659a2cc1c8137d77ef57f75027723b075d473354d935233d98b1ae1b03c3be6";
+       libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [
+         base containers smallcheck tasty tasty-hunit tasty-smallcheck
+         transformers
+       ];
+       homepage = "https://github.com/feuerbach/regex-applicative";
+       description = "Regex-based parsing with applicative interface";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "regex-applicative-text" = callPackage
@@ -156729,7 +157339,6 @@ self: {
          base containers logict mtl regex-tdfa sbv stream-monad text
        ];
        executableHaskellDepends = [ base containers mtl regex-tdfa sbv ];
-       jailbreak = true;
        homepage = "https://github.com/audreyt/regex-genex";
        description = "From a regex, generate all possible strings it can match";
        license = "unknown";
@@ -158347,17 +158956,17 @@ self: {
 
   "resolve-trivial-conflicts" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory
-     , filepath, mtl, process, unix
+     , filepath, mtl, optparse-applicative, process, unix
      }:
      mkDerivation {
        pname = "resolve-trivial-conflicts";
-       version = "0.3.1.2";
-       sha256 = "067c40b2d83a5804285065443659606a1188542d80615c009dc228d68a55dee1";
+       version = "0.3.2.1";
+       sha256 = "692b81bf392cadaa29c2257e272071e79a58f010b0e947db85620e3321ba0865";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal base base-compat Diff directory filepath mtl process
-         unix
+         ansi-terminal base base-compat Diff directory filepath mtl
+         optparse-applicative process unix
        ];
        homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
        description = "Remove trivial conflict markers in a git repository";
@@ -160236,6 +160845,7 @@ self: {
          base bytestring containers HUnit QuickCheck tasty tasty-hunit
          tasty-quickcheck text
        ];
+       doCheck = false;
        homepage = "http://github.com/markhibberd/riak-haskell-client";
        description = "A Haskell client for the Riak decentralized data store";
        license = "unknown";
@@ -162517,7 +163127,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "sbv" = callPackage
+  "sbv_4_4" = callPackage
     ({ mkDerivation, array, async, base, containers, crackNum
      , data-binary-ieee754, deepseq, directory, filepath, HUnit, mtl
      , old-time, pretty, process, QuickCheck, random, syb
@@ -162540,9 +163150,10 @@ self: {
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "sbv_5_7" = callPackage
+  "sbv" = callPackage
     ({ mkDerivation, array, async, base, base-compat, containers
      , crackNum, data-binary-ieee754, deepseq, directory, filepath
      , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb
@@ -162567,7 +163178,6 @@ self: {
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbvPlugin" = callPackage
@@ -162577,17 +163187,16 @@ self: {
      }:
      mkDerivation {
        pname = "sbvPlugin";
-       version = "0.3";
-       sha256 = "095f50de108abc82047d13404a30990aaa71c66f5f71238fee7e909ccfe52a71";
+       version = "0.5";
+       sha256 = "7675dfa9a1d1fc8030f04b2eb595601b39090f04c89f5b9b9d5e297588d0b85d";
        libraryHaskellDepends = [
          base containers ghc ghc-prim mtl sbv template-haskell
        ];
        testHaskellDepends = [
          base directory filepath process tasty tasty-golden
        ];
-       jailbreak = true;
        homepage = "http://github.com/LeventErkok/sbvPlugin";
-       description = "Analyze Haskell expressions using SBV/SMT";
+       description = "Formally prove properties of Haskell programs using SBV/SMT";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -166605,6 +167214,8 @@ self: {
        pname = "sets";
        version = "0.0.5";
        sha256 = "78772618d3a85cbf91a20f0289eb833c4304d6a93c78bb266c38b60e85d2717b";
+       revision = "1";
+       editedCabalFile = "6a3f99b425c6a4ed373e1f1d2836a40b09e462f4e2744b76227f27a133acb34e";
        libraryHaskellDepends = [
          base commutative composition containers contravariant hashable
          invariant keys mtl QuickCheck semigroupoids semigroups transformers
@@ -169215,10 +169826,8 @@ self: {
     ({ mkDerivation, base, bytestring, simpleirc }:
      mkDerivation {
        pname = "simpleirc-lens";
-       version = "0.1.0.0";
-       sha256 = "c53316ceaa2a17ad21b086c2c2dda7fb0ef8e7c45cd9af3f7aaf1f886efe2453";
-       revision = "2";
-       editedCabalFile = "618750d5b230316747d59d784bd40481a4404443316fc9c3a73e1349e3d10975";
+       version = "0.2.0.0";
+       sha256 = "7c09809b424c5cbee69d38d516d88eb21dcfb11ae31a06c2673a284f87a5bfb2";
        libraryHaskellDepends = [ base bytestring simpleirc ];
        homepage = "https://github.com/relrod/simpleirc-lens";
        description = "Lenses for simpleirc types";
@@ -170058,8 +170667,8 @@ self: {
      }:
      mkDerivation {
        pname = "sloane";
-       version = "4.1.2";
-       sha256 = "3b02c1a095e23ba872bd8757bf0ef91362ce342f83e873496fe9166b639a09cc";
+       version = "4.2.0";
+       sha256 = "cd2bf21a9ea502ded331780b074991e4b5e06e7b276a6874c9b921bc70ba3595";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -170068,7 +170677,7 @@ self: {
          optparse-applicative resourcet stringsearch terminal-size text
          transformers
        ];
-       homepage = "http://github.com/akc/sloane";
+       homepage = "http://akc.is/sloane";
        description = "A command line interface to Sloane's OEIS";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -170102,6 +170711,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "slug" = callPackage
+    ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent
+     , QuickCheck, test-framework, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "slug";
+       version = "0.1.1";
+       sha256 = "4512ca905017cc32a03e757b4cfc21e232dd35c671a068615b89de01d80bcec2";
+       libraryHaskellDepends = [
+         aeson base exceptions path-pieces persistent text
+       ];
+       testHaskellDepends = [
+         base exceptions path-pieces QuickCheck test-framework
+         test-framework-quickcheck2 text
+       ];
+       homepage = "https://github.com/mrkkrp/slug";
+       description = "Type-safe slugs for Yesod ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smallarray" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, hashable }:
      mkDerivation {
@@ -173641,8 +174270,8 @@ self: {
      }:
      mkDerivation {
        pname = "splot";
-       version = "0.3.12";
-       sha256 = "36260828f0f616fad7b99eb6b53ab4ee6136b53683b264e88635ff3ca3b86576";
+       version = "0.3.14";
+       sha256 = "77b8b2bbe99a21ac0c5b2f7b7cc5cf079302501ebebc4b77fa557ab071e178ed";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -174801,7 +175430,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
-  "stack" = callPackage
+  "stack_0_1_10_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base
      , base16-bytestring, base64-bytestring, bifunctors, binary
      , binary-tagged, blaze-builder, byteable, bytestring, Cabal
@@ -174857,6 +175486,75 @@ self: {
          monad-logger optparse-applicative path process QuickCheck resourcet
          retry temporary text transformers unix-compat
        ];
+       jailbreak = true;
+       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;
+       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, email-validate, 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.0";
+       sha256 = "cd2f606d390fe521b6ba0794de87edcba64c4af66856af09594907c2b4f4751d";
+       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 email-validate 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;
@@ -174916,6 +175614,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stack-run" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, conduit
+     , conduit-extra, directory, filepath, MissingH, projectroot
+     }:
+     mkDerivation {
+       pname = "stack-run";
+       version = "0.1.0.0";
+       sha256 = "cf128c392f5ab5fff66ae818b0cdf739767b518ba4db94b2db537490657f629d";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-terminal base bytestring Cabal conduit conduit-extra directory
+         filepath MissingH projectroot
+       ];
+       homepage = "https://github.com/yamadapc/stack-run";
+       description = "An equivalent to cabal run for stack";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stack-run-auto" = callPackage
     ({ mkDerivation, async, base, extract-dependencies, file-modules
      , lens, lens-aeson, MissingH, process, stm-containers, text, time
@@ -176224,7 +176941,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stm" = callPackage
+  "stm_2_4_4" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "stm";
@@ -176233,6 +176950,18 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "stm" = callPackage
+    ({ mkDerivation, array, base }:
+     mkDerivation {
+       pname = "stm";
+       version = "2.4.4.1";
+       sha256 = "8f999095ed8d50d2056fc6e185035ee8166c50751e1af8de02ac38d382bf3384";
+       libraryHaskellDepends = [ array base ];
+       description = "Software Transactional Memory";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "stm-channelize" = callPackage
@@ -177052,14 +177781,14 @@ self: {
      }:
      mkDerivation {
        pname = "streaming";
-       version = "0.1.3.4";
-       sha256 = "1a23959815ca3396521c850df6b90f6d8941eddab67e6512634fead2c9c29c5a";
+       version = "0.1.4.0";
+       sha256 = "063a14c2ce512b3265ae69d45f208d4c01ca6da9325fa9e471a1fd1acd968e3c";
        libraryHaskellDepends = [
          base bytestring containers exceptions mmorph mtl resourcet time
          transformers transformers-base
        ];
        homepage = "https://github.com/michaelt/streaming";
-       description = "an elementary streaming prelude and a general stream type";
+       description = "an elementary streaming prelude and general stream type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -177069,8 +177798,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-bytestring";
-       version = "0.1.3.0";
-       sha256 = "6573ebde6c87e608c0b82b02c25ac15094b93f1e99bd57aab275ca68d2630a13";
+       version = "0.1.4.0";
+       sha256 = "121f5dbbac81fd7f74bc6c1b5f3a2ee2d99d6c38c5f772442baa44c5e29d737c";
        libraryHaskellDepends = [
          base bytestring deepseq exceptions mmorph mtl resourcet streaming
          transformers transformers-base
@@ -177380,17 +178109,19 @@ self: {
 
   "streaming-utils" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client
-     , http-client-tls, json-stream, mtl, pipes, streaming
+     , http-client-tls, json-stream, mtl, pipes, resourcet, streaming
      , streaming-bytestring, transformers
      }:
      mkDerivation {
        pname = "streaming-utils";
-       version = "0.1.3.0";
-       sha256 = "f591d4e31aada0be4b0b9ac28b23a6b16d3c26db0f37b3ccb9e05239ab81e75b";
+       version = "0.1.4.0";
+       sha256 = "ab0c080387b29d8fd116944b560700fa37a23d38d33ab56813a64d74546de00e";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring http-client http-client-tls
-         json-stream mtl pipes streaming streaming-bytestring transformers
+         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;
@@ -178406,8 +179137,8 @@ self: {
      }:
      mkDerivation {
        pname = "subleq-toolchain";
-       version = "0.1.8.4";
-       sha256 = "96ad146348d72277bb2ad567011edee12cdab4c88a8f196d758d635b0b236003";
+       version = "0.1.8.5";
+       sha256 = "6a993ee41a0a4b55ee0f9bde633c092d656ee053c7e12fc97b82f42b2e1babc6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers lens mtl parsec pretty ];
@@ -179440,16 +180171,17 @@ self: {
 
   "syntactic" = callPackage
     ({ mkDerivation, base, constraints, containers, data-hash, deepseq
-     , mtl, QuickCheck, tagged, tasty, tasty-golden, tasty-quickcheck
-     , tasty-th, template-haskell, tree-view, utf8-string
+     , mtl, QuickCheck, syb, tagged, tasty, tasty-golden
+     , tasty-quickcheck, tasty-th, template-haskell, tree-view
+     , utf8-string
      }:
      mkDerivation {
        pname = "syntactic";
-       version = "3.2.1";
-       sha256 = "4e7a38e32637364913a6bc4f9f802fdcb7b5eb21f2a9a2083356f12e1129df46";
+       version = "3.4";
+       sha256 = "93490ba1c33c4580187f6bf739ce43bae9dce3abee539deffc6d351769111a6e";
        libraryHaskellDepends = [
-         base constraints containers data-hash deepseq mtl template-haskell
-         tree-view
+         base constraints containers data-hash deepseq mtl syb
+         template-haskell tree-view
        ];
        testHaskellDepends = [
          base containers mtl QuickCheck tagged tasty tasty-golden
@@ -180302,8 +181034,8 @@ self: {
     ({ mkDerivation, base, bytestring, network, transformers, unix }:
      mkDerivation {
        pname = "systemd";
-       version = "1.0.0";
-       sha256 = "d69fd0def965bfbd63bb6b27e74e24240d662f15dfb69d64ea6b9052018f3e82";
+       version = "1.0.2";
+       sha256 = "5235db71cd2ed14a77003c2c659582dee64f504f4de1af9ceab72f00af4cc2aa";
        libraryHaskellDepends = [
          base bytestring network transformers unix
        ];
@@ -180830,7 +181562,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tagsoup" = callPackage
+  "tagsoup_0_13_5" = callPackage
     ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "tagsoup";
@@ -180842,6 +181574,21 @@ self: {
        homepage = "http://community.haskell.org/~ndm/tagsoup/";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tagsoup" = callPackage
+    ({ mkDerivation, base, bytestring, containers, text }:
+     mkDerivation {
+       pname = "tagsoup";
+       version = "0.13.6";
+       sha256 = "a8358c8c09b73912c4e832248d7543e4fddaf4ac9305f5f27d0854b9410d6ac8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring containers text ];
+       homepage = "http://community.haskell.org/~ndm/tagsoup/";
+       description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "tagsoup-ht" = callPackage
@@ -183438,6 +184185,8 @@ self: {
        pname = "text";
        version = "1.2.0.3";
        sha256 = "1d38bc0a8bf60c2f3581558a7870d6db7eefbe6da5df4d80a42c9b4837f8f986";
+       revision = "1";
+       editedCabalFile = "1ad163864f042122ba30e6707a3e4ffe8f2b7f69c2b24db365a478fbe1e3f119";
        libraryHaskellDepends = [
          array base bytestring deepseq ghc-prim integer-gmp
        ];
@@ -183463,6 +184212,8 @@ self: {
        pname = "text";
        version = "1.2.0.4";
        sha256 = "865dbb8e824c197cdda6a15e8764c057335febe05573a764e54867460e0b9700";
+       revision = "1";
+       editedCabalFile = "ee605e146a984f0f9ea30b9e8d92a93a765f1bcc1fa6b6d23e0487fc3f210f0b";
        libraryHaskellDepends = [
          array base bytestring deepseq ghc-prim integer-gmp
        ];
@@ -183488,6 +184239,8 @@ self: {
        pname = "text";
        version = "1.2.0.6";
        sha256 = "d8fd82e876b4d1f2f4c25605adde2092308524a246fb4b3f4f665d73aaf56f73";
+       revision = "1";
+       editedCabalFile = "1d5d0c706835f1ca74925cd3b0aa025bf4ee0fd795581b6038c13cd030fddb47";
        libraryHaskellDepends = [
          array base bytestring deepseq ghc-prim integer-gmp
        ];
@@ -183496,6 +184249,34 @@ self: {
          QuickCheck quickcheck-unicode random test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       doCheck = false;
+       homepage = "https://github.com/bos/text";
+       description = "An efficient packed Unicode text type";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "text_1_2_1_3" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq
+     , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
+     , quickcheck-unicode, random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "text";
+       version = "1.2.1.3";
+       sha256 = "98364c94f259ec95e380e44bde90b37708ec6f0d45eb9efe821ab67959e9f83f";
+       revision = "1";
+       editedCabalFile = "0f5b6a2f9204089b6cc58071b92e9f2fc3e6d773e3aa486b4a66bf25e124712a";
+       libraryHaskellDepends = [
+         array base binary bytestring deepseq ghc-prim integer-gmp
+       ];
+       testHaskellDepends = [
+         array base binary bytestring deepseq directory ghc-prim HUnit
+         integer-gmp QuickCheck quickcheck-unicode random test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       doCheck = false;
        homepage = "https://github.com/bos/text";
        description = "An efficient packed Unicode text type";
        license = stdenv.lib.licenses.bsd3;
@@ -183510,8 +184291,8 @@ self: {
      }:
      mkDerivation {
        pname = "text";
-       version = "1.2.1.3";
-       sha256 = "98364c94f259ec95e380e44bde90b37708ec6f0d45eb9efe821ab67959e9f83f";
+       version = "1.2.2.0";
+       sha256 = "3fb3921488b4c10f1a389f4ad1a1ae44cf1a6d1ce4305a55d1d7c745cff50088";
        libraryHaskellDepends = [
          array base binary bytestring deepseq ghc-prim integer-gmp
        ];
@@ -183520,6 +184301,7 @@ self: {
          integer-gmp QuickCheck quickcheck-unicode random test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       doCheck = false;
        homepage = "https://github.com/bos/text";
        description = "An efficient packed Unicode text type";
        license = stdenv.lib.licenses.bsd3;
@@ -184862,10 +185644,8 @@ self: {
      }:
      mkDerivation {
        pname = "these";
-       version = "0.6.1.0";
-       sha256 = "a8e9e677b72ab4ea4e922b860abdd5f61ac69cb66e7c9f060f08ac94110f2d0d";
-       revision = "2";
-       editedCabalFile = "40a48f80ea0b180829df3b2eef9c29947f3567998d24e4efff75a1fd9949b0e0";
+       version = "0.6.2.0";
+       sha256 = "9802c398812396525789156b39e23dcb03fe3d218d588f33700386897993bee7";
        libraryHaskellDepends = [
          base bifunctors containers data-default-class hashable mtl
          profunctors semigroupoids semigroups transformers
@@ -184875,7 +185655,6 @@ self: {
          base bifunctors containers hashable QuickCheck quickcheck-instances
          tasty tasty-quickcheck transformers unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/isomorphism/these";
        description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
        license = stdenv.lib.licenses.bsd3;
@@ -185670,6 +186449,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "time-parsers" = callPackage
+    ({ mkDerivation, attoparsec, base, bifunctors, parsec, parsers
+     , tasty, tasty-hunit, template-haskell, text, time
+     }:
+     mkDerivation {
+       pname = "time-parsers";
+       version = "0.1.0.0";
+       sha256 = "e4eb246c3d97e69785a26ecd91381b4cf80e4d1d4313381ad68861b7e72ccff8";
+       libraryHaskellDepends = [ base parsers template-haskell time ];
+       testHaskellDepends = [
+         attoparsec base bifunctors parsec parsers tasty tasty-hunit
+         template-haskell text time
+       ];
+       homepage = "https://github.com/phadej/time-parsers#readme";
+       description = "Parsers for types in `time`";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "time-patterns" = callPackage
     ({ mkDerivation, base, intervals, lens, thyme, vector-space }:
      mkDerivation {
@@ -185941,8 +186738,8 @@ self: {
      }:
      mkDerivation {
        pname = "timeplot";
-       version = "1.0.29";
-       sha256 = "3deb70a5e5be09c4380f63522576dff71ad5aeb923cb15250961c1423d1cfd06";
+       version = "1.0.31";
+       sha256 = "8dc8e4901b4b2f84c654d34f6721762bb662697b89dcfad969180a00820254b2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -185950,7 +186747,6 @@ self: {
          containers data-default lens regex-tdfa strptime template-haskell
          time transformers vcs-revision
        ];
-       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Timeplot";
        description = "A tool for visualizing time series from log files";
        license = stdenv.lib.licenses.bsd3;
@@ -187163,8 +187959,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "tracy";
-       version = "0.1.0.0";
-       sha256 = "33e4e073bead5fa93236a23e47ab76ca6b38a74d33ada8af25a84ae446e1c3d9";
+       version = "0.1.2.0";
+       sha256 = "29e1a75da8bcf1029d6e918f6b681ba401fe41e01d3bace52852d7d35759b431";
        libraryHaskellDepends = [ base ];
        description = "Convenience wrappers for non-intrusive debug tracing";
        license = stdenv.lib.licenses.mit;
@@ -190307,7 +191103,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "unbound-generics" = callPackage
+  "unbound-generics_0_2" = callPackage
     ({ mkDerivation, base, containers, contravariant, deepseq, mtl
      , profunctors, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell, transformers, transformers-compat
@@ -190326,9 +191122,10 @@ self: {
        homepage = "http://github.com/lambdageek/unbound-generics";
        description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "unbound-generics_0_3" = callPackage
+  "unbound-generics" = callPackage
     ({ mkDerivation, base, containers, contravariant, deepseq, mtl
      , profunctors, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell, transformers, transformers-compat
@@ -190347,7 +191144,6 @@ self: {
        homepage = "http://github.com/lambdageek/unbound-generics";
        description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbounded-delays_0_1_0_8" = callPackage
@@ -194140,8 +194936,8 @@ self: {
     ({ mkDerivation, base, binary, data-default-class, deepseq }:
      mkDerivation {
        pname = "verbosity";
-       version = "0.2.0.0";
-       sha256 = "495d515a29366317af0936b6d5113354552816f2acbf2587dcbf99688b239b6f";
+       version = "0.2.1.0";
+       sha256 = "faa4121629a8e397572bb61a37e0dd95e281f68c5f779eb7ee756517796f39d3";
        libraryHaskellDepends = [ base binary data-default-class deepseq ];
        homepage = "https://github.com/trskop/verbosity";
        description = "Simple enum that encodes application verbosity";
@@ -194489,6 +195285,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "visibility" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "visibility";
+       version = "0.1.0.0";
+       sha256 = "bdac4ba5246e3a1e8759d3c0d886f0671e3baf962479e67b44888412a9dd7784";
+       libraryHaskellDepends = [ base containers ];
+       homepage = "https://github.com/LukaHorvat/visibility";
+       description = "Simple computation of visibility polygons";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "vision" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath, glib
      , gtk, json, MonadCatchIO-transformers, mtl, parsec, PSQueue, stm
@@ -194703,8 +195511,8 @@ self: {
     ({ mkDerivation, base, vrpn }:
      mkDerivation {
        pname = "vrpn";
-       version = "0.2.1.0";
-       sha256 = "eb79f54712078283ce181e33b4fdac12b42bed7abe6d8c79b28e55771613754b";
+       version = "0.2.1.3";
+       sha256 = "3268782b9412fe9cc3757dcaea0d9756ef9db4c80ea4004065df548384109d68";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -195011,6 +195819,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-accept-language" = callPackage
+    ({ mkDerivation, base, bytestring, file-embed, http-types, text
+     , wai, wai-app-static, wai-extra, warp, word8
+     }:
+     mkDerivation {
+       pname = "wai-accept-language";
+       version = "0.1.0.1";
+       sha256 = "d0d3f3e9c45edfa0c6f05e7d58091806825a1e02261d70cb448dc146480a4a31";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring http-types text wai wai-extra word8
+       ];
+       executableHaskellDepends = [
+         base file-embed wai wai-app-static warp
+       ];
+       homepage = "https://github.com/mitsuji/wai-accept-language";
+       description = "Rewrite based on Accept-Language header";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wai-app-file-cgi" = callPackage
     ({ mkDerivation, array, attoparsec, attoparsec-conduit, base
      , blaze-builder, blaze-html, bytestring, case-insensitive, conduit
@@ -195022,15 +195851,15 @@ self: {
      }:
      mkDerivation {
        pname = "wai-app-file-cgi";
-       version = "3.0.8";
-       sha256 = "bdf0d1c9f563772c362f62f02d0bffbc2bc395642921e370bd39e50e9126b229";
+       version = "3.0.9";
+       sha256 = "947a818500ef5b1f2c1868d15a6a1054a3abb9e83ddfcacfb0d66d4e78ea308d";
        libraryHaskellDepends = [
          array attoparsec attoparsec-conduit base blaze-builder blaze-html
          bytestring case-insensitive conduit conduit-extra containers
          data-default-class directory filepath http-client http-conduit
          http-date http-types io-choice lifted-base mime-types network
          process sockaddr static-hash text transformers unix wai wai-conduit
-         word8
+         warp word8
        ];
        testHaskellDepends = [
          base bytestring conduit conduit-extra directory doctest filepath
@@ -198278,8 +199107,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.1.11";
-       sha256 = "f62ef8b6bd0402d99867cd207cad608b1904b7b88d84db9800f34eae37eb809c";
+       version = "3.1.12";
+       sha256 = "2a913a576d175e49b206e680b75f4823c7f90f45d8ba89aa57aae9c40d3298e1";
        libraryHaskellDepends = [
          array auto-update base blaze-builder bytestring bytestring-builder
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -201023,7 +201852,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wreq" = callPackage
+  "wreq_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base16-bytestring, base64-bytestring, byteable, bytestring
      , case-insensitive, containers, cryptohash, directory, doctest
@@ -201058,6 +201887,46 @@ self: {
        homepage = "http://www.serpentine.com/wreq";
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wreq" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec
+     , authenticate-oauth, base, base16-bytestring, base64-bytestring
+     , byteable, bytestring, case-insensitive, containers, cryptohash
+     , directory, doctest, exceptions, filepath, ghc-prim, hashable
+     , http-client, http-client-tls, http-types, HUnit, lens, lens-aeson
+     , mime-types, network-info, psqueues, QuickCheck, snap-core
+     , snap-server, template-haskell, temporary, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , time-locale-compat, transformers, unix-compat
+     , unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "wreq";
+       version = "0.4.1.0";
+       sha256 = "3b8409e2fb7670d7060fdaa780008eeecb08e9b65bdab9d9690d8d26e5cb8e6d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec authenticate-oauth base base16-bytestring byteable
+         bytestring case-insensitive containers cryptohash exceptions
+         ghc-prim hashable http-client http-client-tls http-types lens
+         lens-aeson mime-types psqueues template-haskell text time
+         time-locale-compat unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring bytestring
+         case-insensitive containers directory doctest filepath hashable
+         http-client http-types HUnit lens lens-aeson network-info
+         QuickCheck snap-core snap-server temporary test-framework
+         test-framework-hunit test-framework-quickcheck2 text time
+         transformers unix-compat uuid vector
+       ];
+       doCheck = false;
+       homepage = "http://www.serpentine.com/wreq";
+       description = "An easy-to-use HTTP client library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "wreq-sb" = callPackage
@@ -201269,8 +202138,8 @@ self: {
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
        pname = "wx";
-       version = "0.92.1.0";
-       sha256 = "282f18d34c69cb0139ffd0728bfa97e52dfe4f325e7829ca0c76112b3e2bd408";
+       version = "0.92.2.0";
+       sha256 = "a1d02b17cd336f0c435381c9f2ce74aad2059c56a00c678954089b74065a97fb";
        libraryHaskellDepends = [ base stm time wxcore ];
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell";
@@ -201313,13 +202182,13 @@ self: {
     ({ mkDerivation, base, libX11, mesa, split, wxdirect, wxGTK }:
      mkDerivation {
        pname = "wxc";
-       version = "0.92.1.1";
-       sha256 = "e458be811c10a0ba56deb567c56c3b71579b8c923188236c1de8ccf844c1a602";
+       version = "0.92.2.0";
+       sha256 = "e0da20807bafb22d51a0922211da11eb428b2a6661cb53bc98f6e17be9775191";
        libraryHaskellDepends = [ base split wxdirect ];
        librarySystemDepends = [ libX11 mesa ];
        libraryPkgconfigDepends = [ wxGTK ];
        doHaddock = false;
-       postInstall = "cp -v dist/build/libwxc.so.0.92.1.1 $out/lib/libwxc.so";
+       postInstall = "cp -v dist/build/libwxc.so.0.92.2.0 $out/lib/libwxc.so";
        postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs";
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell C++ wrapper";
@@ -201334,8 +202203,8 @@ self: {
      }:
      mkDerivation {
        pname = "wxcore";
-       version = "0.92.1.0";
-       sha256 = "ac621ea45ad61cbf1a91eb717f51a72d34d6ecc7925a161d90cf4ea7f3df73d6";
+       version = "0.92.2.0";
+       sha256 = "76128916c5d5df9cea9fc1e1b3b56d800d87874a431e98fca4427cb41cfe283e";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath parsec stm time
          wxc wxdirect
@@ -201353,8 +202222,8 @@ self: {
      }:
      mkDerivation {
        pname = "wxdirect";
-       version = "0.92.1.0";
-       sha256 = "33b78dd1ea76131a4f89e1482345ba707b4f7ebcee924a12113ed08f177b0edd";
+       version = "0.92.2.0";
+       sha256 = "2303834061c544f7e32ffd7aaf91e644ee89e178487689f109f06625f0eefd3b";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -202782,8 +203651,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-conduit-parse";
-       version = "0.3.0.0";
-       sha256 = "facc29025b4e969bfa0cb7bbaf68220c95404740d8a11f60b17ebdb31e170f36";
+       version = "0.3.1.0";
+       sha256 = "62a8aacdd03e216cc1f89882205b933016c0aebe2ed3e113a966c5956ec572d5";
        libraryHaskellDepends = [
          base conduit conduit-parse containers exceptions parsers text
          xml-conduit xml-types
@@ -204834,8 +205703,8 @@ self: {
      }:
      mkDerivation {
        pname = "yes-precure5-command";
-       version = "5.5.1";
-       sha256 = "6d49ed24d3d3358b390abd5f19b0c59b95fbb59398222c63886ba2aec18fb828";
+       version = "5.5.2";
+       sha256 = "19ed62fa3277ce1356005bd8715f41526057dd152c9a2c3ab18158431ff0c52a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From 9ca37a8a4b4e10d36c072cecd8729ba4a1928c26 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 26 Dec 2015 12:52:47 +0100
Subject: [PATCH 109/249] haskell-text: doCheck=false override is now generated
 by hackage2nix

This is necessary to break an finite recursion in the test suite dependencies.
---
 pkgs/development/haskell-modules/configuration-common.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c2ed3647113..642757e66da 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -43,11 +43,6 @@ self: super: {
   options_1_2 = dontCheck super.options_1_2;
   options = dontCheck super.options;
   statistics = dontCheck super.statistics;
-  text_1_1_1_3 = dontCheck super.text_1_1_1_3;
-  text_1_2_0_3 = dontCheck super.text_1_2_0_3;
-  text_1_2_0_4 = dontCheck super.text_1_2_0_4;
-  text_1_2_0_6 = dontCheck super.text_1_2_0_6;
-  text = dontCheck super.text;
   c2hs = if pkgs.stdenv.isDarwin then dontCheck super.c2hs else super.c2hs;
 
   # The package doesn't compile with ruby 1.9, which is our default at the moment.

From 1a07ecf9c5b832963842201f60727ca67df4f22c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Dec 2015 13:25:45 +0100
Subject: [PATCH 110/249] Add LTS Haskell 3.20.

---
 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 ab3a1e06393..7a44d9303bd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -313,6 +313,9 @@ rec {
     lts-3_19 = packages.ghc7102.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.19.nix { };
     };
+    lts-3_20 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.20.nix { };
+    };
 
   };
 }

From 919d44d29ffa5aa2ea499f97f1bf1a7009366fbc Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 28 Dec 2015 00:02:44 +0200
Subject: [PATCH 111/249] openssh: Compile with '--with-pid-dir' to improve
 build purity

The configure script tries to probe whether /var/run exists when
determining the location for the pid file, which is not very nice when
doing chroot builds. Just set it explicitly to avoid the problem.

For reference, the culprit in configure.ac:
````
piddir=/var/run
if test ! -d $piddir ; then
        piddir=`eval echo ${sysconfdir}`
        case $piddir in
                NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;;
        esac
fi

AC_ARG_WITH([pid-dir],
        [  --with-pid-dir=PATH     Specify location of ssh.pid file],
...

````

Also, use the `install-nokeys` target in installPhase so we avoid
installing useless host keys into $out/etc/ssh and improve built purity
as well.
---
 pkgs/tools/networking/openssh/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 2004e453a0d..67bf5be7d5b 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
   # properly when cross building.
   configureFlags = [
     "--localstatedir=/var"
+    "--with-pid-dir=/run"
     "--with-mantype=man"
     "--with-libedit=yes"
     "--disable-strip"
@@ -61,6 +62,7 @@ stdenv.mkDerivation rec {
     cp contrib/ssh-copy-id.1 $out/share/man/man1/
   '';
 
+  installTargets = [ "install-nokeys" ];
   installFlags = [
     "sysconfdir=\${out}/etc/ssh"
   ];

From 36a08ce5a0e2fea1efea62ecf518fed1eba58f3e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 28 Dec 2015 11:44:03 -0600
Subject: [PATCH 112/249] arpack: 3.2.0 -> 3.3.0

---
 .../libraries/science/math/arpack/default.nix | 23 ++++++++-----------
 .../science/math/arpack/openblas-libdir.patch | 11 ---------
 .../libraries/science/math/arpack/series      |  1 -
 3 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/arpack/openblas-libdir.patch
 delete mode 100644 pkgs/development/libraries/science/math/arpack/series

diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 13bf512b32d..c9f9bcfa9a7 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -1,33 +1,30 @@
-{ stdenv, lib, copyPathsToStore, fetchurl, gfortran, openblas }:
+{ stdenv, lib, copyPathsToStore, fetchurl, autoconf, automake, gettext, libtool
+, gfortran, openblas }:
 
 with stdenv.lib;
 
 let
-  version = "3.2.0";
+  version = "3.3.0";
 in
 stdenv.mkDerivation {
   name = "arpack-${version}";
 
   src = fetchurl {
     url = "https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz";
-    sha256 = "1fwch6vipms1ispzg2djvbzv5wag36f1dmmr3xs3mbp6imfyhvff";
+    sha256 = "1cz53wqzcf6czmcpfb3vb61xi0rn5bwhinczl65hpmbrglg82ndd";
   };
 
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  postPatch = ''
-    substituteInPlace arpack.pc.in --replace "@openblas@" "${openblas}/lib"
-  '';
-
+  nativeBuildInputs = [ autoconf automake gettext libtool ];
   buildInputs = [ gfortran openblas ];
 
-  # Auto-detection fails because gfortran brings in BLAS by default
-  configureFlags = [
-    "--with-blas=-lopenblas"
-    "--with-lapack=-lopenblas"
-  ];
+  BLAS_LIBS = "-L${openblas}/lib -lopenblas";
 
   FFLAGS = optional openblas.blas64 "-fdefault-integer-8";
 
+  preConfigure = ''
+    ./bootstrap
+  '';
+
   meta = {
     homepage = "http://github.com/opencollab/arpack-ng";
     description = ''
diff --git a/pkgs/development/libraries/science/math/arpack/openblas-libdir.patch b/pkgs/development/libraries/science/math/arpack/openblas-libdir.patch
deleted file mode 100644
index 421f8e85f5f..00000000000
--- a/pkgs/development/libraries/science/math/arpack/openblas-libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: arpack-ng-3.2.0/arpack.pc.in
-===================================================================
---- arpack-ng-3.2.0.orig/arpack.pc.in
-+++ arpack-ng-3.2.0/arpack.pc.in
-@@ -5,5 +5,5 @@ libdir=@libdir@
- Name: arpack
- Description: ARPACK-NG 
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -larpack @BLAS_LIBS@ @LAPACK_LIBS@
-+Libs: -L@openblas@ -L${libdir} -larpack @BLAS_LIBS@ @LAPACK_LIBS@
- Cflags: 
diff --git a/pkgs/development/libraries/science/math/arpack/series b/pkgs/development/libraries/science/math/arpack/series
deleted file mode 100644
index 6ac0b3286ef..00000000000
--- a/pkgs/development/libraries/science/math/arpack/series
+++ /dev/null
@@ -1 +0,0 @@
-openblas-libdir.patch

From b863b5fc3595d4de69ffdf1732416b625286a72c Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Mon, 28 Dec 2015 20:28:48 +0100
Subject: [PATCH 113/249] Remove yasnippet's manual derivation

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index fe57a2f122a..3a75f2a9fd1 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1984,29 +1984,6 @@ let
     };
   };
 
-  yasnippet = melpaBuild rec {
-    pname = "yasnippet";
-    version = "0.8.1";
-    src = fetchFromGitHub {
-      owner  = "capitaomorte";
-      repo   = pname;
-      rev    = "01139a2deb9eda272b9b771fbbe15d096061efa4";
-      sha256 = "1b0bxzkmw7yd1yf6326zf52aq63n283vy57pysj8cc34d9bk6nnk";
-    };
-    meta = {
-      description = "A template system for Emacs";
-      longDescription = ''
-        YASnippet is a template system for Emacs.
-        It allows you to type an abbreviation and automatically expand it into
-        function templates. Bundled language templates include: C, C++, C#,
-        Perl, Python, Ruby, SQL, LaTeX, HTML, CSS and more.
-        The snippet syntax is inspired from TextMate's syntax, you can even import
-        most TextMate templates to YASnippet.
-      '';
-      license = gpl2Plus;
-    };
-  };
-
   zenburn-theme = melpaBuild rec {
     pname   = "zenburn-theme";
     version = "2.2";

From fddf0dfa49676812f8867c336d465cda8017fcfe Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Mon, 28 Dec 2015 20:29:54 +0100
Subject: [PATCH 114/249] Remove deferred's manual derivation

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 3a75f2a9fd1..17610ddb232 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -473,28 +473,6 @@ let
     };
   };
 
-  deferred = melpaBuild rec {
-    version = "0.3.2";
-    pname = "deferred";
-
-    src = fetchFromGitHub {
-      owner = "kiwanami";
-      repo = "emacs-${pname}";
-      rev = "896d4b53210289afe489e1ee7db4e12cb9248109";
-      sha256 = "0ysahdyvlg240dynwn23kk2d9kb432zh2skr1gydm3rxwn6f18r0";
-    };
-
-    meta = {
-      description = "Simple asynchronous functions for emacs-lisp";
-      longDescription = ''
-        deferred.el provides facilities to manage asynchronous tasks.
-        The API and implementations were translated from JSDeferred (by cho45)
-         and Mochikit.Async (by Bob Ippolito) in JavaScript.
-      '';
-      license = gpl3Plus;
-    };
-  };
-
   diminish = melpaBuild rec {
     pname   = "diminish";
     version = "0.44";

From 4e4931507b9ad5c1fdd2335149a900cd5a8710a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 28 Dec 2015 22:27:47 +0100
Subject: [PATCH 115/249] fix mesos build, fixes #11638

---
 .../networking/cluster/mesos/default.nix      |    2 +-
 .../cluster/mesos/fetch-mesos-deps.sh         | 2359 +++++++++--------
 .../networking/cluster/mesos/mesos-deps.nix   |    2 +-
 3 files changed, 1210 insertions(+), 1153 deletions(-)

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 0651f729cdc..cb6be73ec9b 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
   dontDisableStatic = true;
 
   src = fetchurl {
-    url = "http://archive.apache.org/dist/mesos/${version}/${name}.tar.gz";
+    url = "mirror://apache/mesos/${version}/${name}.tar.gz";
     sha256 = "1v5xpn4wal4vcrvcklchx9slkpa8xlwqkdbnxzy9zkzpq5g3arxr";
   };
 
diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
index 3fafc427bbc..bcdae83839f 100644
--- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
+++ b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
@@ -9,1235 +9,1292 @@ function fetchArtifact {
   curl --fail --location --insecure --retry 3 --max-redirs 20 "$url" --output "$out/$repoPath"
 }
 
-fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar
-fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom.sha1
-fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom
-fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1
-fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1
-fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom
-fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1
-fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar.sha1
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom
-fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom
-fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar
-fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom
-fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1
-fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar.sha1
-fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom
-fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar
-fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom.sha1
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1
-fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom
-fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar
-fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1
-fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar
-fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom
-fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1
+fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar
+fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar
+fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar
+fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar
+fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar
+fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar
+fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar
+fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar
+fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar
+fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar
+fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar
+fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar
+fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar
+fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar
+fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar
+fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar
+fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar
+fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar
+fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar
+fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar
+fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1
+fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom
+fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1
+fetchArtifact asm/asm/3.2/asm-3.2.pom
+fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1
+fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar
+fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1
+fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom
+fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1
+fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar
+fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1
+fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom
+fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1
+fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom
+fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1
+fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar
+fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1
+fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom
+fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1
+fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom
+fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1
+fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom
+fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1
+fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom
+fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1
+fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar
+fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1
+fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom
+fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1
+fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar
+fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1
+fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom
+fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1
+fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom
+fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1
+fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar
+fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1
+fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
+fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1
+fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar
+fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom
+fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1
+fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar
 fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom
 fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1
+fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar
+fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1
+fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
+fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1
+fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom
+fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1
+fetchArtifact com/google/google/1/google-1.pom
+fetchArtifact com/google/google/1/google-1.pom.sha1
+fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar
+fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1
+fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom
+fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1
+fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom
+fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1
+fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar
+fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar.sha1
+fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom
+fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom.sha1
+fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar
+fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1
+fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom
+fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1
+fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom
+fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1
+fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar
+fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1
+fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom
+fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1
+fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar
+fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1
+fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom
+fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom.sha1
+fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar
+fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1
+fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom
+fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1
+fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar
+fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1
+fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom
+fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1
+fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar
+fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1
+fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom
+fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1
+fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom
+fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1
+fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom
+fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1
+fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar
+fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar.sha1
+fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom
+fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1
+fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar
+fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1
+fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom
+fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1
+fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar
+fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1
+fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom
+fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1
+fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar
+fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1
+fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom
+fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1
+fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar
+fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1
+fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom
+fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1
+fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar
+fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1
+fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom
+fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1
+fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar
+fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar.sha1
+fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom
+fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom.sha1
+fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar
+fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1
+fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom
+fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1
+fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar
+fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1
+fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom
+fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1
+fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar
+fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1
+fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom
+fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1
 fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar
 fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar.sha1
 fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom
 fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1
 fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar
+fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1
 fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1
-fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom
-fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1
-fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1
-fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar
-fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom
-fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1
+fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1
 fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom
 fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom
 fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1
 fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1
-fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1
+fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom
+fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1
 fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom
-fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom
-fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1
+fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1
 fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar
-fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar.sha1
+fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
+fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1
+fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom
+fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1
 fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom
 fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1
-fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar
-fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom
-fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1
-fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1
-fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom.sha1
-fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar
-fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar.sha1
-fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom
-fetchArtifact com/google/google/1/google-1.pom
-fetchArtifact com/google/google/1/google-1.pom.sha1
-fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom
-fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar
-fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom
-fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1
+fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar
+fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1
+fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom
+fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1
+fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar
+fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1
+fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom
+fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1
+fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar
+fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1
 fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom
 fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom.sha1
-fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1
-fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar
-fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar
-fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1
-fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1
-fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1
-fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom
-fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1
-fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom
-fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1
-fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1
-fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1
-fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom
-fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1
-fetchArtifact asm/asm/3.2/asm-3.2.pom
-fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1
-fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1
-fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar
-fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1
-fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom
-fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1
-fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar
-fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom
-fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1
-fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom
-fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1
-fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1
-fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom
-fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar
-fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1
-fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1
-fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom
-fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1
-fetchArtifact velocity/velocity/1.5/velocity-1.5.pom.sha1
-fetchArtifact velocity/velocity/1.5/velocity-1.5.jar
-fetchArtifact velocity/velocity/1.5/velocity-1.5.pom
-fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom
-fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1
-fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar
-fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1
-fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom
-fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1
-fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom
-fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1
-fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar
-fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1
-fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1
-fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom
-fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar
-fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1
-fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1
-fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom
-fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1
-fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom
-fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1
+fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar
+fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1
+fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom
+fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1
+fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom
+fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1
+fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom
+fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1
+fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
+fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1
+fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom
+fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1
+fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar
+fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1
+fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom
+fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1
+fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom
+fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1
+fetchArtifact junit/junit/4.10/junit-4.10.pom
+fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1
+fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom
+fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1
+fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar
+fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1
+fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom
+fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1
+fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom
+fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1
+fetchArtifact org/apache/apache/10/apache-10.pom
+fetchArtifact org/apache/apache/10/apache-10.pom.sha1
+fetchArtifact org/apache/apache/11/apache-11.pom
+fetchArtifact org/apache/apache/11/apache-11.pom.sha1
+fetchArtifact org/apache/apache/13/apache-13.pom
+fetchArtifact org/apache/apache/13/apache-13.pom.sha1
+fetchArtifact org/apache/apache/2/apache-2.pom
+fetchArtifact org/apache/apache/2/apache-2.pom.sha1
+fetchArtifact org/apache/apache/3/apache-3.pom
+fetchArtifact org/apache/apache/3/apache-3.pom.sha1
+fetchArtifact org/apache/apache/4/apache-4.pom
+fetchArtifact org/apache/apache/4/apache-4.pom.sha1
+fetchArtifact org/apache/apache/5/apache-5.pom
+fetchArtifact org/apache/apache/5/apache-5.pom.sha1
+fetchArtifact org/apache/apache/6/apache-6.pom
+fetchArtifact org/apache/apache/6/apache-6.pom.sha1
+fetchArtifact org/apache/apache/7/apache-7.pom
+fetchArtifact org/apache/apache/7/apache-7.pom.sha1
+fetchArtifact org/apache/apache/9/apache-9.pom
+fetchArtifact org/apache/apache/9/apache-9.pom.sha1
+fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar
+fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1
+fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom
+fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1
+fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom
+fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1
+fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom
+fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1
+fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom
+fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1
+fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom
+fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1
+fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom
+fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1
 fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar
-fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1
+fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1
+fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom
+fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1
 fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom
-fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1
+fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1
+fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom
+fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1
+fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar
+fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1
+fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom
+fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1
 fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom
+fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1
 fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom
 fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1
-fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1
-fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom
-fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar
-fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom.sha1
-fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom
-fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1
-fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1
-fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom
-fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar
-fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom.sha1
-fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom
-fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom.sha1
-fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom
-fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom.sha1
-fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar
-fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1
-fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom
-fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1
-fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1
-fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom
-fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom.sha1
-fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom
-fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1
-fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom.sha1
-fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar
-fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom
-fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar
-fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom
-fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom
-fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar
-fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom
-fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar
-fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom
-fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar
-fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom
-fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar
-fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar
-fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom
-fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar
-fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom
-fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom
-fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom
-fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar
-fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar
-fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom
-fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar
-fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom
-fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar
-fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom
-fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom
-fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom
-fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar
-fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom
-fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom
-fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar
-fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar
-fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom
-fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom
-fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom
-fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom
-fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom
-fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom
-fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom
-fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom
-fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom
-fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom
-fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom
-fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom
-fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom
-fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom
-fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom
-fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom
-fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom
-fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom
-fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar.sha1
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar
-fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar
-fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom
-fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1
-fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom.sha1
-fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom
-fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom
-fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom
-fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom
-fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom
-fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom
-fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom
-fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom
-fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom
-fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom
-fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom
-fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom
-fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom
-fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom
-fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
-fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom
-fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom
-fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom
-fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom
-fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom
-fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom
-fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom
-fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom
-fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom
-fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom
-fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom
-fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom
-fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom
-fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom
-fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom
-fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom
-fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom
-fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom
-fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom
-fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1
-fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar
-fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar
-fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar.sha1
-fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom
-fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom
-fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom
-fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom
-fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1
-fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom
-fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1
 fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom
+fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1
 fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom
 fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1
 fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom
 fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom
+fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1
 fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar
 fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1
-fetchArtifact org/apache/apache/7/apache-7.pom
-fetchArtifact org/apache/apache/7/apache-7.pom.sha1
-fetchArtifact org/apache/apache/2/apache-2.pom
-fetchArtifact org/apache/apache/2/apache-2.pom.sha1
-fetchArtifact org/apache/apache/4/apache-4.pom
-fetchArtifact org/apache/apache/4/apache-4.pom.sha1
-fetchArtifact org/apache/apache/9/apache-9.pom
-fetchArtifact org/apache/apache/9/apache-9.pom.sha1
-fetchArtifact org/apache/apache/13/apache-13.pom
-fetchArtifact org/apache/apache/13/apache-13.pom.sha1
-fetchArtifact org/apache/apache/3/apache-3.pom
-fetchArtifact org/apache/apache/3/apache-3.pom.sha1
-fetchArtifact org/apache/apache/5/apache-5.pom
-fetchArtifact org/apache/apache/5/apache-5.pom.sha1
-fetchArtifact org/apache/apache/6/apache-6.pom.sha1
-fetchArtifact org/apache/apache/6/apache-6.pom
-fetchArtifact org/apache/apache/11/apache-11.pom
-fetchArtifact org/apache/apache/11/apache-11.pom.sha1
-fetchArtifact org/apache/apache/10/apache-10.pom
-fetchArtifact org/apache/apache/10/apache-10.pom.sha1
-fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar
-fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1
-fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom
-fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom
-fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom
-fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom
-fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom
-fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom
-fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar
-fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1
-fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom
-fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom
-fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom
-fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar
-fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1
-fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom
-fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1
-fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1
-fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom
-fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar
-fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1
-fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1
-fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom
-fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom
-fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom.sha1
-fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar
-fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1
-fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom.sha1
-fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom
+fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom
+fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1
+fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom
+fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom
+fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom
+fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom
+fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom
+fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom
+fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom
+fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom
+fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom
+fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom
+fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1
+fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom
+fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom
+fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar
+fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom
+fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar
+fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom
+fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar
+fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom
+fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar
+fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1
+fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom
+fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom
+fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom
+fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar
+fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom
+fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom
+fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar
+fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom
+fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom
+fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom
+fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
+fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom
+fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom
+fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom
+fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar
+fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom
+fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar
+fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom
+fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom
+fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom
+fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom
+fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom
+fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar
+fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom
+fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom
+fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar
+fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom
+fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom
+fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom
+fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom
+fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1
+fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom
+fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom
+fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar
+fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom
+fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar
+fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom
+fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom
+fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom
+fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom
+fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom
+fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom
+fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom
+fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom
+fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom
+fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom
+fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom
+fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom
+fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom
+fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom
+fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom
+fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1
+fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom
+fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom
+fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom
+fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom
+fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom
+fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom
+fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom
+fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom
+fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom
+fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom
+fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar
+fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom
+fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom
+fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar
+fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom
+fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom
+fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom
+fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom
+fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar
+fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom
+fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom
+fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar
+fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom
+fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom
+fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom
+fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom
+fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom
+fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar
+fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom
+fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom
+fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar
+fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom
+fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom
+fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom
+fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1
+fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom
+fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom
+fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1
+fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar
+fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom
+fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1
+fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom
+fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar
+fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar
+fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom
+fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar
+fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom
+fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar
+fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom
+fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar
+fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom
+fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar
+fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom
+fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar
+fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom
+fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom
+fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom
+fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom
+fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom
+fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar
+fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom
+fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar
+fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom
+fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar
+fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom
+fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar
+fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom
+fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar
+fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom
+fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom.sha1
+fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar
+fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar.sha1
+fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom
+fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar
+fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar
+fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1
+fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom
+fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1
+fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar
+fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1
+fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom
+fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar
+fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom
+fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom
+fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar
+fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom
+fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar
+fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom
+fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom
+fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar
+fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom
+fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom
+fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar
+fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom
+fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom
+fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar
+fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1
+fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom
+fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.sha1
+fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar
+fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar.sha1
+fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom
+fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom.sha1
+fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom
+fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1
+fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar
+fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1
+fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom
+fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom.sha1
+fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar
+fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1
+fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom
+fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom
+fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom
+fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom
+fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom
+fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom
+fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar
+fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1
+fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom
+fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom.sha1
+fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar
+fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar.sha1
+fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom
+fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom.sha1
+fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar
+fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1
+fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom
+fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom.sha1
+fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom
+fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1
+fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom
+fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom.sha1
+fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar
+fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1
+fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom
+fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom.sha1
+fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar
+fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1
+fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom
+fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom.sha1
+fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar
+fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1
+fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom
+fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1
+fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom
+fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1
+fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar
+fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1
+fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom
+fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom.sha1
+fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar
+fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1
+fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom
+fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom.sha1
+fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom
+fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1
+fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom
+fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1
+fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom
+fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1
+fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar
+fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1
+fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom
+fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1
 fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom
-fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom
-fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar
-fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom.sha1
+fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar
+fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1
+fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom
+fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom.sha1
+fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom
+fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom
+fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom
+fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom
+fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom
+fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom
+fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
+fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom
+fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom
+fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom
+fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
+fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom
+fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom
+fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom
+fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom
+fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom
+fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom
+fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom
+fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom
+fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom
+fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar
+fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom
+fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar
+fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom
+fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar
+fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom
+fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom
+fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom
+fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar
+fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom
+fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1
 fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom
 fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.sha1
 fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom
 fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom
+fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1
 fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom
 fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar
 fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
 fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar
-fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom
+fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom
+fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar
+fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom
+fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom
+fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom
+fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar
 fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1
 fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar
 fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1
 fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1
 fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom
+fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar
+fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom
+fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar
+fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom
+fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom
+fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar
+fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom
+fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom.sha1
 fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom
 fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1
 fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar
 fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar
+fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1
 fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar
 fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1
 fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom
 fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1
 fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1
 fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom
 fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom
-fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar
-fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar
-fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom
-fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom
-fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
-fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom
-fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
-fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom
-fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom
+fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1
+fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar
+fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1
+fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom
+fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1
 fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar
 fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar.sha1
 fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom
+fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom.sha1
+fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom
+fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1
 fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar
 fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1
-fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1
-fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom
+fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom
+fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1
 fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom
 fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom.sha1
-fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar
-fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom
-fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1
-fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1
-fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1
-fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom
+fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar
+fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1
 fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom
 fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1
-fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1
-fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar
-fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1
 fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom
-fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1
-fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom
-fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom.sha1
-fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom
-fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom
-fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom
-fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1
+fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1
+fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar
+fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1
+fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom
+fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1
+fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar
+fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1
+fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom
+fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1
+fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar
+fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1
+fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom
+fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1
+fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom
+fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1
+fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom
+fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1
+fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar
+fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1
+fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom
+fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1
+fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom
+fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1
+fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar
+fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1
+fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom
+fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1
+fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar
+fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1
+fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom
+fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1
 fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom
+fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1
+fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom
+fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1
 fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom
 fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom
-fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom
-fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom
-fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom
-fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom
-fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom
+fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom
+fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1
+fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar
+fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1
+fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom
+fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1
+fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom
+fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1
+fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom
+fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1
+fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom
+fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1
+fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom
+fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1
+fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom
+fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1
+fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom
+fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom.sha1
+fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom
+fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1
 fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar
 fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1
 fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom
 fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1
 fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom
 fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1
+fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom
+fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1
 fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar
+fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1
 fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom
-fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom
-fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom
-fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom
-fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom
-fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1
-fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1
-fetchArtifact junit/junit/4.10/junit-4.10.pom
-fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom
-fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1
-fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1
-fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom
-fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom
-fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1
-fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar
-fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1
-fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom
-fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1
-fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1
-fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom
-fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom
-fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1
-fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1
-fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1
-fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
-fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom
-fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom
-fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar
-fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1
-fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom.sha1
+fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1
+fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom
+fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1
+fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom
+fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1
+fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar
+fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1
+fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom
+fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1
+fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom
+fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1
+fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar
+fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1
+fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom
+fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1
+fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom
+fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1
+fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom
+fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1
+fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom
+fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1
+fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom
+fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1
+fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom
+fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1
+fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom
+fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1
+fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar
+fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1
+fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom
+fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1
 fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar
+fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1
+fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom
+fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom.sha1
+fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar
+fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1
+fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom
+fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1
+fetchArtifact velocity/velocity/1.5/velocity-1.5.jar
+fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1
+fetchArtifact velocity/velocity/1.5/velocity-1.5.pom
+fetchArtifact velocity/velocity/1.5/velocity-1.5.pom.sha1
+fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar
+fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1
+fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom
+fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1
+fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
+fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1
+fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom
+fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1
+fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar
+fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1
+fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom
+fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1
+fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom
+fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1
 
 stopNest
diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
index 7f60dab2def..f8d5dd2c9d6 100644
--- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
+++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "03qjq481ly5ajynlr9iqvrjra5fvv2jz4wp2f3in5vnxa61inrrk";
+  outputHash = "12c6z5yvp60v57f6nijifp14i56bb5614hac1qg528s9liaf8vml";
 
   buildInputs = [ curl ];
 

From af25cc9427e66fe31b1cdc755badae50c3aa08f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 28 Dec 2015 22:39:22 +0100
Subject: [PATCH 116/249] fix virtviewer build

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

diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index 2fe7e0bcc23..a6e3dfff060 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
 , libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl
-, gsettings_desktop_schemas, makeWrapper
+, gsettings_desktop_schemas, makeWrapper, numactl
 , spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation  {
   };
 
   buildInputs = [ 
-    pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl
+    pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl numactl
     shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper
   ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ];
 

From 876a182b662e05b38046da6b3df1783374a49e02 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 Dec 2015 10:10:51 +0000
Subject: [PATCH 117/249] libvirt: fix including libpcap

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 2c31ef323f2..1c90b06f5b1 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig libxml2 gnutls perl python readline
     gettext libtasn1 libgcrypt yajl makeWrapper
-    libxslt xhtml1 perlPackages.XMLXPath curl
+    libxslt xhtml1 perlPackages.XMLXPath curl libpcap
   ] ++ stdenv.lib.optionals stdenv.isLinux [
     libpciaccess devicemapper lvm2 utillinux udev libcap_ng libnl numad numactl
   ] ++ stdenv.lib.optionals stdenv.isDarwin [

From 4e225b61d250100adcb46861788bef7d908baeeb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 Dec 2015 10:57:52 +0000
Subject: [PATCH 118/249] libvirt: add xen support

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 1c90b06f5b1..9e69bb8d56f 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -2,7 +2,7 @@
 , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
-, curl, libiconv, gmp
+, curl, libiconv, gmp, xen
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
     gettext libtasn1 libgcrypt yajl makeWrapper
     libxslt xhtml1 perlPackages.XMLXPath curl libpcap
   ] ++ stdenv.lib.optionals stdenv.isLinux [
-    libpciaccess devicemapper lvm2 utillinux udev libcap_ng libnl numad numactl
+    libpciaccess devicemapper lvm2 utillinux udev libcap_ng
+    libnl numad numactl xen
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
      libiconv gmp
   ];

From 8260022a1bf7c4a63b095ad96eeb36c1e7786c84 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 Dec 2015 11:39:13 +0000
Subject: [PATCH 119/249] libvirt-glib: 0.2.0 -> 0.2.3

This also fixes the build with the xen-supporting libvirt and removes
obsolete workarounds.
---
 .../libraries/libvirt-glib/default.nix        | 23 ++++---------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 39b05380472..ae83ce78d5f 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -1,36 +1,21 @@
 { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl
 , nettle, libgcrypt, python, pygobject, gobjectIntrospection, libcap_ng, numactl
+, xen
 }:
 
 stdenv.mkDerivation rec {
-  name = "libvirt-glib-0.2.0";
+  name = "libvirt-glib-0.2.3";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/glib/${name}.tar.gz";
-    sha256 = "02saqkk4wzsimsan7s9yc5bx05xn7j00hnxhq4sczkgr4krf1drh";
+    sha256 = "1pahj8qa7k2307sd57rwqwq1hijya02v0sxk91hl3cw48niimcf3";
   };
 
   buildInputs = [
     pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
-    python pygobject gobjectIntrospection libcap_ng numactl
+    python pygobject gobjectIntrospection libcap_ng numactl xen
   ];
 
-  # Compiler flag -fstack-protector-all fixes this build error:
-  #
-  #   ./.libs/libvirt-glib-1.0.so: undefined reference to `__stack_chk_guard'
-  #
-  # And the extra include path fixes this build error:
-  #
-  #   In file included from ../libvirt-gobject/libvirt-gobject-domain-device.h:30:0,
-  #                    from /tmp/nix-build-libvirt-glib-0.1.7.drv-2/libvirt-glib-0.1.7/libvirt-gobject/libvirt-gobject.h:33,
-  #                    from <stdin>:4:
-  #   ../libvirt-gobject/libvirt-gobject-domain.h:33:29: fatal error: libvirt/libvirt.h: No such file or directory
-  #   compilation terminated.
-  #   make[3]: *** [LibvirtGObject-1.0.gir] Error 1
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="-fstack-protector-all -I${libvirt}/include"
-  '';
-
   meta = with stdenv.lib; {
     description = "Library for working with virtual machines";
     longDescription = ''

From 729fb7a44062c6878d5e20e49dd9b827ca8a8605 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 Dec 2015 12:08:10 +0000
Subject: [PATCH 120/249] virt-viewer: fix build and clean up

---
 .../virtualization/virt-viewer/default.nix    | 25 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  3 ++-
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index a6e3dfff060..f63eeb60306 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
 , libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl
-, gsettings_desktop_schemas, makeWrapper, numactl
+, gsettings_desktop_schemas, makeWrapper, xen, numactl
 , spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
 }:
 
@@ -9,25 +9,20 @@ assert spiceSupport ->
 
 with stdenv.lib;
 
-let sourceInfo = rec {
-    baseName="virt-viewer";
-    version="2.0";
-    name="${baseName}-${version}";
-    url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
-    hash="0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9";
-}; in
-
-stdenv.mkDerivation  {
-  inherit (sourceInfo) name version;
+stdenv.mkDerivation rec {
+  baseName = "virt-viewer";
+  version = "2.0";
+  name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+    url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
+    sha256 = "0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9";
   };
 
-  buildInputs = [ 
-    pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl numactl
+  buildInputs = [
+    pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl
     shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper
+    xen numactl
   ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ];
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05a1525fd4b..e8ceb32a499 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13469,7 +13469,7 @@ let
 
   neovim-pygui = pythonPackages.neovim_gui;
 
-  virtviewer = callPackage ../applications/virtualization/virt-viewer {
+  virt-viewer = callPackage ../applications/virtualization/virt-viewer {
     gtkvnc = gtkvnc.override { enableGTK3 = true; };
     spice_gtk = spice_gtk.override { enableGTK3 = true; };
   };
@@ -15865,6 +15865,7 @@ aliases = with self; rec {
   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
 };
 
 tweakAlias = _n: alias: with lib;

From 0bd5a83403881fe996f9d6944815a4027dfdc562 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 Dec 2015 23:16:05 +0000
Subject: [PATCH 121/249] libosinfo: 0.2.11 -> 0.2.12

Unbreaks gnome-boxes 3.18
---
 pkgs/development/libraries/libosinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index 7c103d76bd5..83873cc3660 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libosinfo-0.2.11";
+  name = "libosinfo-0.2.12";
 
   src = fetchurl {
     url = "https://fedorahosted.org/releases/l/i/libosinfo/${name}.tar.gz";
-    sha256 = "0889zvidhmpk3nd7c1xhh3fkk9i014dkr6zdlddh89kbflva2sxv";
+    sha256 = "1vcg8ylh7q69s9y6hj94dqfffwfbann3i28yqgfc01navf6yl07s";
   };
 
   buildInputs = [

From 8eede9e41ecdd18b93388fb044eef445eb19ada3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 Dec 2015 23:16:59 +0000
Subject: [PATCH 122/249] gnome-boxes, libguestfs: fix builds due to libvirt

Adds link time dependencies which are now used in libvirt and unbreaks
these packages
---
 pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix | 6 +++---
 pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix | 6 +++---
 pkgs/development/libraries/libguestfs/default.nix       | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

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
index 10eaa34a8a2..2c670b00f8a 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
@@ -2,8 +2,8 @@
 , 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
-, libusb, libarchive, acl
+, desktop_file_utils, mtools, cdrkit, libcdio, libgudev
+, libusb, libarchive, acl, xen, numactl
 }:
 
 # TODO: ovirt (optional)
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     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
+    librsvg desktop_file_utils acl libgudev xen numactl
   ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
index 90955bd3ccf..6f5af374dbc 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
@@ -2,8 +2,8 @@
 , 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
-, libusb, libarchive, acl
+, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
+, libusb, libarchive, acl, libgudev
 }:
 
 # TODO: ovirt (optional)
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     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
+    librsvg desktop_file_utils acl libgudev numactl xen
   ];
 
   preFixup = ''
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index fb988db65d1..003c1cf3432 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool, makeWrapper
 , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
-, gmp, readline, file, libintlperl, GetoptLong, SysVirt }:
+, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen }:
 
 stdenv.mkDerivation rec {
   name = "libguestfs-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     makeWrapper pkgconfig autoconf automake libtool ncurses cpio gperf perl
     cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
     systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
-    SysVirt
+    SysVirt numactl xen
   ];
 
   configureFlags = "--disable-appliance --disable-daemon";

From 97a40f6de67ea64d93c8a1b30daede3c22026f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 28 Dec 2015 22:49:11 +0100
Subject: [PATCH 123/249] pythonPackages.polylint: remove obsolete build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 38144ac3f37..71980a33e2d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14000,25 +14000,6 @@ in modules // {
   };
 
 
-  polylint = buildPythonPackage rec {
-    name = "polylint-${version}";
-    version = "158125c6ab";
-
-    src = pkgs.fetchgit {
-      url = "https://github.com/bendavis78/polylint";
-      rev = version;
-      sha256 = "ea10c67e9ce6df0936d6e2015382acba4f9cc559e2d6a9471f474f6bda78a266";
-    };
-
-    propagatedBuildInputs = with self; [ html5lib lxml cssselect ];
-
-    meta = {
-      description = "Fast HTML linter for polymer";
-      homepage = https://github.com/bendavis78/polylint;
-    };
-  };
-
-
   powerline = buildPythonPackage rec {
     rev  = "2.1.4";
     name = "powerline-${rev}";

From bfd77fdbbe8dbc56955d4204602ccb8ff7acfd34 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Mon, 28 Dec 2015 22:49:36 +0100
Subject: [PATCH 124/249] amarok: add necessary dependencies to fix failing
 build

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

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index e0519f2db5c..aec2768e450 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -2,6 +2,7 @@
 , qtscriptgenerator, gettext, curl , libxml2, mysql, taglib
 , taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod
 , phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null
+, lz4, lzo, snappy, libaio
 }:
 
 stdenv.mkDerivation rec {
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
     qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.lib
     taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2
     libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
+    lz4 lzo snappy libaio
   ];
 
   # This is already fixed upstream, will be release in 2.9

From 4f6c12de3076baef5025d902ccf74689c968b240 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Dec 2015 19:41:23 +0000
Subject: [PATCH 125/249] spotify: Use specific openssl version

Spotify needs an ABI compatible libssl as it is a binary.
Only changes things if openssl is aliased to another libssl.
---
 pkgs/applications/audio/spotify/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index f53154217a8..81c2ee59bc5 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl, freetype
+{ fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl_1_0_1, freetype
 , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
 , libgcrypt, chromium, udev, fontconfig
 , dbus, expat, ffmpeg_0_10 }:
@@ -67,8 +67,8 @@ stdenv.mkDerivation {
       # Work around Spotify referring to a specific minor version of
       # OpenSSL.
 
-      ln -s ${openssl}/lib/libssl.so $libdir/libssl.so.1.0.0
-      ln -s ${openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
+      ln -s ${openssl_1_0_1}/lib/libssl.so $libdir/libssl.so.1.0.0
+      ln -s ${openssl_1_0_1}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
       ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so
       ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so
 

From 527f3574b7ecf317b1873165a1724715a801ba21 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 28 Dec 2015 16:59:24 -0500
Subject: [PATCH 126/249] stdenvBootstrapTools.x86_64-darwin: unbreak

This is blocking Hydra from updating the nixpkgs-unstable channel. Also
add myself as a maintainer so Hydra can notify me if it breaks again
---
 pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix b/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
index 932929a0efc..961adbeaaad 100644
--- a/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
@@ -68,7 +68,7 @@ rec {
       # Copy what we need of clang
       cp -d ${llvmPackages.clang-unwrapped}/bin/clang $out/bin
       cp -d ${llvmPackages.clang-unwrapped}/bin/clang++ $out/bin
-      cp -d ${llvmPackages.clang-unwrapped}/bin/clang-3.6 $out/bin
+      cp -d ${llvmPackages.clang-unwrapped}/bin/clang-[0-9].[0-9] $out/bin
 
       cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib
 
@@ -150,6 +150,10 @@ rec {
     '';
 
     allowedReferences = [];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.copumpkin ];
+    };
   };
 
   dist = stdenv.mkDerivation {

From af751a7845bc16d7ea95e4d1cefbe4e07baae49e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 28 Dec 2015 23:14:28 +0100
Subject: [PATCH 127/249] qt55.openbr: fix source

---
 pkgs/development/libraries/openbr/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix
index 2b4d11919fb..dd40311b807 100644
--- a/pkgs/development/libraries/openbr/default.nix
+++ b/pkgs/development/libraries/openbr/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchgit, cmake, opencv, qtbase, qtsvg }:
+{ stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }:
 
 stdenv.mkDerivation rec {
 
   version = "0.5";
   name = "openbr-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/biometrics/openbr.git";
+  src = fetchFromGitHub {
+    owner = "biometrics";
+    repo = "openbr";
     rev = "cc364a89a86698cd8d3052f42a3cb520c929b325";
-    sha256 = "16b3mmsf9r1yqqaw89fx0c3bgfg86dz4phry89wqy2hw05szgda3";
+    sha256 = "12y00cf5dlzp9ciiwbihf6xhlkdxpydhscv5hwp83qjdllid9rrz";
   };
 
   buildInputs = [ opencv qtbase qtsvg ];

From 090efc2907fb4c37cd519ec3005a026a34120d8c Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 23 Dec 2015 18:00:22 -0500
Subject: [PATCH 128/249] subgit: init at 3.1.0

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/subgit/default.nix          | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/subgit/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 6d832f9778f..4d3c31b4f91 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -94,6 +94,8 @@ rec {
 
   svn2git_kde = callPackage ./svn2git-kde { };
 
+  subgit = callPackage ./subgit { };
+
   darcsToGit = callPackage ./darcs-to-git { };
 
   gitflow = callPackage ./gitflow { };
diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix
new file mode 100644
index 00000000000..0774bbc9a62
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip, makeWrapper, jre }:
+
+stdenv.mkDerivation {
+  name = "subgit-3.1.0";
+
+  meta = {
+    description = "A tool for a smooth, stress-free SVN to Git migration";
+    longDescription = "Create writable Git mirror of a local or remote Subversion repository and use both Subversion and Git as long as you like. You may also do a fast one-time import from Subversion to Git.";
+    homepage = http://subgit.com;
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.all;
+  };
+
+  buildInputs = [ unzip makeWrapper ];
+
+  installPhase = ''
+    mkdir $out;
+    cp -r bin lib $out;
+    wrapProgram $out/bin/subgit --set JAVA_HOME ${jre};
+  '';
+
+  src = fetchurl {
+    url = http://old.subgit.com/download/subgit-3.1.0.zip;
+    sha256 = "08qhpg6y2ziwplm0z1ghh1wfp607sw4hyb53a7qzfn759j5kcdrg";
+  };
+}
\ No newline at end of file

From 2c9369dc439ef7e68ed4839b16dad0d2d7628b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 29 Dec 2015 09:17:06 +0100
Subject: [PATCH 129/249] i2pd: 2.1.0 -> 2.2.0

---
 pkgs/tools/networking/i2pd/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 4007ec4add1..a11f0347ce5 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -4,24 +4,20 @@ stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "06y6pi0wlxpasncm4qq30sh0cavwl2f4gdz0hss70if8mr6z9hyq";
+    sha256 = "0slrfmgrf9b689wpsdpvsnmhbqsygcy558dz259k6xcf50f7lfqh";
   };
 
   buildInputs = [ boost zlib openssl ];
   makeFlags = "USE_AESNI=no";
-  patches = [ (fetchpatch {
-    url = https://github.com/PurpleI2P/i2pd/commit/4109ab1590791f3c1bf4e9eceec2d43be7b5ea47.patch;
-    sha256 = "17zg9iah59icy8nn1nwfnsnbzpafgrsasz1pmb2q4iywb7wbnkzi";
-  }) ];
 
   installPhase = ''
-    install -D i2p $out/bin/i2pd
+    install -D i2pd $out/bin/i2pd
   '';
 
   meta = with stdenv.lib; {

From b604318ad85834f1368d531014a75b0b74b0b775 Mon Sep 17 00:00:00 2001
From: Emery <emery@v36.space>
Date: Tue, 29 Dec 2015 11:44:07 +0100
Subject: [PATCH 130/249] ratox: fix src hash mismatch

---
 .../networking/instant-messengers/ratox/default.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix
index 238b7209799..053e8a9c973 100644
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://git.2f30.org/ratox/snapshot/${name}.tar.gz";
-    sha256 = "1fm9b3clvnc2nf0pd1z8g08kfszwhk1ij1lyx57wl8vd51z4xsi5";
+    sha256 = "0xnw3zcz9frmcxqhwg38hhnsy1g5xl9yc19nl0vwi5awz8wqqy19";
   };
 
   buildInputs = [ libtoxcore ];

From 4f3d769d6f75f47c748f82397bf439e589689dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 29 Dec 2015 13:15:34 +0100
Subject: [PATCH 131/249] conky: add meta.platforms

---
 pkgs/os-specific/linux/conky/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 46b749f55e8..97eab37e4e1 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -122,5 +122,6 @@ stdenv.mkDerivation rec {
     description = "Advanced, highly configurable system monitor based on torsmo";
     maintainers = [ maintainers.guibert ];
     license = licenses.gpl3Plus;
+    platforms = platforms.linux;
   };
 }

From bc6e050f211ce44e838368895c745da30d0bfd61 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Thu, 24 Dec 2015 16:32:44 -0800
Subject: [PATCH 132/249] mesa: add download url (close #11942)

vcunat refactored a bit (too long line, etc.) and reordered the URLs.
---
 pkgs/development/libraries/mesa/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 11fafc8f038..3bfdf8f3a77 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -33,8 +33,10 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     urls = [
-      "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
+      (with stdenv.lib; ''ftp://ftp.freedesktop.org/pub/mesa/older-versions/''
+        + head (splitString "." version) + ''.x/${version}/mesa-${version}.tar.xz'')
+      "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
     ];
     sha256 = "9c255a2a6695fcc6ef4a279e1df0aeaf417dc142f39ee59dfb533d80494bb67a";
   };

From f1aa829a43e39f64c47e557c08b2fb41fbc68eea Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Sat, 26 Dec 2015 17:25:40 +0100
Subject: [PATCH 133/249] use official taglib-extras source

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

diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix
index 623119703d4..882116bd3f1 100644
--- a/pkgs/development/libraries/taglib-extras/default.nix
+++ b/pkgs/development/libraries/taglib-extras/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "taglib-extras-1.0.1";
   src = fetchurl {
-    url = "http://www.kollide.net/~jefferai/${name}.tar.gz";
+    url = "http://ftp.rz.uni-wuerzburg.de/pub/unix/kde/taglib-extras/1.0.1/src/${name}.tar.gz";
     sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y";
   };
   buildInputs = [ taglib ];

From f6df6d8d468a6cee3e995df8206ed5903d416797 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Dec 2015 15:56:20 +0100
Subject: [PATCH 134/249] linux: 3.18.24 -> 3.18.25

---
 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 544cd4e897f..24a568f5feb 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.24";
+  version = "3.18.25";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "06wcgzhbiddzrabfd3z0zsb9qwa2phva5cq7gg0mzff67a6cym7d";
+    sha256 = "14pz8mvk48i2y1ffkhczjcm2icpb2g9xlpzyrvvis42n5178fjf6";
   };
 
   features.iwlwifi = true;

From 36a4600422dccf4a2deb91652e7f6e992bab6696 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Tue, 29 Dec 2015 15:48:40 +0100
Subject: [PATCH 135/249] remove fetchFromGitorious (close #12024)

The site has retired and it's not used by anything.
---
 pkgs/top-level/all-packages.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e8f03b4904..d852fdd24a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -374,13 +374,6 @@ let
     meta.homepage = "https://bitbucket.org/${owner}/${repo}/";
   };
 
-  # gitorious example
-  fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
-    inherit name sha256;
-    url = "https://gitorious.org/${owner}/${repo}/archive/${rev}.tar.gz";
-    meta.homepage = "https://gitorious.org/${owner}/${repo}/";
-  };
-
   # cgit example, snapshot support is optional in cgit
   fetchFromSavannah = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
     inherit name sha256;
@@ -2968,7 +2961,7 @@ let
   rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
 
   rubber = callPackage ../tools/typesetting/rubber { };
-  
+
   runzip = callPackage ../tools/archivers/runzip { };
 
   rxp = callPackage ../tools/text/xml/rxp { };

From 74aac178782af088cd40e2a1c224223b6692dc7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Dec 2015 16:39:26 +0100
Subject: [PATCH 136/249] Force rebuild of some corrupted files

---
 nixos/modules/virtualisation/qemu-vm.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index e90e319a36b..5c468604443 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -40,16 +40,17 @@ let
       if [ -z "$TMPDIR" -o -z "$USE_TMPDIR" ]; then
           TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir)
       fi
+
       # Create a directory for exchanging data with the VM.
       mkdir -p $TMPDIR/xchg
 
       ${if cfg.useBootLoader then ''
-        # Create a writable copy/snapshot of the boot disk
-        # A writable boot disk can be booted from automatically
+        # Create a writable copy/snapshot of the boot disk.
+        # A writable boot disk can be booted from automatically.
         ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 -b ${bootDisk}/disk.img $TMPDIR/disk.img || exit 1
 
         ${if cfg.useEFIBoot then ''
-          # VM needs a writable flash BIOS
+          # VM needs a writable flash BIOS.
           cp ${bootDisk}/bios.bin $TMPDIR || exit 1
           chmod 0644 $TMPDIR/bios.bin || exit 1
         '' else ''

From b91dcad4bc73006b79db21802e1e46c333298093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Dec 2015 16:50:21 +0100
Subject: [PATCH 137/249] fetchFromBitBucket: auto-remove an impure file

Also fix the hash in goPackages.inflect, the only user of the fetcher ATM.
Closes #12002 (different `inflect` fix), fixes #12012.
Using fetchzip-derived functions is likely more efficient than fetchhg,
and it's lighter on dependencies (hash is the same as with fetchhg in this case).
---
 pkgs/build-support/fetchzip/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix         | 1 +
 pkgs/top-level/go-packages.nix          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index 46e7d917160..9015f951a51 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -10,6 +10,7 @@
 { # Optionally move the contents of the unpacked tree up one level.
   stripRoot ? true
 , url
+, extraPostFetch ? ""
 , ... } @ args:
 
 lib.overrideDerivation (fetchurl ({
@@ -47,7 +48,8 @@ lib.overrideDerivation (fetchurl ({
       fi
     '' else ''
       mv "$unpackDir"/* "$out/"
-    '');
-} // removeAttrs args [ "stripRoot" ]))
+    '') #*/
+    + extraPostFetch;
+} // removeAttrs args [ "stripRoot" "extraPostFetch" ]))
 # Hackety-hack: we actually need unzip hooks, too
 (x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d852fdd24a4..c20403321c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -372,6 +372,7 @@ let
     inherit name sha256;
     url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz";
     meta.homepage = "https://bitbucket.org/${owner}/${repo}/";
+    extraPostFetch = ''rm -f "$out"/.hg_archival.txt''; # impure file; see #12002
   };
 
   # cgit example, snapshot support is optional in cgit
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index e1825ace20d..b05793a6043 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1751,7 +1751,7 @@ let
       rev    = "8961c3750a47b8c0b3e118d52513b97adf85a7e8";
       owner  = "pkg";
       repo   = "inflect";
-      sha256 = "04iln5b9iyvr6bcn5cj2zq6vqk3a2b4vsy48y2kylhk7qnakip99";
+      sha256 = "11qdyr5gdszy24ai1bh7sf0cgrb4q7g7fsd11kbpgj5hjiigxb9a";
     };
   };
 

From 6a51a615b4c144702a64c586eccc35ad709ab119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Dec 2015 17:07:26 +0100
Subject: [PATCH 138/249] goPackages.inflect: add version suffix

Instead of approach in #12002, I chose the commit-date style
to preserve linearity if it (ever) gets updates.
The package seems to do no releases.
---
 pkgs/top-level/go-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b05793a6043..93eb04e5442 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1745,7 +1745,7 @@ let
   };
 
   inflect = buildGoPackage {
-    name = "inflect";
+    name = "inflect-2013-08-29";
     goPackagePath = "bitbucket.org/pkg/inflect";
     src = fetchFromBitbucket {
       rev    = "8961c3750a47b8c0b3e118d52513b97adf85a7e8";

From 7906169ce18577fb4cba9a5dd09bab5557e99c20 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Dec 2015 17:21:49 +0100
Subject: [PATCH 139/249] Add some preferLocalBuild

---
 nixos/release.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/release.nix b/nixos/release.nix
index e1235c5fe28..2dc3f9efc71 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -47,6 +47,7 @@ let
           };
           inherit iso;
           passthru = { inherit config; };
+          preferLocalBuild = true;
         }
         ''
           mkdir -p $out/nix-support
@@ -149,6 +150,7 @@ in rec {
             maintainers = maintainers.eelco;
           };
           ova = config.system.build.virtualBoxOVA;
+          preferLocalBuild = true;
         }
         ''
           mkdir -p $out/nix-support
@@ -168,6 +170,7 @@ in rec {
             boot.loader.grub.device = mkDefault "/dev/sda";
           });
       }).config.system.build.toplevel;
+      preferLocalBuild = true;
     }
     "mkdir $out; ln -s $toplevel $out/dummy");
 

From 63bf2a551e9f371ef26b40c12d4db61d3b56fbda Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Dec 2015 17:54:06 +0100
Subject: [PATCH 140/249] nixUnstable: 1.11pre4334_7431932 ->
 1.11pre4345_b8258a4

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 7f134c18844..36c075071d6 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -97,10 +97,10 @@ in rec {
    };
 
    nixUnstable = lib.lowPrio (common rec {
-     name = "nix-1.11pre4334_7431932";
+     name = "nix-1.11pre4345_b8258a4";
      src = fetchurl {
-       url = "http://hydra.nixos.org/build/28747184/download/4/${name}.tar.xz";
-       sha256 = "ccb0c5be03b9af1bf89e79758868b0cd62c79fd7a0f0791cdb99df86e4240fc4";
+       url = "http://hydra.nixos.org/build/29615957/download/4/${name}.tar.xz";
+       sha256 = "06944da78e46d8f2cbeeb02c1ab3127a06935e984bcf7a972041c7d91814f0f2";
      };
    });
 

From 6da327b43367ec13eb21d06f7595856b5c54c363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 29 Dec 2015 19:32:30 +0100
Subject: [PATCH 141/249] Chromium updates

---
 .../networking/browsers/chromium/common.nix   |  1 +
 .../browsers/chromium/source/sources.nix      | 24 +++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index fbd775f6f98..237dfd17ac7 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -145,6 +145,7 @@ let
       linux_use_gold_binary = false;
       linux_use_gold_flags = false;
       proprietary_codecs = false;
+      use_sysroot = false;
       use_gnome_keyring = gnomeKeyringSupport;
       use_gconf = gnomeSupport;
       use_gio = gnomeSupport;
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 04ab0c95b16..dc6f22434db 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,21 +1,21 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "49.0.2587.3";
-    sha256 = "05mhd6z833w1r4v7jz8rbm06j29h0l4ix45v29l5npv41sqr4lj2";
-    sha256bin32 = "1lrf3zfzy3yif854nkrl6acdfwc93xhry9ykfjjr1a4mpnlqbp1v";
-    sha256bin64 = "1sn1p5jh2gy463np99xw7jhcl9hd28b4gm2wqv19z0a67k84jdpd";
+    version = "49.0.2593.0";
+    sha256 = "1krkf8dg10xnvxs4zfvy2rkp0v3gxg55418b11kmfywsxjfi09hv";
+    sha256bin32 = "0sarfj8r6x28pbmcpd5facm6liifazj744c9qn6ci6xg7f8jlnxi";
+    sha256bin64 = "1l5s504mmr4v5y67fsla9hyrk7dm155yc790ld87s1ya03h455gr";
   };
   beta = {
-    version = "48.0.2564.41";
-    sha256 = "06k5vjv1argvxssjrlvyxn5gi93gx8r8dqanv3cpvwpw8nwyqrdj";
-    sha256bin32 = "0k77hpacnz0plh67wd2p6dxbpkcb8930p08inxy3mzjlralq9fyj";
-    sha256bin64 = "1zdisb36s5nh7h7swfyjb2shxpapp1anpil4prfd3jkf6bv64k1i";
+    version = "48.0.2564.48";
+    sha256 = "1qasdz9rwdqa2if8y4kkk19fspgjpk3q782c8l1p5n2cm25lkfa9";
+    sha256bin32 = "0pgc3iy4s7whmckc14r0cvgmk7pqgidd2w0xv53bfq2k504b5ykw";
+    sha256bin64 = "1lx6l8s2wdgzldbm8licpf22l6z13mvq05xlbn8ybizhn159nykj";
   };
   stable = {
-    version = "47.0.2526.80";
-    sha256 = "01adc5fh2agk2d5a15pg230x3h43h4lxmzlvwbm43dm34f1i81xi";
-    sha256bin32 = "0779z35snwc3qnh5fzf9gm4mmw8vj0j8k3w3vlksn532hclyl6b6";
-    sha256bin64 = "0xj9i06xdsarfl1jfw6ra3j1ri0iqnjafqw2p2r4kaqsgf1a2fdv";
+    version = "47.0.2526.106";
+    sha256 = "1rjqkawj7l127cd9s1wxwn4v7dfbrlahml98sam3fg8a6drm0lv4";
+    sha256bin32 = "14svd5x8lzfyyigfirxx1q9pg2bsnnb0fdwa7vvh1awq3zzfd38n";
+    sha256bin64 = "121289vwaz391b32hp2lihlpaql76y44gdpqkl9a3md0j1zk1nd9";
   };
 }

From 7466e0f264426f47086dbabb0384b0ebd3026c0c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 29 Dec 2015 13:23:49 -0600
Subject: [PATCH 142/249] melpaBuild: accept recipeFile in lieu of fileSpecs

---
 pkgs/build-support/emacs/melpa.nix    | 11 +++++++++++
 pkgs/build-support/emacs/melpa2nix.el |  9 +++++++++
 2 files changed, 20 insertions(+)

diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index a1f10ad3143..8fd2a00b50a 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -8,6 +8,8 @@ with lib;
 { pname
 , version
 
+, recipeFile ? null
+
 , files ? null
 , fileSpecs ? [ "*.el" "*.el.in" "dir"
                 "*.info" "*.texi" "*.texinfo"
@@ -43,8 +45,17 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
     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 \
+      ${pname} ${version} ${recipeFile}
+      ''}
 
     runHook postBuild
   '';
diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el
index 858ffd7593b..f1309fc0d57 100644
--- a/pkgs/build-support/emacs/melpa2nix.el
+++ b/pkgs/build-support/emacs/melpa2nix.el
@@ -21,6 +21,15 @@
     (`(,package ,version . ,files)
      (melpa2nix-package-build-archive package version files))))
 
+(defun melpa2nix-build-package-from-recipe ()
+  (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)))
+            (files (package-build--config-file-list rcp)))
+       (melpa2nix-package-build-archive package version files)))))
+
 (defun melpa2nix-package-build-archive (name version files)
   "Build a package archive for package NAME."
   (package-build--message "\n;;; %s\n" name)

From 1d8e3db9fff600d444644d3619da965e050290f5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 29 Dec 2015 13:24:28 -0600
Subject: [PATCH 143/249] melpa-packages: use recipeFile

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 891bb5df567..16f14769591 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -36,10 +36,14 @@ let
               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 src;
+            inherit recipeFile src;
             packageRequires =
               let lookupDep = d: self."${d}" or null;
               in map lookupDep recipe.deps;

From c266de63eebb690b80ecf3cae59d3d0b56e46aae Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 29 Dec 2015 13:24:42 -0600
Subject: [PATCH 144/249] melpa-stable-packages: use recipeFile

---
 .../editors/emacs-modes/melpa-stable-packages.nix           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index 7572c722e33..2dadbae8535 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -38,10 +38,14 @@ let
               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 src;
+            inherit recipeFile src;
             packageRequires =
               let lookupDep = d: self."${d}" or null;
               in map lookupDep recipe.deps;

From 281b584e4acbafde94695dfdf7c25f8718469313 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 13:55:54 +0100
Subject: [PATCH 145/249] liquidwar: use stdenv

This replaces use of builderDefsPackage (#4210).
---
 pkgs/games/liquidwar/default.nix | 52 +++++++++++++-------------------
 pkgs/top-level/all-packages.nix  |  2 +-
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 602daa1ee86..ce346459201 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -1,11 +1,20 @@
-a @ { xproto, libX11, libXrender
+{ stdenv, fetchurl, xproto, libX11, libXrender
 , gmp, mesa, libjpeg, libpng
-, expat, gettext, perl
+, expat, gettext, perl, guile
 , SDL, SDL_image, SDL_mixer, SDL_ttf
 , curl, sqlite
-, libogg, libvorbis, libcaca, csound, cunit, ... } :
-let
-  buildInputs = with a; [
+, libogg, libvorbis, libcaca, csound, cunit } :
+
+stdenv.mkDerivation rec {
+  name = "liquidwar6-${version}";
+  version = "0.6.3902";
+
+  src = fetchurl {
+    url = "mirror://gnu/liquidwar6/${name}.tar.gz";
+    sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn";
+  };
+
+  buildInputs = [
     xproto libX11 gmp guile
     mesa libjpeg libpng
     expat gettext perl
@@ -14,34 +23,15 @@ let
     libogg libvorbis csound
     libXrender libcaca cunit
   ];
-in
-rec {
-  name = "liquidwar6-${meta.version}";
 
-  src = a.fetchurl {
-    url = "mirror://gnu/liquidwar6/${name}.tar.gz";
-    sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn";
-  };
+  # To avoid problems finding SDL_types.h.
+  configureFlags = [ "CFLAGS=-I${SDL}/include/SDL" ];
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
-
-  setVars = a.noDepEntry (''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL}/include/SDL"
-  '');
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "Quick tactics game";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-  homepage = "http://www.gnu.org/software/liquidwar6/";
-  version = "0.6.3902";
-  updateWalker=true;
+    homepage = "http://www.gnu.org/software/liquidwar6/";
+    maintainers = [ maintainers.raskin ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8ceb32a499..5b90ab3e8b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14139,7 +14139,7 @@ let
 
   lincity_ng = callPackage ../games/lincity/ng.nix {};
 
-  liquidwar = builderDefsPackage (callPackage ../games/liquidwar) {
+  liquidwar = callPackage ../games/liquidwar {
     guile = guile_1_8;
   };
 

From 73184f5f59db0ecb46d09cf6a26111493496c1ea Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 15:16:12 +0100
Subject: [PATCH 146/249] stardust: use stdenv

This replaces use of builderDefsPackage (#4210).
---
 pkgs/games/stardust/default.nix | 77 ++++++++++-----------------------
 1 file changed, 23 insertions(+), 54 deletions(-)

diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix
index c7ee0df6a7a..aa68da6b73d 100644
--- a/pkgs/games/stardust/default.nix
+++ b/pkgs/games/stardust/default.nix
@@ -1,62 +1,31 @@
-x@{builderDefsPackage
-  , zlib, libtiff, libxml2, SDL, xproto, libX11, libXi, inputproto, libXmu
-  , libXext, xextproto, mesa
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, zlib, libtiff, libxml2, SDL, xproto, libX11
+, libXi, inputproto, libXmu, libXext, xextproto, mesa }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="stardust";
-    version="0.1.13";
-    name="${baseName}-${version}";
-    url="http://iwar.free.fr/IMG/gz/${name}.tar.gz";
-    hash="19rs9lz5y5g2yiq1cw0j05b11digw40gar6rw8iqc7bk3s8355xp";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "stardust-${version}";
+  version = "0.1.13";
+
+  src = fetchurl {
+    url = "http://iwar.free.fr/IMG/gz/${name}.tar.gz";
+    sha256 = "19rs9lz5y5g2yiq1cw0j05b11digw40gar6rw8iqc7bk3s8355xp";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "fixPaths" "doMakeInstall"];
-
-  configureFlags = [
-    "--bindir=$out/bin"
-    "--datadir=$out/share"
-  ];
-  
-  makeFlags = [
-    "bindir=$out/bin"
-    "datadir=$out/share"
+  buildInputs = [
+    zlib libtiff libxml2 SDL xproto libX11 libXi inputproto
+    libXmu libXext xextproto mesa
   ];
 
-  fixPaths = a.fullDepEntry (''
-    sed -e "s@#define PACKAGE .*@#define PACKAGE \"stardust\"@" -i config.h
-  '') ["minInit"];
+  installFlags = [ "bindir=\${out}/bin" ];
 
-  meta = {
+  postConfigure = ''
+    substituteInPlace config.h \
+      --replace '#define PACKAGE ""' '#define PACKAGE "stardust"'
+  '';
+
+  meta = with stdenv.lib; {
     description = "Space flight simulator";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://iwar.free.fr/article.php3?id_article=6";
-    };
-  };
-}) x
-
+}

From b9f1140e4d14ef91a05e0e1eeda57b84fff5f627 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 15:39:45 +0100
Subject: [PATCH 147/249] atanks: use stdenv

This replaces use of builderDefsPackage (#4210).
---
 pkgs/games/atanks/default.nix      | 65 +++++++++---------------------
 pkgs/games/atanks/default.upstream |  5 ---
 2 files changed, 19 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/games/atanks/default.upstream

diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix
index 9ebfb724779..4b9b097bbb7 100644
--- a/pkgs/games/atanks/default.nix
+++ b/pkgs/games/atanks/default.nix
@@ -1,53 +1,26 @@
-x@{builderDefsPackage
-  , allegro
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, allegro }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="atanks";
-    version = "6.2";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz";
+stdenv.mkDerivation rec {
+  name = "atanks-${version}";
+  version = "6.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/atanks/atanks/${name}/${name}.tar.gz";
     sha256 = "1s1lb87ind0y9d6hmfaf1b9wks8q3hd6w5n9dibq75rxqmcfvlpy";
   };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.sha256;
-  };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ allegro ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixInstall" "doMakeInstall"];
-  makeFlags=[
-    "PREFIX=$out/"
-  ];
-  fixInstall = a.fullDepEntry (''
-    sed -e "s@INSTALL=.*bin/install @INSTALL=install @" -i Makefile
-    sed -e "s@-g 0 -m ... -o 0@@" -i Makefile
-    sed -e 's@/usr/@'"$out"'@g' -i Makefile
-  '') ["doUnpack" "minInit"];
-      
-  meta = {
+  patchPhase = ''
+    substituteInPlace Makefile --replace /usr $out
+  '';
+
+  makeFlags = [ "PREFIX=$(out)/" "INSTALL=install" ];
+
+  meta = with stdenv.lib; {
     description = "Atomic Tanks ballistics game";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    downloadPage = "http://sourceforge.net/projects/atanks/files/atanks/";
-    inherit version;
+    homepage = http://atanks.sourceforge.net/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-}) x
-
+}
diff --git a/pkgs/games/atanks/default.upstream b/pkgs/games/atanks/default.upstream
deleted file mode 100644
index f52364b3427..00000000000
--- a/pkgs/games/atanks/default.upstream
+++ /dev/null
@@ -1,5 +0,0 @@
-url http://sourceforge.net/projects/atanks/files/atanks/
-version_link 'atanks[-][0-9.]+/$'
-version_link '[.]tar[.][a-z0-9]+/download'
-SF_redirect
-do_overwrite () { do_overwrite_just_version; }

From aca3851b88c995e0cbb42bcf3822f5202fec7648 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 16:24:48 +0100
Subject: [PATCH 148/249] tbe: r2048 -> 0.9.2.1

Also replace use of builderDefsPackage (#4210).
---
 pkgs/games/the-butterfly-effect/default.nix | 76 ++++++---------------
 1 file changed, 20 insertions(+), 56 deletions(-)

diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index 3cf91e11a55..8775fb103d8 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -1,64 +1,28 @@
-x@{builderDefsPackage
-  , qt4, box2d, which
-  ,fetchsvn, cmake
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    ["fetchsvn"];
+{ stdenv, fetchurl, qt4, box2d, which, cmake }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="tbe";
-    revision="2048";
-    version="r${revision}";
-    name="${baseName}-${version}";
-    url="https://tbe.svn.sourceforge.net/svnroot/tbe/trunk";
-    hash="19pqpkil4r5y9j4nszkbs70lq720nvqw8g8magd8nf2n3l9nqm51";
+stdenv.mkDerivation rec {
+  name = "tbe-${version}";
+  version = "0.9.2.1";
+
+  src = fetchurl {
+    url = "https://github.com/kaa-ching/tbe/archive/v${version}.tar.gz";
+    sha256 = "1cs4q9qiakfd2m1lvfsvfgf8yvhxzmc06glng5d80piwyn6ymzxg";
   };
-in
-rec {
-  srcDrv = a.fetchsvn {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-    rev = sourceInfo.revision;
-  };
-  src = srcDrv + "/";
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ qt4 box2d which cmake ];
 
-  phaseNames = ["setVars" "doCmake" "doMakeInstall" "doDeploy"];
-
-  setVars = a.noDepEntry ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.box2d}/include/Box2D"
+  installPhase = ''
+    make DESTDIR=.. install
+    mkdir -p $out/bin
+    cp ../usr/games/tbe $out/bin
+    cp -r ../usr/share $out/
   '';
 
-  doDeploy = a.fullDepEntry ''
-    mkdir -p "$out/share/tbe"
-    cp -r . "$out/share/tbe/build-dir"
-    mkdir -p "$out/bin"
-    echo '#!${a.stdenv.shell}' >> "$out/bin/tbe"
-    echo "$out/share/tbe/build-dir/tbe \"\$@\"" >> "$out/bin/tbe"
-    chmod a+x "$out/bin/tbe"
-  '' ["minInit" "doMake" "defEnsureDir"];
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "A physics-based game vaguely similar to Incredible Machine";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.stdenv.lib.licenses.gpl2;
+    homepage = http://the-butterfly-effect.org/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
-  passthru = {
-    inherit srcDrv;
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/tbe/files/";
-    };
-  };
-}) x
+}

From a04916cdc48f5e1a993eb7c48d65a6c816569d94 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 17:02:16 +0100
Subject: [PATCH 149/249] sauerbraten: use stdenv

This replaces use of builderDefsPackage (#4210).
---
 pkgs/games/sauerbraten/default.nix | 101 ++++++++++++-----------------
 1 file changed, 40 insertions(+), 61 deletions(-)

diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix
index 8f3fb53f7e3..61a9310ae21 100644
--- a/pkgs/games/sauerbraten/default.nix
+++ b/pkgs/games/sauerbraten/default.nix
@@ -1,77 +1,56 @@
-x@{builderDefsPackage
-  , fetchsvn, mesa, SDL, SDL_image, SDL_mixer
-  , libpng, zlib, libjpeg, imagemagick, libX11
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    ["fetchsvn"];
+{ stdenv, fetchsvn, mesa, SDL, SDL_image, SDL_mixer
+, libpng, zlib, libjpeg, imagemagick, libX11
+}:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="sauerbraten";
-    version="5000";
-    name="${baseName}-r${version}";
-    url="https://svn.code.sf.net/p/sauerbraten/code";
-    hash="17libj7dslprlwppdk3vyxdcigbsa4czln8gdyz9j264m11z1cbh";
-  };
-in
-rec {
-  srcDrv = a.fetchsvn {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-    rev = sourceInfo.version;
+stdenv.mkDerivation rec {
+  name = "sauerbraten-r${version}";
+  version = "5000";
+
+  src = fetchsvn {
+    url = "https://svn.code.sf.net/p/sauerbraten/code";
+    sha256 = "17libj7dslprlwppdk3vyxdcigbsa4czln8gdyz9j264m11z1cbh";
+    rev = version;
   };
 
-  src = srcDrv + "/";
+  buildInputs = [
+    mesa SDL SDL_image SDL_mixer libpng zlib libjpeg imagemagick
+    libX11
+  ];
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  phaseNames = ["setVars" "doMakeInstall" "doCreateScripts"];
-
-  setVars = a.noDepEntry ''
+  preBuild = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"
+    pushd src
   '';
 
-  doUnpack = a.fullDepEntry ''
-    mkdir -p $out/share/sauerbraten/build-dir
-    ln -s  $out/share/sauerbraten/build-dir
-    cd $out/share/sauerbraten/build-dir
-    (cd ${src}; find . -type d) | tail -n +2 | xargs -L 1 mkdir
-    (cd ${src}; find . -type f) | while read; do ln -s ${src}/"$REPLY" "$(dirname "$REPLY")"; done
-    cd src
-    ls
-    make clean
-    sed -e '/[.]h[.]gch/,/-o/s@-o@-x c++-header -o@' -i Makefile
-  '' ["minInit" "addInputs" "defEnsureDir"];
-
-  doCreateScripts = a.fullDepEntry ''
-    cd ..
-    mkdir -p $out/bin
-    echo '#! /bin/sh' >> $out/bin/sauerbraten_server
-    echo 'cd "'"$out"'/share/sauerbraten/build-dir"' >> $out/bin/sauerbraten_server
-    echo './bin_unix/native_server "$@"' >> $out/bin/sauerbraten_server
-    echo '#! /bin/sh' >> $out/bin/sauerbraten_client
-    echo 'cd "'"$out"'/share/sauerbraten/build-dir"' >> $out/bin/sauerbraten_client
-    echo './bin_unix/native_client "$@"' >> $out/bin/sauerbraten_client
+  installPhase = ''
+    popd
+    mkdir -p $out/bin $out/share/sauerbraten $out/share/doc/sauerbraten
+    cp -rv "docs/"* $out/share/doc/sauerbraten/
+    cp -v src/sauer_client src/sauer_server $out/share/sauerbraten/
+    cp -rv packages $out/share/sauerbraten/
+    cp -rv data $out/share/sauerbraten/
+    cat > $out/bin/sauerbraten_server <<EOF
+    #!${stdenv.shell}
+    cd $out/share/sauerbraten
+    ./sauer_server "\$@"
+    EOF
+    cat > $out/bin/sauerbraten_client <<EOF
+    #!${stdenv.shell}
+    cd $out/share/sauerbraten
+    ./sauer_client "\$@"
+    EOF
     chmod a+x $out/bin/sauerbraten_*
-  '' ["minInit" "defEnsureDir"];
-      
-  meta = {
+  '';
+
+  meta = with stdenv.lib; {
     description = "";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
+    maintainers = [ maintainers.raskin ];
     hydraPlatforms =
       # raskin: tested amd64-linux;
       # not setting platforms because it is 0.5+ GiB of game data
       [];
     license = "freeware"; # as an aggregate - data files have different licenses
                           # code is under zlib license
+    platforms = platforms.linux;
   };
-}) x
-
+}

From a1e0894cb45f6c4ed3fc08df814a71081fd58228 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Tue, 29 Dec 2015 15:29:35 +0100
Subject: [PATCH 150/249] ding: init at 1.8 (close #11989)

vcunat improved meta.
---
 lib/maintainers.nix                     |  1 +
 pkgs/applications/misc/ding/default.nix | 53 +++++++++++++++++++++++++
 pkgs/applications/misc/ding/dict.patch  | 26 ++++++++++++
 pkgs/top-level/all-packages.nix         |  5 +++
 4 files changed, 85 insertions(+)
 create mode 100644 pkgs/applications/misc/ding/default.nix
 create mode 100644 pkgs/applications/misc/ding/dict.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 610d399b906..9918ae61537 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -99,6 +99,7 @@
   ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>";
   erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>";
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
+  exi = "Reno Reckling <nixos@reckling.org>";
   exlevan = "Alexey Levan <exlevan@gmail.com>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix
new file mode 100644
index 00000000000..a044eb1df92
--- /dev/null
+++ b/pkgs/applications/misc/ding/default.nix
@@ -0,0 +1,53 @@
+{ aspell, aspellDicts_de, aspellDicts_en, buildEnv, fetchurl, fortune, gnugrep, makeWrapper, stdenv, tk, tre }:
+let
+  aspellEnv = buildEnv {
+    name = "env-ding-aspell";
+    paths = [
+      aspell
+      aspellDicts_de
+      aspellDicts_en
+    ];
+  };
+in
+stdenv.mkDerivation rec {
+  name = "ding-1.8";
+
+  src = fetchurl {
+    url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/${name}.tar.gz";
+    sha256 = "00z97ndwmzsgig9q6y98y8nbxy76pyi9qyj5qfpbbck24gakpz5l";
+  };
+
+  buildInputs = [ aspellEnv fortune gnugrep makeWrapper tk tre ];
+
+  patches = [ ./dict.patch ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/dict
+    mkdir -p $out/share/man/man1
+    mkdir -p $out/share/applications
+    mkdir -p $out/share/pixmaps
+
+    for f in ding ding.1; do
+      sed -i "s@/usr/share@$out/share@g" "$f"
+    done
+
+    sed -i "s@/usr/bin/fortune@fortune@g" ding
+
+    cp ding $out/bin/
+    cp de-en.txt $out/share/dict/
+    cp ding.1 $out/share/man/man1/
+    cp ding.png $out/share/pixmaps/
+    cp ding.desktop $out/share/applications/
+
+    wrapProgram $out/bin/ding --prefix PATH : ${gnugrep}/bin:${aspellEnv}/bin:${tk}/bin:${fortune}/bin --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\""
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple and fast dictionary lookup tool";
+    homepage = https://www-user.tu-chemnitz.de/~fri/ding/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux; # homepage says: unix-like except darwin
+    maintainers = [ maintainers.exi ];
+  };
+}
diff --git a/pkgs/applications/misc/ding/dict.patch b/pkgs/applications/misc/ding/dict.patch
new file mode 100644
index 00000000000..70ecea10550
--- /dev/null
+++ b/pkgs/applications/misc/ding/dict.patch
@@ -0,0 +1,26 @@
+Ding persists its settings to $HOME/.dingrc on startup, this sadly includes the path to the dictionary.
+On all other distributions, that would be /usr/share/dict/de-en.txt and would hardly ever change.
+On nixos, this will indeed change on ever update and would break it for all users.
+This just comments out the dictionary path in the .dingrc so the user can still set it if she wants to, but it will not affect normal operations.
+--- a/ding
++++ b/ding
+@@ -899,7 +899,9 @@ if { ! [info exists ding_version]} {
+         }
+ 
+         # Change path of default ger-eng.txt when upgrading from version 1.1
+-        if {$searchmeth($i,dictfile) == {/usr/dict/ger-eng.txt} &&
++        if {! [info exists searchmeth($i,dictfile)]} {
++            set searchmeth($i,dictfile) $default_searchmeth(0,dictfile)
++        } elseif {$searchmeth($i,dictfile) == {/usr/dict/ger-eng.txt} &&
+             $ding_version == {1.1}} {
+             set searchmeth($i,dictfile) $default_searchmeth(0,dictfile)
+             debug 2 "New path and name of ger-eng.txt configured: $default_searchmeth(0,dictfile)"
+@@ -5065,7 +5067,7 @@ proc saveOptions {} {
+     foreach i $searchmpos {
+         puts $fd "set searchmeth($n,name) {$searchmeth($i,name)}"
+         puts $fd "set searchmeth($n,type) {$searchmeth($i,type)}"
+-        puts $fd "set searchmeth($n,dictfile) {$searchmeth($i,dictfile)}"
++        puts $fd "#set searchmeth($n,dictfile) {$searchmeth($i,dictfile)}"
+         puts $fd "set searchmeth($n,separator) {$searchmeth($i,separator)}"
+         puts $fd "set searchmeth($n,language1) {$searchmeth($i,language1)}"
+         puts $fd "set searchmeth($n,language2) {$searchmeth($i,language2)}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50b2669e96d..6ec1aff8776 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -813,6 +813,11 @@ let
 
   dialog = callPackage ../development/tools/misc/dialog { };
 
+  ding = callPackage ../applications/misc/ding {
+    aspellDicts_de = aspellDicts.de;
+    aspellDicts_en = aspellDicts.en;
+  };
+
   direnv = callPackage ../tools/misc/direnv { };
 
   discount = callPackage ../tools/text/discount { };

From 3a8112f7daf69190f81a5420bef3c5fac4aaf703 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 Dec 2015 20:52:19 +0100
Subject: [PATCH 151/249] r-modules: prefer gsl 1.x since 2.x is unsupported by
 r-gsl-1.9.x

---
 pkgs/development/r-modules/default.nix | 62 +++++++++++++-------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 14be68988f8..ee3a17fdb3c 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -221,53 +221,53 @@ let
   };
 
   packagesWithNativeBuildInputs = {
-    abn = [ pkgs.gsl ];
+    abn = [ pkgs.gsl_1 ];
     adimpro = [ pkgs.imagemagick ];
     audio = [ pkgs.portaudio ];
-    BayesSAE = [ pkgs.gsl ];
-    BayesVarSel = [ pkgs.gsl ];
+    BayesSAE = [ pkgs.gsl_1 ];
+    BayesVarSel = [ pkgs.gsl_1 ];
     BayesXsrc = [ pkgs.readline pkgs.ncurses ];
     bigGP = [ pkgs.openmpi ];
     BiocCheck = [ pkgs.which ];
     Biostrings = [ pkgs.zlib ];
-    bnpmr = [ pkgs.gsl ];
-    BNSP = [ pkgs.gsl ];
+    bnpmr = [ pkgs.gsl_1 ];
+    BNSP = [ pkgs.gsl_1 ];
     cairoDevice = [ pkgs.gtk2 ];
     Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ];
     Cardinal = [ pkgs.which ];
     chebpol = [ pkgs.fftw ];
     ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
-    cit = [ pkgs.gsl ];
+    cit = [ pkgs.gsl_1 ];
     curl = [ pkgs.curl ];
     devEMF = [ pkgs.xorg.libXft ];
-    diversitree = [ pkgs.gsl pkgs.fftw ];
+    diversitree = [ pkgs.gsl_1 pkgs.fftw ];
     EMCluster = [ pkgs.liblapack ];
     fftw = [ pkgs.fftw ];
     fftwtools = [ pkgs.fftw ];
     Formula = [ pkgs.gmp ];
-    geoCount = [ pkgs.gsl ];
+    geoCount = [ pkgs.gsl_1 ];
     git2r = [ pkgs.zlib pkgs.openssl ];
-    GLAD = [ pkgs.gsl ];
+    GLAD = [ pkgs.gsl_1 ];
     glpkAPI = [ pkgs.gmp pkgs.glpk ];
     gmp = [ pkgs.gmp ];
-    graphscan = [ pkgs.gsl ];
-    gsl = [ pkgs.gsl ];
-    HiCseg = [ pkgs.gsl ];
-    iBMQ = [ pkgs.gsl ];
+    graphscan = [ pkgs.gsl_1 ];
+    gsl = [ pkgs.gsl_1 ];
+    HiCseg = [ pkgs.gsl_1 ];
+    iBMQ = [ pkgs.gsl_1 ];
     igraph = [ pkgs.gmp ];
     JavaGD = [ pkgs.jdk ];
     jpeg = [ pkgs.libjpeg ];
-    KFKSDS = [ pkgs.gsl ];
+    KFKSDS = [ pkgs.gsl_1 ];
     kza = [ pkgs.fftw ];
-    libamtrack = [ pkgs.gsl ];
-    mixcat = [ pkgs.gsl ];
-    mvabund = [ pkgs.gsl ];
+    libamtrack = [ pkgs.gsl_1 ];
+    mixcat = [ pkgs.gsl_1 ];
+    mvabund = [ pkgs.gsl_1 ];
     mwaved = [ pkgs.fftw ];
     ncdf4 = [ pkgs.netcdf ];
     ncdf = [ pkgs.netcdf ];
     nloptr = [ pkgs.nlopt ];
     openssl = [ pkgs.openssl ];
-    outbreaker = [ pkgs.gsl ];
+    outbreaker = [ pkgs.gsl_1 ];
     pander = [ pkgs.pandoc pkgs.which ];
     pbdMPI = [ pkgs.openmpi ];
     pbdNCDF4 = [ pkgs.netcdf ];
@@ -278,7 +278,7 @@ let
     proj4 = [ pkgs.proj ];
     qtbase = [ pkgs.qt4 ];
     qtpaint = [ pkgs.qt4 ];
-    R2GUESS = [ pkgs.gsl ];
+    R2GUESS = [ pkgs.gsl_1 ];
     R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
     RAppArmor = [ pkgs.libapparmor ];
     rapportools = [ pkgs.which ];
@@ -286,9 +286,9 @@ let
     rbamtools = [ pkgs.zlib ];
     rcdd = [ pkgs.gmp ];
     RcppCNPy = [ pkgs.zlib ];
-    RcppGSL = [ pkgs.gsl ];
+    RcppGSL = [ pkgs.gsl_1 ];
     RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ];
-    RcppZiggurat = [ pkgs.gsl ];
+    RcppZiggurat = [ pkgs.gsl_1 ];
     rgdal = [ pkgs.proj pkgs.gdal ];
     rgeos = [ pkgs.geos ];
     rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ];
@@ -297,11 +297,11 @@ let
     RGtk2 = [ pkgs.gtk2 ];
     Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ];
     Rhtslib = [ pkgs.zlib ];
-    ridge = [ pkgs.gsl ];
+    ridge = [ pkgs.gsl_1 ];
     RJaCGH = [ pkgs.zlib ];
     rjags = [ pkgs.jags ];
     rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ];
-    Rlibeemd = [ pkgs.gsl ];
+    Rlibeemd = [ pkgs.gsl_1 ];
     rmatio = [ pkgs.zlib ];
     Rmpfr = [ pkgs.gmp pkgs.mpfr ];
     Rmpi = [ pkgs.openmpi ];
@@ -326,28 +326,28 @@ let
     SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
     sdcTable = [ pkgs.gmp pkgs.glpk ];
     seewave = [ pkgs.fftw pkgs.libsndfile ];
-    SemiCompRisks = [ pkgs.gsl ];
+    SemiCompRisks = [ pkgs.gsl_1 ];
     seqinr = [ pkgs.zlib ];
     seqminer = [ pkgs.zlib pkgs.bzip2 ];
     showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ];
-    simplexreg = [ pkgs.gsl ];
+    simplexreg = [ pkgs.gsl_1 ];
     SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h
     spate = [ pkgs.fftw ];
     sprint = [ pkgs.openmpi ];
     ssanv = [ pkgs.proj ];
-    stsm = [ pkgs.gsl ];
+    stsm = [ pkgs.gsl_1 ];
     stringi = [ pkgs.icu ];
-    survSNP = [ pkgs.gsl ];
+    survSNP = [ pkgs.gsl_1 ];
     sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
     TAQMNGR = [ pkgs.zlib ];
     tiff = [ pkgs.libtiff ];
-    TKF = [ pkgs.gsl ];
+    TKF = [ pkgs.gsl_1 ];
     tkrplot = [ pkgs.xorg.libX11 ];
-    topicmodels = [ pkgs.gsl ];
+    topicmodels = [ pkgs.gsl_1 ];
     udunits2 = [ pkgs.udunits pkgs.expat ];
     V8 = [ pkgs.v8 ];
-    VBLPCM = [ pkgs.gsl ];
-    VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ];
+    VBLPCM = [ pkgs.gsl_1 ];
+    VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ];
     WhopGenome = [ pkgs.zlib ];
     XBRL = [ pkgs.zlib pkgs.libxml2 ];
     xml2 = [ pkgs.libxml2 ];

From ebe4d609ea893bc6720a1242596e0b9e9e63d1b8 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 29 Dec 2015 23:40:43 +0000
Subject: [PATCH 152/249] supertux: bump to version 0.4.0

---
 pkgs/games/super-tux/default.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix
index 11429cfadd2..163320d8ae2 100644
--- a/pkgs/games/super-tux/default.nix
+++ b/pkgs/games/super-tux/default.nix
@@ -1,25 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer
+{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer
 , curl, gettext, libogg, libvorbis, mesa, openal, physfs, boost, glew
 , libiconv }:
 
 stdenv.mkDerivation rec {
   name = "supertux-${version}";
-  version = "0.3.5a";
+  version = "0.4.0";
 
-  src = fetchFromGitHub {
-    owner = "SuperTux";
-    repo = "supertux";
-    rev = "v${version}";
-    sha256 = "0f522wsv0gx7v1h70x8xznklaqr5bm2l9h7ls9vjywy0z4iy1ahp";
+  src = fetchurl {
+    url = https://github.com/SuperTux/supertux/releases/download/v0.4.0/supertux-0.4.0.tar.bz2;
+    sha256 = "10ppmy6w77lxj8bdzjahc9bidgl4qgzr9rimn15rnqay84ydx3fi";
   };
 
   buildInputs = [ pkgconfig cmake SDL2 SDL2_image SDL2_mixer curl gettext
                   libogg libvorbis mesa openal physfs boost glew libiconv ];
 
-  preConfigure = ''
-    patchShebangs configure
-  '';
-
   postInstall = ''
     mkdir $out/bin
     ln -s $out/games/supertux2 $out/bin

From 878544e4f6a9b60cad055e1f1e353d3b956f343a Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 29 Dec 2015 21:01:19 -0500
Subject: [PATCH 153/249] perl-5.2{0,2}: remove unnecessary patch for darwin

The patch no longer applies on 5.20 and is breaking everything. I tried
building both 5.20 and 5.22 and both seemed to work fine without the
patch.
---
 .../development/interpreters/perl/5.20/default.nix |  2 +-
 .../interpreters/perl/5.20/no-libutil.patch        | 12 ------------
 .../development/interpreters/perl/5.22/default.nix |  2 +-
 .../interpreters/perl/5.22/no-libutil.patch        | 14 --------------
 4 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/interpreters/perl/5.20/no-libutil.patch
 delete mode 100644 pkgs/development/interpreters/perl/5.22/no-libutil.patch

diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 659fad6bb9b..9cc8af5f427 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       ./no-sys-dirs.patch
     ]
     ++ optional stdenv.isSunOS ./ld-shared.patch
-    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.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
diff --git a/pkgs/development/interpreters/perl/5.20/no-libutil.patch b/pkgs/development/interpreters/perl/5.20/no-libutil.patch
deleted file mode 100644
index 68d44612bfe..00000000000
--- a/pkgs/development/interpreters/perl/5.20/no-libutil.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
---- perl-5.14.2-orig/Configure	2011-09-26 11:44:34.000000000 +0200
-+++ perl-5.14.2/Configure	2012-02-16 17:24:50.779839039 +0100
-@@ -1368,7 +1368,7 @@
- : List of libraries we want.
- : If anyone needs extra -lxxx, put those in a hint file.
- libswanted="socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun"
--libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
-+libswanted="$libswanted m crypt sec 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 ! !'`
diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix
index 53e777c19a1..34a26023adf 100644
--- a/pkgs/development/interpreters/perl/5.22/default.nix
+++ b/pkgs/development/interpreters/perl/5.22/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       ./no-sys-dirs.patch
     ]
     ++ optional stdenv.isSunOS ./ld-shared.patch
-    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.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
diff --git a/pkgs/development/interpreters/perl/5.22/no-libutil.patch b/pkgs/development/interpreters/perl/5.22/no-libutil.patch
deleted file mode 100644
index d6356a52437..00000000000
--- a/pkgs/development/interpreters/perl/5.22/no-libutil.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Configure b/Configure
-index 0a405d3..1871298 100755
---- a/Configure
-+++ b/Configure
-@@ -1455,7 +1455,7 @@ libswanted_uselargefiles=''
- : List of libraries we want.
- : If anyone needs extra -lxxx, put those in a hint file.
- libswanted="cl pthread socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld"
--libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
-+libswanted="$libswanted sun m crypt sec 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 ! !'`
-

From cd7612b8419d6f02884927d56718fd41749fe0a1 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 30 Dec 2015 04:58:29 +0000
Subject: [PATCH 154/249] amazon-image: enable configure-from-userdata and the
 corresponding VM test

---
 nixos/modules/virtualisation/amazon-image.nix | 2 +-
 nixos/modules/virtualisation/amazon-init.nix  | 1 -
 nixos/release.nix                             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index bf2364a0459..7ccc9df740e 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -11,7 +11,7 @@ with lib;
 let cfg = config.ec2; in
 
 {
-  imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-grow-partition.nix ];
+  imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-grow-partition.nix ./amazon-init.nix ];
 
   config = {
 
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index 21cbbfda0b6..96cd57e6db5 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -44,7 +44,6 @@ let
     nixos-rebuild switch
   '';
 in {
-  imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
   boot.postBootCommands = ''
     ${bootScript} &
   '';
diff --git a/nixos/release.nix b/nixos/release.nix
index 2dc3f9efc71..d7c736d66a9 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -223,7 +223,7 @@ in rec {
   tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; });
   tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; });
   tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops;
-  #tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config;
+  tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config;
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; });

From fff938f72a7c18173c457cac38f2c34727f2ba93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 10:59:02 +0100
Subject: [PATCH 155/249] liferea: maintenance update 1.10.16 -> 1.10.17

Also refactor meta.
---
 .../networking/newsreaders/liferea/default.nix       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index def45c7e756..7c148e3de41 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.16";
+    version = "1.10.17";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "0b8cvlyiamc4hwjcxzs0h3mk3gxnmnwyi79mjv36601xgfjs5f9j";
+    sha256 = "0svgl50w3hai31n5sm42sl0cd86c32cka0xzfy4r8gi0lyjdjxyx";
   };
 
   buildInputs = with gst_all_1; [
@@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A GTK-based news feed agregator";
     homepage = http://lzone.de/liferea/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ vcunat romildo ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ vcunat romildo ];
+    platforms = platforms.linux;
 
     longDescription = ''
       Liferea (Linux Feed Reader) is an RSS/RDF feed reader.

From 952563d6201268180e27e33f4ed0f3dbe054f2be Mon Sep 17 00:00:00 2001
From: Emery <emery@v36.space>
Date: Tue, 29 Dec 2015 11:13:12 +0100
Subject: [PATCH 156/249] WindowLab: initial pkg at 1.40

http://nickgravgaard.com/windowlab/
---
 nixos/modules/module-list.nix                 |  1 +
 .../x11/window-managers/windowlab.nix         | 22 ++++++++++++
 .../window-managers/windowlab/default.nix     | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 59 insertions(+)
 create mode 100644 nixos/modules/services/x11/window-managers/windowlab.nix
 create mode 100644 pkgs/applications/window-managers/windowlab/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5c1cde98d3d..7fc41b0e9ca 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -441,6 +441,7 @@
   ./services/x11/window-managers/metacity.nix
   ./services/x11/window-managers/none.nix
   ./services/x11/window-managers/twm.nix
+  ./services/x11/window-managers/windowlab.nix
   ./services/x11/window-managers/wmii.nix
   ./services/x11/window-managers/xmonad.nix
   ./services/x11/xfs.nix
diff --git a/nixos/modules/services/x11/window-managers/windowlab.nix b/nixos/modules/services/x11/window-managers/windowlab.nix
new file mode 100644
index 00000000000..fb891a39fa4
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/windowlab.nix
@@ -0,0 +1,22 @@
+{lib, pkgs, config, ...}:
+
+let
+  cfg = config.services.xserver.windowManager.windowlab;
+in
+
+{
+  options = {
+    services.xserver.windowManager.windowlab.enable =
+      lib.mkEnableOption "windowlab";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.xserver.windowManager = {
+      session =
+        [{ name  = "windowlab";
+           start = "${pkgs.windowlab}/bin/windowlab";
+        }];
+    };
+    environment.systemPackages = [ pkgs.windowlab ];
+  };
+}
diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix
new file mode 100644
index 00000000000..39865c4b3e7
--- /dev/null
+++ b/pkgs/applications/window-managers/windowlab/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig
+, libX11, libXext, libXft }:
+
+let version = "1.40"; in
+stdenv.mkDerivation {
+  name = "windowlab-${version}";
+
+  src = fetchurl {
+    url = "http://nickgravgaard.com/windowlab/windowlab-${version}.tar";
+    sha256 = "1fx4jwq4s98p2wpvawsiww7d6568bpjgcjpks61dzfj8p2j32s4d";
+  };
+
+  buildInputs = [ pkgconfig libX11 libXext libXft ];
+
+  postPatch =
+    ''
+      mv Makefile Makefile.orig
+      echo \
+         "
+          DEFINES += -DXFT
+          EXTRA_INC += $(pkg-config --cflags xft)
+          EXTRA_LIBS += $(pkg-config --libs xft)
+         " > Makefile
+      sed "s|/usr/local|$out|g" Makefile.orig >> Makefile
+    '';
+
+  meta = with stdenv.lib;
+    { description = "Small and simple stacking window manager";
+      homepage    = "http://nickgravgaard.com/windowlab/";
+      license     = licenses.gpl2;
+      maintainers = with maintainers; [ ehmry ];
+      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 e8ceb32a499..929ac7f4050 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13571,6 +13571,8 @@ let
     freerdp = freerdpUnstable;
   };
 
+  windowlab = callPackage ../applications/window-managers/windowlab { };
+
   windowmaker = callPackage ../applications/window-managers/windowmaker { };
 
   alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };

From 8627b268746aebd2fda1f386647e5ff12bcfee95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 11:40:44 +0100
Subject: [PATCH 157/249] libpng-1.2: security update 1.2.54 -> 1.2.55

It should finally fix #11030 and CVE-2015-8126 for 1.2.
---
 pkgs/development/libraries/libpng/12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index d2fa6b184d6..7ae3d0e1d68 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -3,11 +3,11 @@
 assert !(stdenv ? cross) -> zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.54";
+  name = "libpng-1.2.55";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "0wnjy7gqn0f24qrlggs7kl0ij59by413j1xmqp12n3vqh9j531fg";
+    sha256 = "0zkra0b9lrpk2axassdgkqinmc2ba6b473sm52xbpyknaqs2fljy";
   };
 
   propagatedBuildInputs = [ zlib ];

From 468f698f609e123bb0ffae67181d07ac99eb2204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 12:06:00 +0100
Subject: [PATCH 158/249] rsync: security update 3.1.1 -> 3.1.2

This should fix CVE-2014-9512.
https://download.samba.org/pub/rsync/src/rsync-3.1.2-NEWS
---
 pkgs/applications/networking/sync/rsync/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 5e09beb4c47..c13bb1b329d 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -7,18 +7,18 @@ assert enableACLs -> acl != null;
 
 stdenv.mkDerivation rec {
   name = "rsync-${version}";
-  version = "3.1.1";
+  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 = "0896iah6w72q5izpxgkai75bn40dqkqifi2ivcxjzr2zrx7kdr3x";
+    sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc";
   };
 
   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 = "0iij996xbyn20yr4w3kv3rw3cx4jwkg2k85x6w5hb5xlgsis8zjl";
+    sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd";
   };
 
   srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;

From a5b68eb4f6a0d1ac128c103891d8b959363964de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 30 Dec 2015 10:40:18 +0100
Subject: [PATCH 159/249] xorg: add meta.platforms

Add it to the generator script (generate-expr-from-tarballs.pl) and then
add the updated generated file (pkgs/servers/x11/xorg/default.nix) after
performing the steps outlined in the generator script.

NOTE: People seem to have updated .../default.nix manually (even though
it has a "THIS IS A GENERATED FILE.  DO NOT EDIT!" header), so I had to
skip some changes to not downgrade several packages.
---
 pkgs/servers/x11/xorg/default.nix             | 224 ++++++++++++++++++
 .../x11/xorg/generate-expr-from-tarballs.pl   |   1 +
 2 files changed, 225 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 75feb46a7fa..29653b6f1e1 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -25,6 +25,7 @@ let
       sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   bdftopcf = (mkDerivation "bdftopcf" {
@@ -35,6 +36,7 @@ let
       sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q";
     };
     buildInputs = [pkgconfig libXfont ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXfont ;};
 
   bigreqsproto = (mkDerivation "bigreqsproto" {
@@ -45,6 +47,7 @@ let
       sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   compositeproto = (mkDerivation "compositeproto" {
@@ -55,6 +58,7 @@ let
       sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   damageproto = (mkDerivation "damageproto" {
@@ -65,6 +69,7 @@ let
       sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   dmxproto = (mkDerivation "dmxproto" {
@@ -75,6 +80,7 @@ let
       sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   dri2proto = (mkDerivation "dri2proto" {
@@ -85,6 +91,7 @@ let
       sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   dri3proto = (mkDerivation "dri3proto" {
@@ -95,6 +102,7 @@ let
       sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   encodings = (mkDerivation "encodings" {
@@ -105,6 +113,7 @@ let
       sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   fixesproto = (mkDerivation "fixesproto" {
@@ -115,6 +124,7 @@ let
       sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs";
     };
     buildInputs = [pkgconfig xextproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xextproto ;};
 
   fontadobe100dpi = (mkDerivation "fontadobe100dpi" {
@@ -125,6 +135,7 @@ let
       sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobe75dpi = (mkDerivation "fontadobe75dpi" {
@@ -135,6 +146,7 @@ let
       sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobeutopia100dpi = (mkDerivation "fontadobeutopia100dpi" {
@@ -145,6 +157,7 @@ let
       sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobeutopia75dpi = (mkDerivation "fontadobeutopia75dpi" {
@@ -155,6 +168,7 @@ let
       sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobeutopiatype1 = (mkDerivation "fontadobeutopiatype1" {
@@ -165,6 +179,7 @@ let
       sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontalias = (mkDerivation "fontalias" {
@@ -175,6 +190,7 @@ let
       sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   fontarabicmisc = (mkDerivation "fontarabicmisc" {
@@ -185,6 +201,7 @@ let
       sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontbh100dpi = (mkDerivation "fontbh100dpi" {
@@ -195,6 +212,7 @@ let
       sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontbh75dpi = (mkDerivation "fontbh75dpi" {
@@ -205,6 +223,7 @@ let
       sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontbhlucidatypewriter100dpi = (mkDerivation "fontbhlucidatypewriter100dpi" {
@@ -215,6 +234,7 @@ let
       sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontbhlucidatypewriter75dpi = (mkDerivation "fontbhlucidatypewriter75dpi" {
@@ -225,6 +245,7 @@ let
       sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontbhttf = (mkDerivation "fontbhttf" {
@@ -235,6 +256,7 @@ let
       sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontbhtype1 = (mkDerivation "fontbhtype1" {
@@ -245,6 +267,7 @@ let
       sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontbitstream100dpi = (mkDerivation "fontbitstream100dpi" {
@@ -255,6 +278,7 @@ let
       sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontbitstream75dpi = (mkDerivation "fontbitstream75dpi" {
@@ -265,6 +289,7 @@ let
       sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontbitstreamtype1 = (mkDerivation "fontbitstreamtype1" {
@@ -275,6 +300,7 @@ let
       sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontcronyxcyrillic = (mkDerivation "fontcronyxcyrillic" {
@@ -285,6 +311,7 @@ let
       sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontcursormisc = (mkDerivation "fontcursormisc" {
@@ -295,6 +322,7 @@ let
       sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontdaewoomisc = (mkDerivation "fontdaewoomisc" {
@@ -305,6 +333,7 @@ let
       sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontdecmisc = (mkDerivation "fontdecmisc" {
@@ -315,6 +344,7 @@ let
       sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontibmtype1 = (mkDerivation "fontibmtype1" {
@@ -325,6 +355,7 @@ let
       sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontisasmisc = (mkDerivation "fontisasmisc" {
@@ -335,6 +366,7 @@ let
       sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontjismisc = (mkDerivation "fontjismisc" {
@@ -345,6 +377,7 @@ let
       sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontmicromisc = (mkDerivation "fontmicromisc" {
@@ -355,6 +388,7 @@ let
       sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontmisccyrillic = (mkDerivation "fontmisccyrillic" {
@@ -365,6 +399,7 @@ let
       sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontmiscethiopic = (mkDerivation "fontmiscethiopic" {
@@ -375,6 +410,7 @@ let
       sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontmiscmeltho = (mkDerivation "fontmiscmeltho" {
@@ -385,6 +421,7 @@ let
       sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontmiscmisc = (mkDerivation "fontmiscmisc" {
@@ -395,6 +432,7 @@ let
       sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontmuttmisc = (mkDerivation "fontmuttmisc" {
@@ -405,6 +443,7 @@ let
       sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontschumachermisc = (mkDerivation "fontschumachermisc" {
@@ -415,6 +454,7 @@ let
       sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontscreencyrillic = (mkDerivation "fontscreencyrillic" {
@@ -425,6 +465,7 @@ let
       sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontsonymisc = (mkDerivation "fontsonymisc" {
@@ -435,6 +476,7 @@ let
       sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontsproto = (mkDerivation "fontsproto" {
@@ -445,6 +487,7 @@ let
       sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   fontsunmisc = (mkDerivation "fontsunmisc" {
@@ -455,6 +498,7 @@ let
       sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontutil = (mkDerivation "fontutil" {
@@ -465,6 +509,7 @@ let
       sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   fontwinitzkicyrillic = (mkDerivation "fontwinitzkicyrillic" {
@@ -475,6 +520,7 @@ let
       sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontxfree86type1 = (mkDerivation "fontxfree86type1" {
@@ -485,6 +531,7 @@ let
       sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   gccmakedep = (mkDerivation "gccmakedep" {
@@ -495,6 +542,7 @@ let
       sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   glamoregl = (mkDerivation "glamoregl" {
@@ -505,6 +553,7 @@ let
       sha256 = "1jg5clihklb9drh1jd7nhhdsszla6nv7xmbvm8yvakh5wrb1nlv6";
     };
     buildInputs = [pkgconfig dri2proto xorgserver ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit dri2proto xorgserver ;};
 
   glproto = (mkDerivation "glproto" {
@@ -515,6 +564,7 @@ let
       sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   iceauth = (mkDerivation "iceauth" {
@@ -525,6 +575,7 @@ let
       sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj";
     };
     buildInputs = [pkgconfig libICE xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libICE xproto ;};
 
   imake = (mkDerivation "imake" {
@@ -535,6 +586,7 @@ let
       sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   inputproto = (mkDerivation "inputproto" {
@@ -545,6 +597,7 @@ let
       sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   kbproto = (mkDerivation "kbproto" {
@@ -555,6 +608,7 @@ let
       sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   libAppleWM = (mkDerivation "libAppleWM" {
@@ -565,6 +619,7 @@ let
       sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y";
     };
     buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit applewmproto libX11 libXext xextproto ;};
 
   libFS = (mkDerivation "libFS" {
@@ -575,6 +630,7 @@ let
       sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f";
     };
     buildInputs = [pkgconfig fontsproto xproto xtrans ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto xproto xtrans ;};
 
   libICE = (mkDerivation "libICE" {
@@ -585,6 +641,7 @@ let
       sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g";
     };
     buildInputs = [pkgconfig xproto xtrans ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto xtrans ;};
 
   libSM = (mkDerivation "libSM" {
@@ -595,6 +652,7 @@ let
       sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b";
     };
     buildInputs = [pkgconfig libICE libuuid xproto xtrans ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libICE libuuid xproto xtrans ;};
 
   libWindowsWM = (mkDerivation "libWindowsWM" {
@@ -605,6 +663,7 @@ let
       sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15";
     };
     buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit windowswmproto libX11 libXext xextproto ;};
 
   libX11 = (mkDerivation "libX11" {
@@ -615,6 +674,7 @@ let
       sha256 = "04c1vj53xq2xgyxx5vhln3wm2d76hh1n95fvs3myhligkz1sfcfg";
     };
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
 
   libXScrnSaver = (mkDerivation "libXScrnSaver" {
@@ -625,6 +685,7 @@ let
       sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg";
     };
     buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit scrnsaverproto libX11 libXext xextproto ;};
 
   libXau = (mkDerivation "libXau" {
@@ -635,6 +696,7 @@ let
       sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   libXaw = (mkDerivation "libXaw" {
@@ -645,6 +707,7 @@ let
       sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
 
   libXcomposite = (mkDerivation "libXcomposite" {
@@ -655,6 +718,7 @@ let
       sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd";
     };
     buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit compositeproto libX11 libXfixes xproto ;};
 
   libXcursor = (mkDerivation "libXcursor" {
@@ -665,6 +729,7 @@ let
       sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv";
     };
     buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
 
   libXdamage = (mkDerivation "libXdamage" {
@@ -675,6 +740,7 @@ let
       sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw";
     };
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
 
   libXdmcp = (mkDerivation "libXdmcp" {
@@ -685,6 +751,7 @@ let
       sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   libXext = (mkDerivation "libXext" {
@@ -695,6 +762,7 @@ let
       sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m";
     };
     buildInputs = [pkgconfig libX11 xextproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xextproto xproto ;};
 
   libXfixes = (mkDerivation "libXfixes" {
@@ -705,6 +773,7 @@ let
       sha256 = "0rs7qgzr6dpr62db7sd91c1b47hzhzfr010qwnpcm8sg122w1gk3";
     };
     buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fixesproto libX11 xextproto xproto ;};
 
   libXfont = (mkDerivation "libXfont" {
@@ -715,6 +784,7 @@ let
       sha256 = "1630v3sfvwwlimb2ja10c84ql6v1mw9bdfhvan7pbybkgi99h25p";
     };
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
 
   libXft = (mkDerivation "libXft" {
@@ -725,6 +795,7 @@ let
       sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm";
     };
     buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
   libXi = (mkDerivation "libXi" {
@@ -735,6 +806,7 @@ let
       sha256 = "0ad21jy40d8b2f9ldadx7lkspmvka1i9r5jqqfwxdxyqnpgdfr6r";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
 
   libXinerama = (mkDerivation "libXinerama" {
@@ -745,6 +817,7 @@ let
       sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto xineramaproto ;};
 
   libXmu = (mkDerivation "libXmu" {
@@ -755,6 +828,7 @@ let
       sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto xproto libXt ;};
 
   libXp = (mkDerivation "libXp" {
@@ -765,6 +839,7 @@ let
       sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit printproto libX11 libXau libXext xextproto ;};
 
   libXpm = (mkDerivation "libXpm" {
@@ -775,6 +850,7 @@ let
       sha256 = "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto xproto libXt ;};
 
   libXpresent = (mkDerivation "libXpresent" {
@@ -785,6 +861,7 @@ let
       sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1";
     };
     buildInputs = [pkgconfig presentproto libX11 xextproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit presentproto libX11 xextproto xproto ;};
 
   libXrandr = (mkDerivation "libXrandr" {
@@ -795,6 +872,7 @@ let
       sha256 = "0n6ycs1arf4wb1cal9il6v7vbxbf21qhs9sbfl8xndgwnxclk1kg";
     };
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
 
   libXrender = (mkDerivation "libXrender" {
@@ -805,6 +883,7 @@ let
       sha256 = "06myx7044qqdswxndsmd82fpp670klnizkgzdm194h51h1wyabzw";
     };
     buildInputs = [pkgconfig renderproto libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit renderproto libX11 xproto ;};
 
   libXres = (mkDerivation "libXres" {
@@ -815,6 +894,7 @@ let
       sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296";
     };
     buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit resourceproto libX11 libXext xextproto xproto ;};
 
   libXt = (mkDerivation "libXt" {
@@ -825,6 +905,7 @@ let
       sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6";
     };
     buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libICE kbproto libSM libX11 xproto ;};
 
   libXtst = (mkDerivation "libXtst" {
@@ -835,6 +916,7 @@ let
       sha256 = "1ngn161nq679ffmbwl81i2hn75jjg5b3ffv6n4jilpvyazypy2pg";
     };
     buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
 
   libXv = (mkDerivation "libXv" {
@@ -845,6 +927,7 @@ let
       sha256 = "09a5j6bisysiipd0nw6s352565bp0n6gbyhv5hp63s3cd3w95zjm";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit videoproto libX11 libXext xextproto xproto ;};
 
   libXvMC = (mkDerivation "libXvMC" {
@@ -855,6 +938,7 @@ let
       sha256 = "0mjp1b21dvkaz7r0iq085r92nh5vkpmx99awfgqq9hgzyvgxf0q7";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
 
   libXxf86dga = (mkDerivation "libXxf86dga" {
@@ -865,6 +949,7 @@ let
       sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
 
   libXxf86misc = (mkDerivation "libXxf86misc" {
@@ -875,6 +960,7 @@ let
       sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
 
   libXxf86vm = (mkDerivation "libXxf86vm" {
@@ -885,6 +971,7 @@ let
       sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
 
   libdmx = (mkDerivation "libdmx" {
@@ -895,6 +982,7 @@ let
       sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9";
     };
     buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit dmxproto libX11 libXext xextproto ;};
 
   libfontenc = (mkDerivation "libfontenc" {
@@ -905,6 +993,7 @@ let
       sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h";
     };
     buildInputs = [pkgconfig xproto zlib ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto zlib ;};
 
   libpciaccess = (mkDerivation "libpciaccess" {
@@ -915,6 +1004,7 @@ let
       sha256 = "1krgryi9ngjr66242v0v5mczihgv0y7rrvx0563arr318mjn9y07";
     };
     buildInputs = [pkgconfig zlib ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit zlib ;};
 
   libpthreadstubs = (mkDerivation "libpthreadstubs" {
@@ -925,6 +1015,7 @@ let
       sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   libxcb = (mkDerivation "libxcb" {
@@ -935,6 +1026,7 @@ let
       sha256 = "0c4xyvdyx5adh8dzyhnrmvwwz24gri4z1czxmxqm63i0gmngs85p";
     };
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
 
   libxkbfile = (mkDerivation "libxkbfile" {
@@ -945,6 +1037,7 @@ let
       sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai";
     };
     buildInputs = [pkgconfig kbproto libX11 ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit kbproto libX11 ;};
 
   libxshmfence = (mkDerivation "libxshmfence" {
@@ -955,6 +1048,7 @@ let
       sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   lndir = (mkDerivation "lndir" {
@@ -965,6 +1059,7 @@ let
       sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   luit = (mkDerivation "luit" {
@@ -975,6 +1070,7 @@ let
       sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h";
     };
     buildInputs = [pkgconfig libfontenc ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libfontenc ;};
 
   makedepend = (mkDerivation "makedepend" {
@@ -985,6 +1081,7 @@ let
       sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   mkfontdir = (mkDerivation "mkfontdir" {
@@ -995,6 +1092,7 @@ let
       sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   mkfontscale = (mkDerivation "mkfontscale" {
@@ -1005,6 +1103,7 @@ let
       sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc";
     };
     buildInputs = [pkgconfig libfontenc freetype xproto zlib ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libfontenc freetype xproto zlib ;};
 
   presentproto = (mkDerivation "presentproto" {
@@ -1015,6 +1114,7 @@ let
       sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   printproto = (mkDerivation "printproto" {
@@ -1025,6 +1125,7 @@ let
       sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j";
     };
     buildInputs = [pkgconfig libXau ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXau ;};
 
   randrproto = (mkDerivation "randrproto" {
@@ -1035,6 +1136,7 @@ let
       sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   recordproto = (mkDerivation "recordproto" {
@@ -1045,6 +1147,7 @@ let
       sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   renderproto = (mkDerivation "renderproto" {
@@ -1055,6 +1158,7 @@ let
       sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   resourceproto = (mkDerivation "resourceproto" {
@@ -1065,6 +1169,7 @@ let
       sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   scrnsaverproto = (mkDerivation "scrnsaverproto" {
@@ -1075,6 +1180,7 @@ let
       sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   sessreg = (mkDerivation "sessreg" {
@@ -1085,6 +1191,7 @@ let
       sha256 = "0z013rskwmdadd8cdlxvh4asmgim61qijyzfbqmr1q1mg1jpf4am";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   setxkbmap = (mkDerivation "setxkbmap" {
@@ -1095,6 +1202,7 @@ let
       sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libxkbfile ;};
 
   smproxy = (mkDerivation "smproxy" {
@@ -1105,6 +1213,7 @@ let
       sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc";
     };
     buildInputs = [pkgconfig libICE libSM libXmu libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libICE libSM libXmu libXt ;};
 
   twm = (mkDerivation "twm" {
@@ -1115,6 +1224,7 @@ let
       sha256 = "02iicvhkp3i7q5rliyymiq9bppjr0pzfs6rgb78kppryqdx1cxf5";
     };
     buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
 
   utilmacros = (mkDerivation "utilmacros" {
@@ -1125,6 +1235,7 @@ let
       sha256 = "1fnhpryf55l0yqajxn0cxan3kvsjzi67nlanz8clwqzf54cb2d98";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   videoproto = (mkDerivation "videoproto" {
@@ -1135,6 +1246,7 @@ let
       sha256 = "1dnlkd9nb0m135lgd6hd61vc29sdyarsyya8aqpx7z10p261dbld";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   windowswmproto = (mkDerivation "windowswmproto" {
@@ -1145,6 +1257,7 @@ let
       sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   x11perf = (mkDerivation "x11perf" {
@@ -1155,6 +1268,7 @@ let
       sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78";
     };
     buildInputs = [pkgconfig libX11 libXext libXft libXmu xproto libXrender ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;};
 
   xauth = (mkDerivation "xauth" {
@@ -1165,6 +1279,7 @@ let
       sha256 = "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn";
     };
     buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXau libXext libXmu xproto ;};
 
   xbacklight = (mkDerivation "xbacklight" {
@@ -1175,6 +1290,7 @@ let
       sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp";
     };
     buildInputs = [pkgconfig libxcb xcbutil ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libxcb xcbutil ;};
 
   xbitmaps = (mkDerivation "xbitmaps" {
@@ -1185,6 +1301,7 @@ let
       sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xcbproto = (mkDerivation "xcbproto" {
@@ -1195,6 +1312,7 @@ let
       sha256 = "0bp3f53l9fy5x3mn1rkj1g81aiyzl90wacwvqdgy831aa3kfxb5l";
     };
     buildInputs = [pkgconfig python ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit python ;};
 
   xcbutil = (mkDerivation "xcbutil" {
@@ -1205,6 +1323,7 @@ let
       sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xproto ;};
 
   xcbutilcursor = (mkDerivation "xcbutilcursor" {
@@ -1215,6 +1334,7 @@ let
       sha256 = "0fpv46zb7kz04qxwvpax4cpd2kd8yhsm2n0if1isniqdh5xkcrgd";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;};
 
   xcbutilerrors = (mkDerivation "xcbutilerrors" {
@@ -1225,6 +1345,7 @@ let
       sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xcbproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xcbproto xproto ;};
 
   xcbutilimage = (mkDerivation "xcbutilimage" {
@@ -1235,6 +1356,7 @@ let
       sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xcbutil xproto ;};
 
   xcbutilkeysyms = (mkDerivation "xcbutilkeysyms" {
@@ -1245,6 +1367,7 @@ let
       sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xproto ;};
 
   xcbutilrenderutil = (mkDerivation "xcbutilrenderutil" {
@@ -1255,6 +1378,7 @@ let
       sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xproto ;};
 
   xcbutilwm = (mkDerivation "xcbutilwm" {
@@ -1265,6 +1389,7 @@ let
       sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xproto ;};
 
   xclock = (mkDerivation "xclock" {
@@ -1275,6 +1400,7 @@ let
       sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3";
     };
     buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;};
 
   xcmiscproto = (mkDerivation "xcmiscproto" {
@@ -1285,6 +1411,7 @@ let
       sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xcmsdb = (mkDerivation "xcmsdb" {
@@ -1295,6 +1422,7 @@ let
       sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75";
     };
     buildInputs = [pkgconfig libX11 ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 ;};
 
   xcompmgr = (mkDerivation "xcompmgr" {
@@ -1305,6 +1433,7 @@ let
       sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168";
     };
     buildInputs = [pkgconfig libXcomposite libXdamage libXext libXfixes libXrender ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXcomposite libXdamage libXext libXfixes libXrender ;};
 
   xcursorgen = (mkDerivation "xcursorgen" {
@@ -1315,6 +1444,7 @@ let
       sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i";
     };
     buildInputs = [pkgconfig libpng libX11 libXcursor ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libpng libX11 libXcursor ;};
 
   xcursorthemes = (mkDerivation "xcursorthemes" {
@@ -1325,6 +1455,7 @@ let
       sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3";
     };
     buildInputs = [pkgconfig libXcursor ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXcursor ;};
 
   xdm = (mkDerivation "xdm" {
@@ -1335,6 +1466,7 @@ let
       sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl";
     };
     buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
 
   xdpyinfo = (mkDerivation "xdpyinfo" {
@@ -1345,6 +1477,7 @@ let
       sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh";
     };
     buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
 
   xdriinfo = (mkDerivation "xdriinfo" {
@@ -1355,6 +1488,7 @@ let
       sha256 = "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc";
     };
     buildInputs = [pkgconfig glproto libX11 ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit glproto libX11 ;};
 
   xev = (mkDerivation "xev" {
@@ -1365,6 +1499,7 @@ let
       sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto libXrandr ;};
 
   xextproto = (mkDerivation "xextproto" {
@@ -1375,6 +1510,7 @@ let
       sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xeyes = (mkDerivation "xeyes" {
@@ -1385,6 +1521,7 @@ let
       sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext libXmu libXrender libXt ;};
 
   xf86bigfontproto = (mkDerivation "xf86bigfontproto" {
@@ -1395,6 +1532,7 @@ let
       sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xf86dgaproto = (mkDerivation "xf86dgaproto" {
@@ -1405,6 +1543,7 @@ let
       sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xf86driproto = (mkDerivation "xf86driproto" {
@@ -1415,6 +1554,7 @@ let
       sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xf86inputevdev = (mkDerivation "xf86inputevdev" {
@@ -1425,6 +1565,7 @@ let
       sha256 = "05yihr84rf209yyjvin8ab55h504b30c7dck8kgrwykvn272k5yh";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto udev xorgserver xproto ;};
 
   xf86inputjoystick = (mkDerivation "xf86inputjoystick" {
@@ -1435,6 +1576,7 @@ let
       sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf";
     };
     buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto kbproto xorgserver xproto ;};
 
   xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" {
@@ -1445,6 +1587,7 @@ let
       sha256 = "04d27kwqq03fc26an6051hs3i0bff8albhnngzyd59wxpwwzzj0s";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
@@ -1455,6 +1598,7 @@ let
       sha256 = "0hcs05zx9mpyi9wajsps9qsbyq4v0c9wysp2l48qnr4l8587qw18";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputmouse = (mkDerivation "xf86inputmouse" {
@@ -1465,6 +1609,7 @@ let
       sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" {
@@ -1475,6 +1620,7 @@ let
       sha256 = "009zx199pilcvlaqm6fx4mg94q81d6vvl5rznmw3frzkfh6117yk";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
 
   xf86inputvmmouse = (mkDerivation "xf86inputvmmouse" {
@@ -1485,6 +1631,7 @@ let
       sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a";
     };
     buildInputs = [pkgconfig inputproto udev randrproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto udev randrproto xorgserver xproto ;};
 
   xf86inputvoid = (mkDerivation "xf86inputvoid" {
@@ -1495,6 +1642,7 @@ let
       sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xorgserver xproto ;};
 
   xf86miscproto = (mkDerivation "xf86miscproto" {
@@ -1505,6 +1653,7 @@ let
       sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xf86videoark = (mkDerivation "xf86videoark" {
@@ -1515,6 +1664,7 @@ let
       sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
 
   xf86videoast = (mkDerivation "xf86videoast" {
@@ -1525,6 +1675,7 @@ let
       sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoati = (mkDerivation "xf86videoati" {
@@ -1535,6 +1686,7 @@ let
       sha256 = "0k6kw69mcarlmxlb4jlhz887jxqr94qx2pin04xcv2ysp3pdj5i5";
     };
     buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videochips = (mkDerivation "xf86videochips" {
@@ -1545,6 +1697,7 @@ let
       sha256 = "073bcdsvvsg19mb963sa5v7x2zs19y0q6javmgpiwfaqkz7zbblr";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videocirrus = (mkDerivation "xf86videocirrus" {
@@ -1555,6 +1708,7 @@ let
       sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videodummy = (mkDerivation "xf86videodummy" {
@@ -1565,6 +1719,7 @@ let
       sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
 
   xf86videofbdev = (mkDerivation "xf86videofbdev" {
@@ -1575,6 +1730,7 @@ let
       sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
 
   xf86videogeode = (mkDerivation "xf86videogeode" {
@@ -1585,6 +1741,7 @@ let
       sha256 = "0h9w6cfj7s86rg72c6qci8f733hg4g7paan5fwmmj7p74ckd9d07";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoglide = (mkDerivation "xf86videoglide" {
@@ -1595,6 +1752,7 @@ let
       sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y";
     };
     buildInputs = [pkgconfig xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xextproto xorgserver xproto ;};
 
   xf86videoglint = (mkDerivation "xf86videoglint" {
@@ -1605,6 +1763,7 @@ let
       sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5";
     };
     buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
   xf86videoi128 = (mkDerivation "xf86videoi128" {
@@ -1615,6 +1774,7 @@ let
       sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoi740 = (mkDerivation "xf86videoi740" {
@@ -1625,6 +1785,7 @@ let
       sha256 = "0973zzmdsvlmplcax1c91is7v78lcwy6d9mwp11npgqzl782vq0w";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videointel = (mkDerivation "xf86videointel" {
@@ -1635,6 +1796,7 @@ let
       sha256 = "0x11dig1wmpjz5n35sh30zs58ar8q8836w3zrkwkvgxj6q6smvvr";
     };
     buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;};
 
   xf86videomach64 = (mkDerivation "xf86videomach64" {
@@ -1645,6 +1807,7 @@ let
       sha256 = "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videomga = (mkDerivation "xf86videomga" {
@@ -1655,6 +1818,7 @@ let
       sha256 = "0kyl8w99arviv27pc349zsy2vinnm7mdpy34vr9nzisicw5nkij8";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videomodesetting = (mkDerivation "xf86videomodesetting" {
@@ -1665,6 +1829,7 @@ let
       sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
 
   xf86videoneomagic = (mkDerivation "xf86videoneomagic" {
@@ -1675,6 +1840,7 @@ let
       sha256 = "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess xorgserver xproto ;};
 
   xf86videonewport = (mkDerivation "xf86videonewport" {
@@ -1685,6 +1851,7 @@ let
       sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
 
   xf86videonouveau = (mkDerivation "xf86videonouveau" {
@@ -1695,6 +1862,7 @@ let
       sha256 = "0j3847rnffy81iaxxi6vnd8saadrc9jahfmckr0sjgkzg2rf4kzq";
     };
     buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videonv = (mkDerivation "xf86videonv" {
@@ -1705,6 +1873,7 @@ let
       sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" {
@@ -1715,6 +1884,7 @@ let
       sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4";
     };
     buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
 
   xf86videoqxl = (mkDerivation "xf86videoqxl" {
@@ -1725,6 +1895,7 @@ let
       sha256 = "1368dd5mihn3s098n7wa3fpjkp8pnamabfjjipkqs9zyrcvncy3m";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
 
   xf86videor128 = (mkDerivation "xf86videor128" {
@@ -1735,6 +1906,7 @@ let
       sha256 = "0g9m1n5184h05mq14vb6k288zm6g81a9m048id00l8v8f6h33mc0";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
 
   xf86videos3virge = (mkDerivation "xf86videos3virge" {
@@ -1745,6 +1917,7 @@ let
       sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videosavage = (mkDerivation "xf86videosavage" {
@@ -1755,6 +1928,7 @@ let
       sha256 = "0qzshncynjdmyhavhqw4x5ha3gwbygi0zbsy158fpg1jcnla9kpx";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" {
@@ -1765,6 +1939,7 @@ let
       sha256 = "1sqv0y31mi4zmh9yaxqpzg7p8y2z01j6qys433hb8n4yznllkm79";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
 
   xf86videosis = (mkDerivation "xf86videosis" {
@@ -1775,6 +1950,7 @@ let
       sha256 = "1znkqwdyd6am23xbsfjzamq125j5rrylg5mzqky4scv9gxbz5wy8";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
 
   xf86videosuncg6 = (mkDerivation "xf86videosuncg6" {
@@ -1785,6 +1961,7 @@ let
       sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
 
   xf86videosunffb = (mkDerivation "xf86videosunffb" {
@@ -1795,6 +1972,7 @@ let
       sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
 
   xf86videotdfx = (mkDerivation "xf86videotdfx" {
@@ -1805,6 +1983,7 @@ let
       sha256 = "0dvdrhyn1iv6rr85v1c52s1gl0j1qrxgv7x0r7qn3ba0gj38i2is";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videotga = (mkDerivation "xf86videotga" {
@@ -1815,6 +1994,7 @@ let
       sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
   xf86videotrident = (mkDerivation "xf86videotrident" {
@@ -1825,6 +2005,7 @@ let
       sha256 = "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
   xf86videov4l = (mkDerivation "xf86videov4l" {
@@ -1835,6 +2016,7 @@ let
       sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb";
     };
     buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit randrproto videoproto xorgserver xproto ;};
 
   xf86videovesa = (mkDerivation "xf86videovesa" {
@@ -1845,6 +2027,7 @@ let
       sha256 = "1haiw8r1z8ihk68d0jqph2wsld13w4qkl86biq46fvyxg7cg9pbv";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
 
   xf86videovmware = (mkDerivation "xf86videovmware" {
@@ -1855,6 +2038,7 @@ let
       sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
 
   xf86videovoodoo = (mkDerivation "xf86videovoodoo" {
@@ -1865,6 +2049,7 @@ let
       sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
 
   xf86videowsfb = (mkDerivation "xf86videowsfb" {
@@ -1875,6 +2060,7 @@ let
       sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xorgserver xproto ;};
 
   xf86videoxgi = (mkDerivation "xf86videoxgi" {
@@ -1885,6 +2071,7 @@ let
       sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si";
     };
     buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;};
 
   xf86vidmodeproto = (mkDerivation "xf86vidmodeproto" {
@@ -1895,6 +2082,7 @@ let
       sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xfs = (mkDerivation "xfs" {
@@ -1905,6 +2093,7 @@ let
       sha256 = "1ylz4r7adf567rnlbb52yi9x3qi4pyv954kkhm7ld4f0fkk7a2x4";
     };
     buildInputs = [pkgconfig libXfont xproto xtrans ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXfont xproto xtrans ;};
 
   xgamma = (mkDerivation "xgamma" {
@@ -1915,6 +2104,7 @@ let
       sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f";
     };
     buildInputs = [pkgconfig libX11 xproto libXxf86vm ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto libXxf86vm ;};
 
   xgc = (mkDerivation "xgc" {
@@ -1925,6 +2115,7 @@ let
       sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl";
     };
     buildInputs = [pkgconfig libXaw libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXaw libXt ;};
 
   xhost = (mkDerivation "xhost" {
@@ -1935,6 +2126,7 @@ let
       sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk";
     };
     buildInputs = [pkgconfig libX11 libXau libXmu xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXau libXmu xproto ;};
 
   xineramaproto = (mkDerivation "xineramaproto" {
@@ -1945,6 +2137,7 @@ let
       sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xinit = (mkDerivation "xinit" {
@@ -1955,6 +2148,7 @@ let
       sha256 = "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xinput = (mkDerivation "xinput" {
@@ -1965,6 +2159,7 @@ let
       sha256 = "1i75mviz9dyqyf7qigzmxq8vn31i86aybm662fzjz5c086dx551n";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
 
   xkbcomp = (mkDerivation "xkbcomp" {
@@ -1975,6 +2170,7 @@ let
       sha256 = "0gcjy70ppmcl610z8gxc7sydsx93f8cm8pggm4qhihaa1ngdq103";
     };
     buildInputs = [pkgconfig libX11 libxkbfile xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libxkbfile xproto ;};
 
   xkbevd = (mkDerivation "xkbevd" {
@@ -1985,6 +2181,7 @@ let
       sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libxkbfile ;};
 
   xkbprint = (mkDerivation "xkbprint" {
@@ -1995,6 +2192,7 @@ let
       sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb";
     };
     buildInputs = [pkgconfig libX11 libxkbfile xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libxkbfile xproto ;};
 
   xkbutils = (mkDerivation "xkbutils" {
@@ -2005,6 +2203,7 @@ let
       sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj";
     };
     buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
   xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
@@ -2015,6 +2214,7 @@ let
       sha256 = "1grqdy5a9f2dii3y24fn0p3kz4q5g9j2kh3jcj2402rgrbvkqi0f";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xkill = (mkDerivation "xkill" {
@@ -2025,6 +2225,7 @@ let
       sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXmu xproto ;};
 
   xlsatoms = (mkDerivation "xlsatoms" {
@@ -2035,6 +2236,7 @@ let
       sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7";
     };
     buildInputs = [pkgconfig libxcb ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libxcb ;};
 
   xlsclients = (mkDerivation "xlsclients" {
@@ -2045,6 +2247,7 @@ let
       sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx";
     };
     buildInputs = [pkgconfig libxcb ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libxcb ;};
 
   xlsfonts = (mkDerivation "xlsfonts" {
@@ -2055,6 +2258,7 @@ let
       sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xmag = (mkDerivation "xmag" {
@@ -2065,6 +2269,7 @@ let
       sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7";
     };
     buildInputs = [pkgconfig libX11 libXaw libXmu libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXaw libXmu libXt ;};
 
   xmessage = (mkDerivation "xmessage" {
@@ -2075,6 +2280,7 @@ let
       sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw";
     };
     buildInputs = [pkgconfig libXaw libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXaw libXt ;};
 
   xmodmap = (mkDerivation "xmodmap" {
@@ -2085,6 +2291,7 @@ let
       sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xorgcffiles = (mkDerivation "xorgcffiles" {
@@ -2095,6 +2302,7 @@ let
       sha256 = "1m3ypq0xcy46ghxc0svl1rbhpy3zvgmy0aa2mn7w7v7d8d8bh8zd";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xorgdocs = (mkDerivation "xorgdocs" {
@@ -2105,6 +2313,7 @@ let
       sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xorgserver = (mkDerivation "xorgserver" {
@@ -2115,6 +2324,7 @@ let
       sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc";
     };
     buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;};
 
   xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
@@ -2125,6 +2335,7 @@ let
       sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xpr = (mkDerivation "xpr" {
@@ -2135,6 +2346,7 @@ let
       sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXmu xproto ;};
 
   xprop = (mkDerivation "xprop" {
@@ -2145,6 +2357,7 @@ let
       sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xproto = (mkDerivation "xproto" {
@@ -2155,6 +2368,7 @@ let
       sha256 = "1jpnvm33vi2dar5y5zgz7jjh0m8fpkcxm0f0lbwfx37ns5l5bs19";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xrandr = (mkDerivation "xrandr" {
@@ -2165,6 +2379,7 @@ let
       sha256 = "06xy0kr6ih7ilrwl6b5g6ay75vm2j4lxnv1d5xlj6sdqhqsaqm3i";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto libXrandr libXrender ;};
 
   xrdb = (mkDerivation "xrdb" {
@@ -2175,6 +2390,7 @@ let
       sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXmu xproto ;};
 
   xrefresh = (mkDerivation "xrefresh" {
@@ -2185,6 +2401,7 @@ let
       sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xset = (mkDerivation "xset" {
@@ -2195,6 +2412,7 @@ let
       sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
 
   xsetroot = (mkDerivation "xsetroot" {
@@ -2205,6 +2423,7 @@ let
       sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8";
     };
     buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xbitmaps libXcursor libXmu ;};
 
   xtrans = (mkDerivation "xtrans" {
@@ -2215,6 +2434,7 @@ let
       sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xvinfo = (mkDerivation "xvinfo" {
@@ -2225,6 +2445,7 @@ let
       sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz";
     };
     buildInputs = [pkgconfig libX11 xproto libXv ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto libXv ;};
 
   xwd = (mkDerivation "xwd" {
@@ -2235,6 +2456,7 @@ let
       sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xwininfo = (mkDerivation "xwininfo" {
@@ -2245,6 +2467,7 @@ let
       sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1";
     };
     buildInputs = [pkgconfig libX11 libxcb xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libxcb xproto ;};
 
   xwud = (mkDerivation "xwud" {
@@ -2255,6 +2478,7 @@ let
       sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
 }; in xorg
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 6665a3bc00a..054e3f490e4 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -280,6 +280,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
       sha256 = "$pkgHashes{$pkg}";
     };
     buildInputs = [pkgconfig $inputs];$extraAttrs
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit $inputs;};
 
 EOF

From 1ba2015450263396bf47a108caba6fd66b1d5e79 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Dec 2015 12:53:36 +0100
Subject: [PATCH 160/249] install-grub: Make more robust against GC'ed system
 profile entries

Previously this barfed with:

  updating GRUB 2 menu...
  fileparse(): need a valid pathname at /nix/store/zldbbngl0f8g5iv4rslygxwp0dbg1624-install-grub.pl line 391.
  warning: error(s) occured while switching to the new configuration
---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index af39e50ff72..b8ef02da4bc 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -387,6 +387,10 @@ sub addProfile {
     my $curEntry = 0;
     foreach my $link (@links) {
         last if $curEntry++ >= $configurationLimit;
+        if (! -e "$link/nixos-version") {
+            warn "skipping corrupt system profile entry ‘$link’\n";
+            next;
+        }
         my $date = strftime("%F", localtime(lstat($link)->mtime));
         my $version =
             -e "$link/nixos-version"

From e78bad526286b392808b613e2435a9d4920d4b79 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Dec 2015 15:13:43 +0100
Subject: [PATCH 161/249] etc: Use a friendlier name than "etc-file"

---
 nixos/modules/system/etc/etc.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
index 300ae0acda5..9d5b3db472c 100644
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
@@ -112,8 +112,9 @@ in
 
           config = {
             target = mkDefault name;
-            source = mkIf (config.text != null)
-              (mkDefault (pkgs.writeText "etc-file" config.text));
+            source = mkIf (config.text != null) (
+              let name' = "etc-" + baseNameOf name;
+              in mkDefault (pkgs.writeText name' config.text));
           };
 
         });

From 146c727924674f1bf59a216b01d8ed5f534c287a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Dec 2015 12:40:29 +0100
Subject: [PATCH 162/249] waitForUnit: Fail if the unit reaches inactive state
 with no pending jobs

This prevents waitForUnit for looping for many minutes before giving
up.
---
 nixos/lib/test-driver/Machine.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 41088ed75f7..8ac0a31f287 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -381,6 +381,11 @@ sub waitForUnit {
             my $info = $self->getUnitInfo($unit);
             my $state = $info->{ActiveState};
             die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed";
+            if ($state eq "inactive") {
+                my ($status, $jobs) = $self->execute("systemctl list-jobs --full 2>&1");
+                die "unit ‘$unit’ is inactive and there are no pending jobs\n"
+                    if $jobs =~ /No jobs/; # FIXME: fragile
+            }
             return 1 if $state eq "active";
         };
     });

From 8565efc4da6d3868e7b73e1cff17b8937007780c Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 30 Dec 2015 10:36:15 -0500
Subject: [PATCH 163/249] remove manual derivation for popup-mode

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 17610ddb232..fc2e60d7fd1 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1493,21 +1493,6 @@ let
     };
   };
 
-  popup = melpaBuild rec {
-    pname   = "popup";
-    version = "0.5.2";
-    src = fetchFromGitHub {
-      owner  = "auto-complete";
-      repo   = "${pname}-el";
-      rev    = "v${version}";
-      sha256 = "0aazkczrzpp75793bpi0pz0cs7vinhdrpxfdlzi0cr39njird2yj";
-    };
-    meta = {
-      description = "Popup tooltips and popup menus for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   projectile = melpaBuild rec {
     pname   = "projectile";
     version = "0.13.0";

From c1ec39d47be64499956d51e5684dadf69bf4c352 Mon Sep 17 00:00:00 2001
From: Shell Turner <cam.turn@gmail.com>
Date: Tue, 29 Dec 2015 16:29:44 +0000
Subject: [PATCH 164/249] icestorm: init at 2015.12.29

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

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
new file mode 100644
index 00000000000..726b805fe91
--- /dev/null
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, python3, libftdi }:
+
+stdenv.mkDerivation rec {
+  name = "icestorm-${version}";
+  version = "2015.12.29";
+
+  src = fetchFromGitHub {
+    owner = "cliffordwolf";
+    repo = "icestorm";
+    rev = "7852514c2cde208da87b62777b2c5e482092f50d";
+    sha256 = "1ya1nk5h28hjdmd8jdrlfiayr2434rnvi133gs1p0ay21qb3iwfz";
+  };
+
+  buildInputs = [ python3 libftdi ];
+  preBuild = ''
+    makeFlags="DESTDIR=$out $makeFlags"
+  '';
+
+  meta = {
+    description = "Documentation and tools for Lattice iCE40 FPGAs";
+    longDescription = ''
+      Project IceStorm aims at reverse engineering and
+      documenting the bitstream format of Lattice iCE40
+      FPGAs and providing simple tools for analyzing and
+      creating bitstream files.
+    '';
+    homepage = http://www.clifford.at/icestorm/;
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.shell ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ec1aff8776..fe73bf83c9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5755,6 +5755,8 @@ let
 
   hyenae = callPackage ../tools/networking/hyenae { };
 
+  icestorm = callPackage ../development/tools/icestorm { };
+
   icmake = callPackage ../development/tools/build-managers/icmake { };
 
   iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils {

From f11ec866ada39234a32f1637c72ff5ad8e3ff973 Mon Sep 17 00:00:00 2001
From: Shell Turner <cam.turn@gmail.com>
Date: Tue, 29 Dec 2015 16:30:45 +0000
Subject: [PATCH 165/249] arachne-pnr: init at 2015.12.29

---
 .../compilers/arachne-pnr/default.nix         | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/compilers/arachne-pnr/default.nix

diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
new file mode 100644
index 00000000000..7926bf273ac
--- /dev/null
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, icestorm }:
+
+stdenv.mkDerivation rec {
+  name = "arachne-pnr-${version}";
+  version = "2015.12.29";
+
+  src = fetchFromGitHub {
+    owner = "cseed";
+    repo = "arachne-pnr";
+    rev = "1a4fdf96a7fd08806c032d41a2443c8e17c72c80";
+    sha256 = "1dj7ycffwkmlsh12117fbybkdfnlhxbbxkbfgwfyvcgmg3cacgl1";
+  };
+
+  preBuild = ''
+    makeFlags="DESTDIR=$out $makeFlags"
+  '';
+  makeFlags = "ICEBOX=${icestorm}/share/icebox";
+
+  meta = {
+    description = "Place and route tool for FPGAs";
+    longDescription = ''
+      Arachne-pnr implements the place and route step of
+      the hardware compilation process for FPGAs. It
+      accepts as input a technology-mapped netlist in BLIF
+      format, as output by the Yosys [0] synthesis suite
+      for example. It currently targets the Lattice
+      Semiconductor iCE40 family of FPGAs [1]. Its output
+      is a textual bitstream representation for assembly by
+      the IceStorm [2] icepack command.
+    '';
+    homepage = https://github.com/cseed/arachne-pnr;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.shell ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe73bf83c9a..6c8ea319402 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3776,6 +3776,8 @@ let
 
   aliceml = callPackage ../development/compilers/aliceml { };
 
+  arachne-pnr = callPackage ../development/compilers/arachne-pnr { };
+
   aspectj = callPackage ../development/compilers/aspectj { };
 
   ats = callPackage ../development/compilers/ats { };

From c485543c7c1aca6d32e755d5736c035ba13f5c5a Mon Sep 17 00:00:00 2001
From: Shell Turner <cam.turn@gmail.com>
Date: Tue, 29 Dec 2015 16:31:18 +0000
Subject: [PATCH 166/249] yosys: init at 2015.12.29

---
 pkgs/development/compilers/yosys/default.nix | 50 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/compilers/yosys/default.nix

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
new file mode 100644
index 00000000000..cfaabb0a71a
--- /dev/null
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, fetchFromBitbucket, pkgconfig, tcl, readline, libffi, python3, bison, flex }:
+
+stdenv.mkDerivation rec {
+  name = "yosys-${version}";
+  version = "2015.12.29";
+
+  srcs = [
+    (fetchFromGitHub {
+      owner = "cliffordwolf";
+      repo = "yosys";
+      rev = "1d62f8710f04fec405ef79b9e9a4a031afcf7d42";
+      sha256 = "0q1dk9in3gmrihb58pjckncx56lj7y4b6y34jgb68f0fh91fdvfx";
+      name = "yosys";
+    })
+    (fetchFromBitbucket {
+      owner = "alanmi";
+      repo = "abc";
+      rev = "c3698e053a7a";
+      sha256 = "05p0fvbr7xvb6w3d7j2r6gynr3ljb6r5q6jvn2zs3ysn2b003qwd";
+      name = "abc";
+    })
+  ];
+  sourceRoot = "yosys";
+
+  buildInputs = [ pkgconfig tcl readline libffi python3 bison flex ];
+  preBuild = ''
+    chmod -R u+w ../abc
+    ln -s ../abc abc
+    make config-gcc
+    echo 'ABCREV := default' >> Makefile.conf
+    makeFlags="PREFIX=$out $makeFlags"
+  '';
+
+  meta = {
+    description = "Framework for RTL synthesis tools";
+    longDescription = ''
+      Yosys is a framework for RTL synthesis tools. It currently has
+      extensive Verilog-2005 support and provides a basic set of
+      synthesis algorithms for various application domains.
+
+      Yosys can be adapted to perform any synthesis job by combining
+      the existing passes (algorithms) using synthesis scripts and
+      adding additional passes as needed by extending the yosys C++
+      code base.
+    '';
+    homepage = http://www.clifford.at/yosys/;
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.shell ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c8ea319402..d22600fd0eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5001,6 +5001,8 @@ let
 
   yasm = callPackage ../development/compilers/yasm { };
 
+  yosys = callPackage ../development/compilers/yosys { };
+
 
   ### DEVELOPMENT / INTERPRETERS
 

From 358885fd875671e572abeaf1c723a8fc49f87dfa Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Wed, 30 Dec 2015 16:52:46 +0000
Subject: [PATCH 167/249] qmltermwidget: fix homepage url

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

diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 4d12f020d1e..24e1d2c9b9c 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A QML port of qtermwidget";
-    homepage = "https://github.com/Swordifish90/qmltermwidget";
+    homepage = "https://github.com/Swordfish90/qmltermwidget";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];

From f7ab821916103e215924e76456c26f2bd5abe3ae Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 30 Dec 2015 18:17:43 +0100
Subject: [PATCH 168/249] Julia: update libuv version

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

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 81781868b02..0eddde15a58 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -28,10 +28,10 @@ let
     sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
   };
 
-  libuvVersion = "28f5f06b5ff6f010d666ec26552e0badaca5cdcd";
+  libuvVersion = "9ab431a88fe255dd21e19a11f7fa2dd95774abf4";
   libuv = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
-    sha256 = "1ksns0aiayxmxffvq2kc96904mxlmbkfc30xxck69xnidr2jvr4a";
+    sha256 = "1bh973lbrzrjk7pcjbjnh4n92qldi81ql3aqsclywn2yg07a36h5";
   };
 
   rmathVersion = "0.1";

From 58cc890d2be3b35f403a73d766473760613a78a7 Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Wed, 30 Dec 2015 10:10:39 -0800
Subject: [PATCH 169/249] sysctl: use literalExample in docs

---
 nixos/modules/config/sysctl.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index e83562a8356..61b02c5ffa6 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -22,10 +22,9 @@ in
 
     boot.kernel.sysctl = mkOption {
       default = {};
-      example = {
-        "net.ipv4.tcp_syncookies" = false;
-        "vm.swappiness" = 60;
-      };
+      example = literalExample ''
+        { "net.ipv4.tcp_syncookies" = false; "vm.swappiness" = 60; }
+      '';
       type = types.attrsOf sysctlOption;
       description = ''
         Runtime parameters of the Linux kernel, as set by

From ac8e5edada14629bac7abd7a19b987fa13ec8950 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 22:47:41 +0100
Subject: [PATCH 170/249] box2d: use stdenv

This replaces use of `builderDefsPackage`. Also change to download
tarball from GitHub as it is the new upstream home.
---
 pkgs/development/libraries/box2d/default.nix | 66 +++++++-------------
 1 file changed, 24 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index 10a7ca54952..25d291da332 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -1,51 +1,33 @@
-x@{builderDefsPackage
-  , unzip, cmake, mesa, freeglut, libX11, xproto
-  , inputproto, libXi, fetchsvn, pkgconfig
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchsvn" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, unzip, cmake, mesa, freeglut, libX11, xproto, inputproto
+, libXi, pkgconfig }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-in
-rec {
-  version = "2.3.0";
+stdenv.mkDerivation rec {
   name = "box2d-${version}";
-  srcDrv = a.fetchsvn {
-    url = "http://box2d.googlecode.com/svn/trunk";
-    rev = "277";
-    sha256 = "1xp93yw2zcqhmh999v7cwqaqxq1glgyg5r8kfm4yabc1ypba3in4";
+  version = "2.3.0";
+
+  src = fetchurl {
+    url = "https://github.com/erincatto/Box2D/archive/v${version}.tar.gz";
+    sha256 = "1dmbswh4x2n5l3c9h0k72m0z4rdpzfy1xl8m8p3rf5rwkvk3bkg2";
   };
-  src = srcDrv + "/";
 
-  inherit buildInputs;
+  sourceRoot = "Box2D-${version}/Box2D";
 
-  phaseNames = ["changeSettings" "doCmake" "doMakeInstall"];
+  buildInputs = [
+    unzip cmake mesa freeglut libX11 xproto inputproto libXi pkgconfig
+  ];
 
-  changeSettings = a.fullDepEntry ''
-    sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@'
-  '' ["minInit" "addInputs" "doUnpack"];
-      
-  goSrcDir = ''cd Box2D'';
+  cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ];
 
-  doCmake = a.fullDepEntry ''
-    cd Build; 
-    cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out ..
-  '' ["minInit" "addInputs" "doUnpack"];
-      
-  meta = {
+  prePatch = ''
+    substituteInPlace Box2D/Common/b2Settings.h \
+      --replace 'b2_maxPolygonVertices	8' 'b2_maxPolygonVertices	15'
+  '';
+
+  meta = with stdenv.lib; {
     description = "2D physics engine";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = "bsd";
-    inherit version;
+    homepage = http://box2d.org/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = licenses.zlib;
   };
-}) x
-
+}

From bbd253b569bf0ada40e4b177c22568086a82165f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 23:33:13 +0100
Subject: [PATCH 171/249] allegro: use stdenv

This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
---
 .../development/libraries/allegro/default.nix | 75 ++++++-------------
 1 file changed, 23 insertions(+), 52 deletions(-)

diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 6d31087968c..deb3a6877e8 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -1,59 +1,30 @@
-x@{builderDefsPackage
-  , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
-  , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
-  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
+, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
+, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
+, xf86vidmodeproto, libXxf86vm, openal, mesa }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="allegro";
-    version="4.4.2";
-    name="${baseName}-${version}";
-    project="alleg";
-    url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
-    hash="1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "allegro-${version}";
+  version="4.4.2";
+
+  src = fetchurl {
+    url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz";
+    sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doCmake" "doMakeInstall"];
-
-  doCmake = a.fullDepEntry (''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
-    cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
-  '') ["minInit" "doUnpack" "addInputs"];
-
-  makeFlags = [
+  buildInputs = [
+    texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
+    alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
+    xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
   ];
 
-  meta = {
-    branch = "4";
+  cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
+
+  meta = with stdenv.lib; {
     description = "A game programming library";
-    license = a.lib.licenses.free; # giftware
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    homepage = http://liballeg.org/;
+    license = licenses.free; # giftware
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/alleg/files/";
-    };
-  };
-}) x
+}

From f37279aebc9a0fa6a60727cb410a9d2d7655a4ab Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 23:34:19 +0100
Subject: [PATCH 172/249] allegro5: use stdenv

This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
---
 pkgs/development/libraries/allegro/5.nix      | 69 ++++++-------------
 pkgs/development/libraries/allegro/5.upstream |  7 --
 2 files changed, 22 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/development/libraries/allegro/5.upstream

diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 793b57c676b..6f05afa4f48 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -1,56 +1,31 @@
+{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
+, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
+, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
+, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac }:
 
-x@{builderDefsPackage
-  , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
-  , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
-  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
-  , kbproto, libjpeg, flac
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+stdenv.mkDerivation rec {
+  name = "allegro-${version}";
+  version = "5.0.11";
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="allegro";
-    version = "5.0.11";
-    name="${baseName}-${version}";
-    project="alleg";
-    url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
-    hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+  src = fetchurl {
+    url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz";
     sha256 = "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doCmake" "doMakeInstall"];
-
-  doCmake = a.fullDepEntry (''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
-    cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
-  '') ["minInit" "doUnpack" "addInputs"];
-
-  makeFlags = [
+  buildInputs = [
+    texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
+    alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
+    xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
+    kbproto libjpeg flac
   ];
 
-  meta = {
+  cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
+
+  meta = with stdenv.lib; {
     description = "A game programming library";
-    license = a.lib.licenses.free; # giftware
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    inherit version;
+    homepage = http://liballeg.org/;
+    license = licenses.zlib;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-}) x
+}
diff --git a/pkgs/development/libraries/allegro/5.upstream b/pkgs/development/libraries/allegro/5.upstream
deleted file mode 100644
index 9d139383fe3..00000000000
--- a/pkgs/development/libraries/allegro/5.upstream
+++ /dev/null
@@ -1,7 +0,0 @@
-attribute_name allegro5
-url http://alleg.sourceforge.net/download.html
-version_link '[.]tar[.].*/download$'
-SF_redirect
-do_overwrite () {
-  do_overwrite_just_version
-}

From 9a47354a964fd0b746dd753f0dd1ebf24ff9ce69 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 23:34:36 +0100
Subject: [PATCH 173/249] allegro5unstable: use stdenv

This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
---
 .../libraries/allegro/5-unstable.nix          | 79 +++++++------------
 .../libraries/allegro/5-unstable.upstream     |  7 --
 2 files changed, 27 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/development/libraries/allegro/5-unstable.upstream

diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix
index dd0df768a68..e5a2c38ddab 100644
--- a/pkgs/development/libraries/allegro/5-unstable.nix
+++ b/pkgs/development/libraries/allegro/5-unstable.nix
@@ -1,61 +1,36 @@
+{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
+, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
+, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
+, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac
+, inputproto, libXi, fixesproto, libXfixes }:
 
-x@{builderDefsPackage
-  , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
-  , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
-  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
-  , kbproto, libjpeg, flac, inputproto, libXi, fixesproto, libXfixes
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+stdenv.mkDerivation rec {
+  name = "allegro-${version}";
+  version = "5.1.11";
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="allegro";
-    folderSuffix = "-unstable";
-    version = "5.1.11";
-    name="${baseName}-${version}";
-    project="alleg";
-    url="mirror://sourceforge/project/${project}/${baseName}${folderSuffix}/${version}/${name}.tar.gz";
-    hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+  src = fetchurl {
+    url = "http://download.gna.org/allegro/allegro-unstable/${version}/${name}.tar.gz";
     sha256 = "0zz07gdyc6xflpvkknwgzsyyyh9qiwd69j42rm9cw1ciwcsic1vs";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["patchIncludes" "doCmake" "doMakeInstall"];
-
-  patchIncludes = a.fullDepEntry ''
-    sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt src/*.c
-  '' ["minInit" "doUnpack"];
-
-  doCmake = a.fullDepEntry (''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm -lXi -lXfixes"
-    cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
-  '') ["minInit" "doUnpack" "addInputs"];
-
-  makeFlags = [
+  buildInputs = [
+    texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
+    alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
+    xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
+    kbproto libjpeg flac inputproto libXi fixesproto libXfixes
   ];
 
-  meta = {
+  patchPhase = ''
+    sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
+  '';
+
+  cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
+
+  meta = with stdenv.lib; {
     description = "A game programming library";
-    license = a.lib.licenses.free; # giftware
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    inherit version;
+    homepage = http://liballeg.org/;
+    license = licenses.zlib;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-}) x
+}
diff --git a/pkgs/development/libraries/allegro/5-unstable.upstream b/pkgs/development/libraries/allegro/5-unstable.upstream
deleted file mode 100644
index e07829c08cc..00000000000
--- a/pkgs/development/libraries/allegro/5-unstable.upstream
+++ /dev/null
@@ -1,7 +0,0 @@
-attribute_name allegro5
-url http://alleg.sourceforge.net/download.html
-version_link '/allegro-unstable/.*[.]tar[.].*/download$'
-SF_redirect
-do_overwrite () {
-  do_overwrite_just_version
-}

From abf836b06652a3545fb8b009aeb0bb6600fe3479 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 23:52:11 +0100
Subject: [PATCH 174/249] ois: use stdenv

This replaces use of `builderDefsPackage`.
---
 pkgs/development/libraries/ois/default.nix | 81 +++++++++-------------
 1 file changed, 31 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix
index 67df3645eb9..25bb7a365f2 100644
--- a/pkgs/development/libraries/ois/default.nix
+++ b/pkgs/development/libraries/ois/default.nix
@@ -1,60 +1,41 @@
-x@{builderDefsPackage, fetchurl
-  , autoconf, automake, libtool, m4
-  , libX11, xproto, libXi, inputproto
-  , libXaw, libXmu, libXt
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, autoconf, automake, libtool, libX11, xproto
+, libXi, inputproto, libXaw, libXmu, libXt }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="ois";
-    majorVersion="1";
-    minorVersion="3";
-    version="${majorVersion}.${minorVersion}";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/project/wgois/Source%20Release/${version}/ois_v${majorVersion}-${minorVersion}.tar.gz";
-    hash="18gs6xxhbqb91x2gm95hh1pmakimqim1k9c65h7ah6g14zc7dyjh";
-  };
+let
+  majorVersion = "1";
+  minorVersion = "3";
 in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+
+stdenv.mkDerivation rec {
+  name = "ois-${version}";
+  version = "${majorVersion}.${minorVersion}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/wgois/Source%20Release/${version}/ois_v${majorVersion}-${minorVersion}.tar.gz";
+    sha256 = "18gs6xxhbqb91x2gm95hh1pmakimqim1k9c65h7ah6g14zc7dyjh";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  patches = [
+    (fetchurl {
+      url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch;
+      sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8";
+      name = "gcc47.patch";
+    })
+  ];
 
-  phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
-
-  patches = [(fetchurl {
-    url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch;
-    sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8";
-    name = "gcc47.patch";
-  })];
   patchFlags = "-p0";
 
-  configureCommand = ''sh bootstrap; sh configure'';
+  buildInputs = [
+    autoconf automake libtool libX11 xproto libXi inputproto libXaw
+    libXmu libXt
+  ];
 
-  meta = {
+  preConfigure = "sh bootstrap";
+
+  meta = with stdenv.lib; {
     description = "Object-oriented C++ input system";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.zlib;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = licenses.zlib;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/wgois/files/Source Release/";
-    };
-  };
-}) x
-
+}

From 7ce3f6f976d4362009f41c69ba634c08a2775db1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 00:06:34 +0100
Subject: [PATCH 175/249] openscenegraph: use stdenv

This replaces use of `builderDefsPackage`. Also minor cleanups.
---
 .../libraries/openscenegraph/default.nix      | 78 +++++++------------
 1 file changed, 27 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index ecb4d82c965..578d0219c02 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -1,60 +1,36 @@
-x@{builderDefsPackage
-  , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng
-  , coin3d, jasper, gdal_1_11, xproto, libX11, libXmu, freeglut, mesa
-  , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2
-  , curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
-  , qt4, poppler, librsvg, gtk
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, cmake, giflib, libjpeg, libtiff, lib3ds, freetype
+, libpng, coin3d, jasper, gdal_1_11, xproto, libX11, libXmu
+, freeglut, mesa, doxygen, ffmpeg, xineLib, unzip, zlib, openal
+, libxml2, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
+, qt4, poppler, librsvg, gtk }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="OpenSceneGraph";
-    version="3.2.1";
-    name="${baseName}-${version}";
-    url="http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip";
-    hash="0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "openscenegraph-${version}";
+  version = "3.2.1";
+
+  src = fetchurl {
+    url = "http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip";
+    sha256 = "0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "addInputs" "doUnpack" "doPatch" "doCmake" "doMakeInstall"];
-
-  cmakeFlags = [
-    "-D MATH_LIBRARY="
+  buildInputs = [
+    cmake giflib libjpeg libtiff lib3ds freetype libpng coin3d jasper
+    gdal_1_11 xproto libX11 libXmu freeglut mesa doxygen ffmpeg
+    xineLib unzip zlib openal libxml2 curl a52dec faad2 gdk_pixbuf
+    pkgconfig kbproto SDL qt4 poppler librsvg gtk
   ];
 
-  setVars = a.noDepEntry ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1"
-  '';
+  cmakeFlags = [
+    "-DMATH_LIBRARY="
+    "-DCMAKE_C_FLAGS=-D__STDC_CONSTANT_MACROS=1"
+    "-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS=1"
+  ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A 3D graphics toolkit";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    homepage = http://www.openscenegraph.org/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
     license = "OpenSceneGraph Public License - free LGPL-based license";
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.openscenegraph.org/projects/osg/wiki/Downloads";
-    };
-  };
-}) x
-
+}

From 6ca0480de6a6ad442455157d90605c4c2a4d2c3a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 11:58:06 +0100
Subject: [PATCH 176/249] cgui: use stdenv

This replaces use of `builderDefsPackage`.
---
 pkgs/development/libraries/cgui/default.nix | 65 ++++++---------------
 1 file changed, 17 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix
index 6bd3dd41de7..0f117862236 100644
--- a/pkgs/development/libraries/cgui/default.nix
+++ b/pkgs/development/libraries/cgui/default.nix
@@ -1,57 +1,26 @@
-x@{builderDefsPackage
-  , texinfo, allegro, perl
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, texinfo, allegro, perl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="cgui";
-    version="2.0.3";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="mirror://sourceforge/project/${project}/${version}/${name}.tar.gz";
-    hash="00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "cgui-${version}";
+  version="2.0.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/cgui/${version}/${name}.tar.gz";
+    sha256 = "00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ texinfo allegro perl ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["genMakefile" "doMakeInstall"];
-
-  genMakefile = a.fullDepEntry (''
+  configurePhase = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
     sh fix.sh unix
-  '') ["minInit" "doUnpack" "addInputs"];
-      
-  makeFlags = [
-    "SYSTEM_DIR=$out"
-  ];
+  '';
 
-  meta = {
+  makeFlags = [ "SYSTEM_DIR=$(out)" ];
+
+  meta = with stdenv.lib; {
     description = "A multiplatform basic GUI library";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/cgui/files/";
-    };
-  };
-}) x
-
+}

From ffd09ecc60d26863a33d2ece4a362bc9e585344e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 12:22:11 +0100
Subject: [PATCH 177/249] unicap: use stdenv

This replaces use of `builderDefsPackage`. Also fix build.
---
 pkgs/development/libraries/unicap/default.nix | 70 +++++++------------
 1 file changed, 24 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix
index daec5a78566..604a1b7012a 100644
--- a/pkgs/development/libraries/unicap/default.nix
+++ b/pkgs/development/libraries/unicap/default.nix
@@ -1,56 +1,34 @@
-x@{builderDefsPackage
-  , libusb, libraw1394, dcraw, intltool, perl
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l_utils }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="libunicap";
-    version="0.9.12";
-    name="${baseName}-${version}";
-    url="http://www.unicap-imaging.org/downloads/${name}.tar.gz";
-    hash="05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "libunicap-${version}";
+  version="0.9.12";
+
+  src = fetchurl {
+    url = "http://www.unicap-imaging.org/downloads/${name}.tar.gz";
+    sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ libusb libraw1394 dcraw intltool perl v4l_utils ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixIncludes" "fixMakefiles" "doConfigure" "doMakeInstall"];
+  patches = [
+    # Debian has a patch that fixes the build.
+    (fetchurl {
+      url = "https://sources.debian.net/data/main/u/unicap/0.9.12-2/debian/patches/1009_v4l1.patch";
+      sha256 = "1lgypmhdj681m7d1nmzgvh19cz8agj2f31wlnfib0ha8i3g5hg5w";
+    })
+  ];
 
-  fixIncludes = a.fullDepEntry (''
+  postPatch = ''
     find . -type f -exec sed -e '/linux\/types\.h/d' -i '{}' ';'
-  '') ["minInit" "doUnpack"];
-
-  fixMakefiles = a.fullDepEntry (''
     sed -e 's@/etc/udev@'"$out"'/&@' -i data/Makefile.*
-  '') ["minInit" "doUnpack"];
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Universal video capture API";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    broken = true;
+    homepage = http://www.unicap-imaging.org/;
+    maintainers = [ maintainers.raskin ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://unicap-imaging.org/download.htm";
-    };
-  };
-}) x
-
+}

From 9f5b058041c954e5e8b2962acf0438bd1d5833bd Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 12:41:40 +0100
Subject: [PATCH 178/249] regina: use stdenv

This replaces use of `builderDefsPackage`.
---
 .../interpreters/regina/default.nix           | 57 ++++++-------------
 1 file changed, 16 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
index 596b748a4f6..1d67193a73c 100644
--- a/pkgs/development/interpreters/regina/default.nix
+++ b/pkgs/development/interpreters/regina/default.nix
@@ -1,49 +1,24 @@
-x@{builderDefsPackage
-  , ncurses
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, ncurses }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="Regina-REXX";
-    pname="regina-rexx";
-    version = "3.9.1";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+stdenv.mkDerivation rec {
+  name = "Regina-REXX-${version}";
+  version = "3.9.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${name}.tar.gz";
     sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  buildInputs = [ ncurses ];
 
   configureFlags = [
-    "--libdir=$out/lib"
+    "--libdir=$(out)/lib"
   ];
-      
-  meta = {
-    description = "REXX interpreter";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.lgpl2;
-    downloadPage = "http://sourceforge.net/projects/regina-rexx/files/regina-rexx/";
-    inherit version;
-  };
-}) x
 
+  meta = with stdenv.lib; {
+    description = "REXX interpreter";
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = licenses.lgpl2;
+  };
+}

From 23675945754e9e394fc317e0483d10c6417a6f11 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 14:04:45 +0100
Subject: [PATCH 179/249] hawknl: fix download URL

The upstream URL is broken, use an alternative download URL. Checksum is
the same as old download.
---
 pkgs/development/libraries/hawknl/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix
index 290f411cbf4..372a8b8c112 100644
--- a/pkgs/development/libraries/hawknl/default.nix
+++ b/pkgs/development/libraries/hawknl/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
-	name = "hawknl-1.34";
-	src = fetchurl {
-		url = http://hawksoft.com/download/files/HawkNL168src.zip;
-		sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028";
-	};
+  name = "hawknl-1.68";
+
+  src = fetchurl {
+    url = http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip;
+    sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028";
+  };
 
   buildInputs = [ unzip ];
 

From 73ede34fe55e81a48b122792d1ae814ab0990427 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 15:41:17 +0100
Subject: [PATCH 180/249] vbetool: use stdenv

This replaces use of `builderDefsPackage`.
---
 pkgs/tools/system/vbetool/default.nix         | 43 ++++++++-----------
 pkgs/tools/system/vbetool/src-for-default.nix |  9 ----
 .../system/vbetool/src-info-for-default.nix   |  4 --
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 20 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/tools/system/vbetool/src-for-default.nix
 delete mode 100644 pkgs/tools/system/vbetool/src-info-for-default.nix

diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix
index 402f93ec8fb..a8c27a42b1d 100644
--- a/pkgs/tools/system/vbetool/default.nix
+++ b/pkgs/tools/system/vbetool/default.nix
@@ -1,31 +1,26 @@
-a @ {pciutils, libx86, zlib, ...} :
-let
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    libx86 pciutils zlib
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
+{ stdenv, fetchurl, pciutils, libx86, zlib }:
 
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
+stdenv.mkDerivation rec {
+  name = "vbetool-${version}";
+  version = "1.1";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixPCIref" "doConfigure" "doMakeInstall"];
+  src = fetchurl {
+    url = "http://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz";
+    sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
+  };
 
-  fixPCIref = a.fullDepEntry (''
-    sed -e 's@$(libdir)/libpci.a@${a.pciutils}/lib/libpci.so@' -i Makefile.in
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lpci"
-  '') ["doUnpack" "minInit"];
+  buildInputs = [ pciutils libx86 zlib ];
 
-  meta = {
+  patchPhase = ''
+    substituteInPlace Makefile.in --replace '$(libdir)/libpci.a' ""
+  '';
+
+  configureFlags = [ "LDFLAGS=-lpci" ];
+
+  meta = with stdenv.lib; {
     description = "Video BIOS execution tool";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    homepage = http://www.codon.org.uk/~mjg59/vbetool/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/vbetool/src-for-default.nix b/pkgs/tools/system/vbetool/src-for-default.nix
deleted file mode 100644
index 97621fd516b..00000000000
--- a/pkgs/tools/system/vbetool/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="1.1";
-   name="vbetool-1.1";
-   hash="0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
-   url="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${version}.tar.gz";
-   advertisedUrl="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz";
-  
-  
-}
diff --git a/pkgs/tools/system/vbetool/src-info-for-default.nix b/pkgs/tools/system/vbetool/src-info-for-default.nix
deleted file mode 100644
index 40c721bc490..00000000000
--- a/pkgs/tools/system/vbetool/src-info-for-default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  downloadPage = "http://www.codon.org.uk/~mjg59/vbetool/download/?C=M;O=D";
-  baseName = "vbetool";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ec1aff8776..d383d165211 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3365,7 +3365,7 @@ let
 
   vidalia = callPackage ../tools/security/vidalia { };
 
-  vbetool = builderDefsPackage (callPackage ../tools/system/vbetool) { };
+  vbetool = callPackage ../tools/system/vbetool { };
 
   vde2 = callPackage ../tools/networking/vde2 { };
 

From 318a0c9f3fb76afd4855709eeba43b48e9bf038b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 18:56:06 +0100
Subject: [PATCH 181/249] flightgear: use fltk with XFT support

Without XFT the Flight Gear compilation fails with an undefined
reference to `XGetUtf8FontAndGlyph`.
---
 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 d383d165211..3106eaded52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14068,7 +14068,9 @@ let
 
   fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
 
-  flightgear = qt5.callPackage ../games/flightgear { };
+  flightgear = qt5.callPackage ../games/flightgear {
+    fltk13 = fltk13.override { cfg.xftSupport = true; };
+  };
 
   freecell-solver = callPackage ../games/freecell-solver { };
 

From 8bec69e9c83b6b8973d5819670bce9ab2d4b1203 Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Mon, 14 Dec 2015 11:17:02 +0100
Subject: [PATCH 182/249] stockfish: init at 6

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

diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
new file mode 100644
index 00000000000..f919b9683e6
--- /dev/null
+++ b/pkgs/games/stockfish/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, unzip }:
+stdenv.mkDerivation rec {
+  version = "6";
+  name = "stockfish-${version}";
+  src = fetchurl {
+    url = https://stockfish.s3.amazonaws.com/stockfish-6-src.zip;
+    sha256 = "a69a371d3f84338cefde4575669bd930d186b046a10fa5ab0f8d1aed6cb204c3";
+  };
+  buildPhase = ''
+  cd src
+  make build ARCH=x86-64
+  '';
+  buildInputs = [
+        stdenv
+        unzip
+  ];
+  enableParallelBuilding = true;
+  installPhase = ''
+  mkdir -p $out/bin
+  cp -pr stockfish $out/bin
+  '';
+  meta = with stdenv.lib; {
+    homepage = https://stockfishchess.org/;
+    description = "Strong open source chess engine";
+    longDescription = ''
+      Stockfish is one of the strongest chess engines in the world. It is also
+      much stronger than the best human chess grandmasters.
+      '';
+    maintainers = with maintainers; [ luispedro ];
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ec1aff8776..6fa5c4b7f4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14294,6 +14294,8 @@ let
 
   stardust = callPackage ../games/stardust {};
 
+  stockfish = callPackage ../games/stockfish { };
+
   steamPackages = callPackage ../games/steam { };
   steam = steamPackages.steam-chrootenv.override {
     # DEPRECATED

From c570bc50bc885ee6c87d90f77296b3619a5241c0 Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Mon, 14 Dec 2015 00:51:05 +0100
Subject: [PATCH 183/249] chessx: init at 1.3.2

Chessx is a chess database GUI. Using the stockfish engine, users can
also analyse games.
---
 pkgs/games/chessx/default.nix   | 34 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/games/chessx/default.nix

diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
new file mode 100644
index 00000000000..dd0fa16b707
--- /dev/null
+++ b/pkgs/games/chessx/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, fetchurl }:
+stdenv.mkDerivation rec {
+  name = "chessx-${version}";
+  version = "1.3.2";
+  src = fetchurl {
+    url = "mirror://sourceforge/chessx/chessx-${version}.tgz";
+    sha256 = "b136cf56d37d34867cdb9538176e1703b14f61b3384885b6f100580d0af0a3ff";
+  };
+  preConfigure = ''
+    qmake -spec linux-g++ chessx.pro
+  '';
+  buildInputs = [
+   stdenv
+   pkgconfig
+   qtbase
+   qtsvg
+   qttools
+   qtmultimedia
+   zlib
+  ];
+
+  enableParallelBuilding = true;
+  installPhase = ''
+      mkdir -p "$out/bin"
+      cp -pr release/chessx "$out/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://chessx.sourceforge.net/;
+    description = "ChessX allows you to browse and analyse chess games";
+    license = licenses.gpl2;
+    maintainers = [maintainers.luispedro];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fa5c4b7f4e..24a1a7d0af0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13998,6 +13998,8 @@ let
 
   chessdb = callPackage ../games/chessdb { };
 
+  chessx = qt5.callPackage ../games/chessx { };
+
   chocolateDoom = callPackage ../games/chocolate-doom { };
 
   cockatrice = qt5.callPackage ../games/cockatrice {  };

From 51ebb5a9aafeaa65c0f3cedd202174f297863c09 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 30 Dec 2015 17:45:13 -0500
Subject: [PATCH 184/249] lz4: mark as working on all unixes

I've only tested on darwin, but it looks like a pretty vanilla package
---
 pkgs/tools/compression/lz4/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index e91fae778fd..6c5d28d6bcc 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://code.google.com/p/lz4/;
     license = with licenses; [ bsd2 gpl2Plus ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ nckx ];
   };
 }

From d97ae517fb271a38dd71e93cb07a3fdc3ba11f29 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 30 Dec 2015 20:12:03 -0600
Subject: [PATCH 185/249] nixpkgs: plex 0.9.12.19.1537 -> 0.9.14.6.1620

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/plex/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 580d5c81ef9..2aeb9379e10 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.12.19.1537";
-  vsnHash = "f38ac80";
+  version = "0.9.14.6.1620";
+  vsnHash = "e0b7243";
 
   src = fetchurl {
-    url = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
-    sha256 = "0346l734f3sqjjrrjgsllmsm6nklmj60md4sw8681896m3yrk5kd";
+    url    = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
+    sha256 = "0br82yxnvjapvsrb0mbfd12mx7qqi9zh623jnivsjk2gxbfd3ki1";
   };
 
   buildInputs = [ rpmextract glibc ];
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     homepage = http://plex.tv/;
     license = licenses.unfree;
     platforms = platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ forkk ];
+    maintainers = with stdenv.lib.maintainers; [ forkk thoughtpolice ];
     description = "Media / DLNA server";
     longDescription = ''
       Plex is a media server which allows you to store your media and play it

From 59acfd4f16eac1ac1919ae9952b3c5bc0d2184a7 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 30 Dec 2015 20:19:04 -0600
Subject: [PATCH 186/249] nixos/plex: Add 'package' option to module

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/misc/plex.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index de8bc71a271..b9a58c0c5d5 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -54,6 +54,15 @@ in
           false.
         '';
       };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.plex;
+        description = ''
+          The Plex package to use. Plex subscribers may wish to use their own
+          package here, pointing to subscriber-only server versions.
+        '';
+      };
     };
   };
 
@@ -75,7 +84,7 @@ in
         # why this is done.
         test -d "${cfg.dataDir}/.skeleton" || mkdir "${cfg.dataDir}/.skeleton"
         for db in "com.plexapp.plugins.library.db"; do
-            cp "${plex}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db"
+            cp "${cfg.package}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db"
             chmod u+w "${cfg.dataDir}/.skeleton/$db"
             chown ${cfg.user}:${cfg.group} "${cfg.dataDir}/.skeleton/$db"
         done
@@ -117,14 +126,14 @@ in
         User = cfg.user;
         Group = cfg.group;
         PermissionsStartOnly = "true";
-        ExecStart = "/bin/sh -c '${plex}/usr/lib/plexmediaserver/Plex\\ Media\\ Server'";
+        ExecStart = "/bin/sh -c '${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server'";
       };
       environment = {
         PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=cfg.dataDir;
-        PLEX_MEDIA_SERVER_HOME="${plex}/usr/lib/plexmediaserver";
+        PLEX_MEDIA_SERVER_HOME="${cfg.package}/usr/lib/plexmediaserver";
         PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6";
         PLEX_MEDIA_SERVER_TMPDIR="/tmp";
-        LD_LIBRARY_PATH="${plex}/usr/lib/plexmediaserver";
+        LD_LIBRARY_PATH="${cfg.package}/usr/lib/plexmediaserver";
         LC_ALL="en_US.UTF-8";
         LANG="en_US.UTF-8";
       };

From 624b3a34c04503a2fbd19e2b0a897bb2d28666a9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 28 Dec 2015 01:26:27 +0100
Subject: [PATCH 187/249] wireless-regdb: change homepage to more accessible
 wiki

---
 pkgs/data/misc/wireless-regdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index e8afb25b8b3..acc1ca5b55e 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     inherit version;
     description = "Wireless regulatory database for CRDA";
-    homepage = https://git.kernel.org/cgit/linux/kernel/git/sforshee/wireless-regdb.git/;
+    homepage = http://wireless.kernel.org/en/developers/Regulatory/;
     license = licenses.isc;
     platforms = platforms.all;
     maintainers = with maintainers; [ nckx ];

From d04e57ea6a39992cb90d59b212576b090328ae60 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 31 Dec 2015 04:36:54 +0100
Subject: [PATCH 188/249] zpaq{,d}: un-break compileFlags and stop using
 -march=native
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Running zpaq on an older but not ancient 64-bit Intel server aborts
with an ‘Illegal instruction’ error. Turns out the build expression
was using -march=native to generate distibution binaries...

Change this to more conservative, portable settings which should
cover ‘all’ CPUs. It may run slightly slower — but that at least
implies running.

As a nice side effect, all common compile flags are now back in
`compileFlags` whence they came, and actually used consistently.
---
 pkgs/tools/archivers/zpaq/default.nix | 15 ++++++++-------
 pkgs/tools/archivers/zpaq/zpaqd.nix   | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index c8f3a890487..fddb3cbfb15 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -14,11 +14,12 @@ let
   ];
   isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
   isx86 = stdenv.isi686 || stdenv.isx86_64;
-  compileFlags = ""
-    + (stdenv.lib.optionalString isUnix " -Dunix -pthread ")
-    + (stdenv.lib.optionalString (!isx86) " -DNOJIT ")
-    + " -DNDEBUG "
-    + " -fPIC "
+  compileFlags = with stdenv; ""
+    + (lib.optionalString (isUnix) " -Dunix -pthread")
+    + (lib.optionalString (isi686) " -march=i686")
+    + (lib.optionalString (isx86_64) " -march=nocona")
+    + (lib.optionalString (!isx86) " -DNOJIT")
+    + " -O3 -mtune=generic -DNDEBUG"
     ;
 in
 stdenv.mkDerivation {
@@ -29,8 +30,8 @@ stdenv.mkDerivation {
   };
   sourceRoot = ".";
   buildPhase = ''
-	  g++ -O3 -march=native -Dunix libzpaq.cpp -pthread --shared -o libzpaq.so -fPIC
-	  g++ -O3 -march=native -Dunix zpaq.cpp -lzpaq -L. -L"$out/lib" -pthread -o zpaq
+    g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
+    g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaq.cpp -o zpaq
   '';
   installPhase = ''
     mkdir -p "$out"/{bin,include,lib,share/doc/zpaq}
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index 65f40f68f55..5518a94ba21 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -14,11 +14,12 @@ let
   ];
   isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
   isx86 = stdenv.isi686 || stdenv.isx86_64;
-  compileFlags = ""
-    + (stdenv.lib.optionalString isUnix " -Dunix -pthread ")
-    + (stdenv.lib.optionalString (!isx86) " -DNOJIT ")
-    + " -DNDEBUG "
-    + " -fPIC "
+  compileFlags = with stdenv; ""
+    + (lib.optionalString (isUnix) " -Dunix -pthread")
+    + (lib.optionalString (isi686) " -march=i686")
+    + (lib.optionalString (isx86_64) " -march=nocona")
+    + (lib.optionalString (!isx86) " -DNOJIT")
+    + " -O3 -mtune=generic -DNDEBUG"
     ;
 in
 stdenv.mkDerivation {
@@ -29,8 +30,8 @@ stdenv.mkDerivation {
   };
   sourceRoot = ".";
   buildPhase = ''
-    g++ -shared -O3 libzpaq.cpp ${compileFlags} -o libzpaq.so
-    g++ -O3 -L. -L"$out/lib" -lzpaq zpaqd.cpp -o zpaqd
+    g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
+    g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaqd.cpp -o zpaqd
   '';
   installPhase = ''
     mkdir -p "$out"/{bin,include,lib,share/doc/zpaq}

From 4ae6598c0b4a4439939c47e20317150088c61bb6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 31 Dec 2015 04:50:57 +0100
Subject: [PATCH 189/249] zpaq{,d}: clarify; improve description; maintain

---
 pkgs/tools/archivers/zpaq/default.nix | 21 ++++++++++++---------
 pkgs/tools/archivers/zpaq/zpaqd.nix   | 21 ++++++++++++---------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index fddb3cbfb15..2b761df3863 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -9,9 +9,6 @@ let
     url="http://mattmahoney.net/dc/zpaq705.zip";
     sha256="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq";
   };
-  buildInputs = [
-    unzip
-  ];
   isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
   isx86 = stdenv.isi686 || stdenv.isx86_64;
   compileFlags = with stdenv; ""
@@ -24,15 +21,20 @@ let
 in
 stdenv.mkDerivation {
   inherit (s) name version;
-  inherit buildInputs;
+
   src = fetchurl {
     inherit (s) url sha256;
   };
+
   sourceRoot = ".";
+
+  buildInputs = [ unzip ];
+
   buildPhase = ''
     g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
     g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaq.cpp -o zpaq
   '';
+
   installPhase = ''
     mkdir -p "$out"/{bin,include,lib,share/doc/zpaq}
     cp libzpaq.so "$out/lib"
@@ -40,12 +42,13 @@ stdenv.mkDerivation {
     cp libzpaq.h "$out/include"
     cp readme.txt "$out/share/doc/zpaq"
   '';
-  meta = {
+
+  meta = with stdenv.lib; {
     inherit (s) version;
-    description = ''An archiver with backward compatibility of versions for decompression'';
-    license = stdenv.lib.licenses.gpl3Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "Incremental journaling backup utility and archiver";
+    license = licenses.gpl3Plus ;
+    maintainers = with maintainers; [ raskin nckx ];
+    platforms = platforms.linux;
     homepage = "http://mattmahoney.net/dc/zpaq.html";
   };
 }
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index 5518a94ba21..7adcd3cf6e2 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -9,9 +9,6 @@ let
     url="http://mattmahoney.net/dc/zpaqd633.zip";
     sha256="00zgc4mcmsd3d4afgzmrp6ymcyy8gb9kap815d5a3f9zhhzkz4dx";
   };
-  buildInputs = [
-    unzip
-  ];
   isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
   isx86 = stdenv.isi686 || stdenv.isx86_64;
   compileFlags = with stdenv; ""
@@ -24,15 +21,20 @@ let
 in
 stdenv.mkDerivation {
   inherit (s) name version;
-  inherit buildInputs;
+
   src = fetchurl {
     inherit (s) url sha256;
   };
+
   sourceRoot = ".";
+
+  buildInputs = [ unzip ];
+
   buildPhase = ''
     g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
     g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaqd.cpp -o zpaqd
   '';
+
   installPhase = ''
     mkdir -p "$out"/{bin,include,lib,share/doc/zpaq}
     cp libzpaq.so "$out/lib"
@@ -40,11 +42,12 @@ stdenv.mkDerivation {
     cp libzpaq.h "$out/include"
     cp readme_zpaqd.txt "$out/share/doc/zpaq"
   '';
-  meta = {
+
+  meta = with stdenv.lib; {
     inherit (s) version;
-    description = ''ZPAQ archiver decompressor and algorithm development tool'';
-    license = stdenv.lib.licenses.gpl3Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "ZPAQ archive decompressor and algorithm development tool";
+    license = licenses.gpl3Plus ;
+    maintainers = with maintainers; [ raskin nckx ];
+    platforms = platforms.linux;
   };
 }

From 3b065f0215615566c9ae4de91820892d191f9588 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 31 Dec 2015 05:09:13 +0100
Subject: [PATCH 190/249] zpaqd: fix typo...

---
 pkgs/tools/archivers/zpaq/zpaqd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index 7adcd3cf6e2..6a7891d2ebe 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     inherit (s) version;
-    description = "ZPAQ archive decompressor and algorithm development tool";
+    description = "ZPAQ archive (de)compressor and algorithm development tool";
     license = licenses.gpl3Plus ;
     maintainers = with maintainers; [ raskin nckx ];
     platforms = platforms.linux;

From ff49b7f91e487cf61851372e0d41f7681322072f Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Thu, 31 Dec 2015 17:02:45 +0800
Subject: [PATCH 191/249] postfix: patch to stop hard coding SHELL

---
 pkgs/servers/mail/postfix/2.11.nix            |  5 ++++-
 pkgs/servers/mail/postfix/3.0.nix             |  2 ++
 pkgs/servers/mail/postfix/default.nix         |  7 ++++++-
 .../mail/postfix/postfix-script-shell.patch   | 21 +++++++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/servers/mail/postfix/postfix-script-shell.patch

diff --git a/pkgs/servers/mail/postfix/2.11.nix b/pkgs/servers/mail/postfix/2.11.nix
index bfd10fb591b..7c936bf1244 100644
--- a/pkgs/servers/mail/postfix/2.11.nix
+++ b/pkgs/servers/mail/postfix/2.11.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
     sha256 = "11riz8ggaa09pi8d6xv2807qp7yjn918mrylfvkfwmvcdlgwck0a";
   };
 
-  patches = [ ./postfix-2.11.0.patch ];
+  patches = [
+    ./postfix-2.11.0.patch
+    ./postfix-script-shell.patch
+  ];
 
   buildInputs = [ makeWrapper gnused db openssl cyrus_sasl ];
 
diff --git a/pkgs/servers/mail/postfix/3.0.nix b/pkgs/servers/mail/postfix/3.0.nix
index 93f419bc7f6..8c625da2c9e 100644
--- a/pkgs/servers/mail/postfix/3.0.nix
+++ b/pkgs/servers/mail/postfix/3.0.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu ];
 
+  patches = [ ./postfix-script-shell.patch ];
+
   preBuild = ''
     sed -e '/^PATH=/d' -i postfix-install
 
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 7bd2d620910..838ca7a8d8d 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -14,7 +14,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [db openssl cyrus_sasl bison perl];
 
-  patches = [ ./postfix-2.2.9-db.patch  ./postfix-2.2.9-lib.patch ./db-linux3.patch ];
+  patches = [
+    ./postfix-2.2.9-db.patch
+    ./postfix-2.2.9-lib.patch
+    ./db-linux3.patch
+    ./postfix-script-shell.patch
+  ];
 
   postPatch = ''
     sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \
diff --git a/pkgs/servers/mail/postfix/postfix-script-shell.patch b/pkgs/servers/mail/postfix/postfix-script-shell.patch
new file mode 100644
index 00000000000..4f5d2f61111
--- /dev/null
+++ b/pkgs/servers/mail/postfix/postfix-script-shell.patch
@@ -0,0 +1,21 @@
+diff --git a/conf/postfix-script b/conf/postfix-script
+index 19088a6..04fae23 100755
+--- a/conf/postfix-script
++++ b/conf/postfix-script
+@@ -43,7 +43,6 @@ FATAL="$LOGGER -p fatal"
+ PANIC="$LOGGER -p panic"
+ 
+ umask 022
+-SHELL=/bin/sh
+ 
+ #
+ # Can't do much without these in place.
+@@ -229,7 +228,7 @@ status)
+ check-fatal)
+ 	# This command is NOT part of the public interface.
+ 
+-	$SHELL $daemon_directory/post-install create-missing || {
++	$daemon_directory/post-install create-missing || {
+ 		$FATAL unable to create missing queue directories
+ 		exit 1
+ 	}

From 6a903c1f87c5b2cc4f631670f03e4057a608496d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 31 Dec 2015 13:48:07 +0100
Subject: [PATCH 192/249] aws-mturk-clt: update sha256 hash

Stable tarballs are so 2015.
---
 pkgs/tools/misc/aws-mturk-clt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix
index 4db4f3b1672..e02359eda80 100644
--- a/pkgs/tools/misc/aws-mturk-clt/default.nix
+++ b/pkgs/tools/misc/aws-mturk-clt/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz";
-    sha256 = "06p0cbb5afmqjjlibbw9gb08jp270c7j57lhnf9ld50sm1z021ln";
+    sha256 = "00yyc7k3iygg83cknv9i2dsaxwpwzdkc8a2l9j56lg999hw3mqm3";
   };
 
   installPhase =

From 28fd7afd0215b3d0f32ffee5f320e1a839f8f7d4 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Thu, 31 Dec 2015 13:56:50 +0100
Subject: [PATCH 193/249] wireshark-qt: make wireshark-qt build and run again

---
 .../networking/sniffers/wireshark/default.nix            | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index b49c309f5ba..58be839d737 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
 , gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
-, withGtk ? false, gtk ? null
+, zlib
+, withGtk ? false, gtk ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
 , withQt ? false, qt4 ? null
 }:
 
@@ -24,9 +25,9 @@ stdenv.mkDerivation {
 
   buildInputs = [
     bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls
-    geoip libnl c-ares python libcap glib
+    geoip libnl c-ares python libcap glib zlib
   ] ++ optional withQt qt4
-    ++ optional withGtk gtk;
+    ++ (optionals withGtk [gtk pango cairo gdk_pixbuf]);
 
   patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
 
@@ -52,8 +53,6 @@ stdenv.mkDerivation {
     mkdir -p "$out"/share/icons/
     cp "$desktopItem/share/applications/"* "$out/share/applications/"
     cp image/wsicon.svg "$out"/share/icons/wireshark.svg
-  '' + optionalString withQt ''
-    mv "$out/bin/wireshark-qt" "$out/bin/wireshark"
   '';
 
   enableParallelBuilding = true;

From 7dc2f1632ca083c0fa2322c5fffed8006a7170bc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 31 Dec 2015 16:51:13 +0100
Subject: [PATCH 194/249] qpdfview: 0.4.15 -> 0.4.16

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

diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index 574b73f5672..1a3f1399fe7 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -5,10 +5,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="qpdfview";
-    version = "0.4.15";
+    version = "0.4.16";
     name="${baseName}-${version}";
     url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
-    sha256 = "0wgj02zpbyq4m2ix8rljiz312l2xk81gpy030vy424icq4xsip52";
+    sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s";
   };
   buildInputs = [
     qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript

From f50aca5157630ff3d943f6caaaf9941dbca7bae2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 31 Dec 2015 16:52:05 +0100
Subject: [PATCH 195/249] cl-launch: 4.1.4 -> 4.1.4.1

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

diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index 17b1f3382cc..ffd668dbdee 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="cl-launch";
-    version="4.1.4";
+    version="4.1.4.1";
     name="${baseName}-${version}";
-    hash="0j3lapjsqzdkc7ackqdk13li299lp706gdc9bh28kvs0diyamjiv";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.4.tar.gz";
-    sha256="0j3lapjsqzdkc7ackqdk13li299lp706gdc9bh28kvs0diyamjiv";
+    hash="09450yknzb0m3375lg4k8gdypmk3xwl8m1krv1kvhylmrm3995mz";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.4.1.tar.gz";
+    sha256="09450yknzb0m3375lg4k8gdypmk3xwl8m1krv1kvhylmrm3995mz";
   };
   buildInputs = [
   ];

From 0c7db6c696ecd771acafa2ac0ee5840b86a0056a Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 31 Dec 2015 16:55:33 +0100
Subject: [PATCH 196/249] jpegoptim: init at 1.4.3

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

diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix
new file mode 100644
index 00000000000..5bb577011e7
--- /dev/null
+++ b/pkgs/applications/graphics/jpegoptim/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, libjpeg }:
+
+stdenv.mkDerivation rec {
+  version = "1.4.3";
+  name = "jpegoptim-${version}";
+
+  src = fetchurl {
+    url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz";
+    sha256 = "0k53q7dc8w5ashz8v261x2b5vvz7gdvg8w962rz9gjvkjbh4lg93";
+  };
+
+  # There are no checks, it seems.
+  doCheck = false;
+
+  buildInputs = [ libjpeg ];
+
+  meta = {
+    description = "Optimize JPEG files";
+    homepage = http://www.kokkonen.net/tjko/projects.html ;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.aristid ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4a25a31d6f..99271970460 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1992,6 +1992,8 @@ let
 
   jp2a = callPackage ../applications/misc/jp2a { };
 
+  jpegoptim = callPackage ../applications/graphics/jpegoptim { };
+
   jq = callPackage ../development/tools/jq {};
 
   jscoverage = callPackage ../development/tools/misc/jscoverage { };

From 63c8129bc622c297b1422a940d417129c6969cac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Dec 2015 13:23:36 +0100
Subject: [PATCH 197/249] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-3-gd4ae18a using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/579e6bb79700b1c69c7e3afbb351a2f259b4435b
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/e1530f9f9a7c2ae7a710487d0ac66433e7f18bd7
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/d3e5ae70f97caffd4362b1511f3a2edfdc8a493d
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/db90cf927d67d362ead3be5a57b2ea84463ae83b
---
 .../haskell-modules/configuration-lts-0.0.nix |    6 +
 .../haskell-modules/configuration-lts-0.1.nix |    6 +
 .../haskell-modules/configuration-lts-0.2.nix |    6 +
 .../haskell-modules/configuration-lts-0.3.nix |    6 +
 .../haskell-modules/configuration-lts-0.4.nix |    6 +
 .../haskell-modules/configuration-lts-0.5.nix |    6 +
 .../haskell-modules/configuration-lts-0.6.nix |    7 +
 .../haskell-modules/configuration-lts-0.7.nix |    7 +
 .../haskell-modules/configuration-lts-1.0.nix |    7 +
 .../haskell-modules/configuration-lts-1.1.nix |    7 +
 .../configuration-lts-1.10.nix                |    7 +
 .../configuration-lts-1.11.nix                |    7 +
 .../configuration-lts-1.12.nix                |    7 +
 .../configuration-lts-1.13.nix                |    7 +
 .../configuration-lts-1.14.nix                |    7 +
 .../configuration-lts-1.15.nix                |    7 +
 .../haskell-modules/configuration-lts-1.2.nix |    7 +
 .../haskell-modules/configuration-lts-1.4.nix |    7 +
 .../haskell-modules/configuration-lts-1.5.nix |    7 +
 .../haskell-modules/configuration-lts-1.7.nix |    7 +
 .../haskell-modules/configuration-lts-1.8.nix |    7 +
 .../haskell-modules/configuration-lts-1.9.nix |    7 +
 .../haskell-modules/configuration-lts-2.0.nix |    7 +
 .../haskell-modules/configuration-lts-2.1.nix |    7 +
 .../configuration-lts-2.10.nix                |    8 +
 .../configuration-lts-2.11.nix                |    8 +
 .../configuration-lts-2.12.nix                |    8 +
 .../configuration-lts-2.13.nix                |    8 +
 .../configuration-lts-2.14.nix                |    8 +
 .../configuration-lts-2.15.nix                |    8 +
 .../configuration-lts-2.16.nix                |    9 +
 .../configuration-lts-2.17.nix                |    9 +
 .../configuration-lts-2.18.nix                |   10 +
 .../configuration-lts-2.19.nix                |   10 +
 .../haskell-modules/configuration-lts-2.2.nix |    7 +
 .../configuration-lts-2.20.nix                |   10 +
 .../configuration-lts-2.21.nix                |   10 +
 .../configuration-lts-2.22.nix                |   10 +
 .../haskell-modules/configuration-lts-2.3.nix |    8 +
 .../haskell-modules/configuration-lts-2.4.nix |    8 +
 .../haskell-modules/configuration-lts-2.5.nix |    8 +
 .../haskell-modules/configuration-lts-2.6.nix |    8 +
 .../haskell-modules/configuration-lts-2.7.nix |    8 +
 .../haskell-modules/configuration-lts-2.8.nix |    8 +
 .../haskell-modules/configuration-lts-2.9.nix |    8 +
 .../haskell-modules/configuration-lts-3.0.nix |   10 +
 .../haskell-modules/configuration-lts-3.1.nix |   10 +
 .../configuration-lts-3.10.nix                |   13 +
 .../configuration-lts-3.11.nix                |   13 +
 .../configuration-lts-3.12.nix                |   13 +
 .../configuration-lts-3.13.nix                |   13 +
 .../configuration-lts-3.14.nix                |   13 +
 .../configuration-lts-3.15.nix                |   14 +
 .../configuration-lts-3.16.nix                |   14 +
 .../configuration-lts-3.17.nix                |   17 +
 .../configuration-lts-3.18.nix                |   17 +
 .../configuration-lts-3.19.nix                |   18 +
 .../haskell-modules/configuration-lts-3.2.nix |   10 +
 .../configuration-lts-3.20.nix                |   18 +
 .../haskell-modules/configuration-lts-3.3.nix |   10 +
 .../haskell-modules/configuration-lts-3.4.nix |   10 +
 .../haskell-modules/configuration-lts-3.5.nix |   10 +
 .../haskell-modules/configuration-lts-3.6.nix |   10 +
 .../haskell-modules/configuration-lts-3.7.nix |   13 +
 .../haskell-modules/configuration-lts-3.8.nix |   13 +
 .../haskell-modules/configuration-lts-3.9.nix |   13 +
 .../haskell-modules/hackage-packages.nix      | 1261 +++++++++++++----
 67 files changed, 1631 insertions(+), 243 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index accd8619305..b9645b56cd0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -3068,6 +3068,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4207,6 +4208,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5615,6 +5617,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7247,6 +7251,7 @@ self: super: {
   "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";
@@ -8953,6 +8958,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 0b7f7deb05b..d6623d24885 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -3068,6 +3068,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4207,6 +4208,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5615,6 +5617,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7247,6 +7251,7 @@ self: super: {
   "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";
@@ -8953,6 +8958,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 71c04aad38d..a1aaa4e5351 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -3068,6 +3068,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4207,6 +4208,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5615,6 +5617,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7247,6 +7251,7 @@ self: super: {
   "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";
@@ -8953,6 +8958,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index d9e9ce495cd..ce34cb1bcd4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -3068,6 +3068,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4207,6 +4208,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5615,6 +5617,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7247,6 +7251,7 @@ self: super: {
   "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";
@@ -8953,6 +8958,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index cdfbcb1943a..c173363b052 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -3067,6 +3067,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4204,6 +4205,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5612,6 +5614,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7243,6 +7247,7 @@ self: super: {
   "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";
@@ -8949,6 +8954,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index f03d3e17a39..0c7e2e0ac75 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -3067,6 +3067,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4204,6 +4205,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5612,6 +5614,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7243,6 +7247,7 @@ self: super: {
   "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";
@@ -8949,6 +8954,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index de83b28d2fa..39bdc2e1efb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -3064,6 +3064,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4200,6 +4201,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5608,6 +5610,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7237,6 +7241,7 @@ self: super: {
   "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";
@@ -8490,6 +8495,7 @@ self: super: {
   "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_0_0_5";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8939,6 +8945,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index e01b0bc09a8..144f844f38b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -3064,6 +3064,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4200,6 +4201,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5608,6 +5610,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7237,6 +7241,7 @@ self: super: {
   "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";
@@ -8490,6 +8495,7 @@ self: super: {
   "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_0_0_5";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8939,6 +8945,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 42db9c816da..9e295e4780a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -3054,6 +3054,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4189,6 +4190,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5596,6 +5598,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7223,6 +7227,7 @@ self: super: {
   "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";
@@ -8474,6 +8479,7 @@ self: super: {
   "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_0_0_5";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8923,6 +8929,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index fb68011ba87..728316c3a82 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -3050,6 +3050,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4184,6 +4185,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5589,6 +5591,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7214,6 +7218,7 @@ self: super: {
   "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";
@@ -8460,6 +8465,7 @@ self: super: {
   "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_0_0_5";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8909,6 +8915,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 9c20fbc7982..7fa73aef87f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -3043,6 +3043,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4172,6 +4173,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5569,6 +5571,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7189,6 +7193,7 @@ self: super: {
   "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";
@@ -8428,6 +8433,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8873,6 +8879,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index e1402193eb9..bec2d4451cf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -3043,6 +3043,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4171,6 +4172,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5565,6 +5567,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7185,6 +7189,7 @@ self: super: {
   "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";
@@ -8424,6 +8429,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8869,6 +8875,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 4c5eaef6814..cec00a8f366 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -3043,6 +3043,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4170,6 +4171,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5564,6 +5566,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7184,6 +7188,7 @@ self: super: {
   "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";
@@ -8421,6 +8426,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8866,6 +8872,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 656be295da0..befe47dcfb4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -3043,6 +3043,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4169,6 +4170,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5563,6 +5565,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7183,6 +7187,7 @@ self: super: {
   "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";
@@ -8419,6 +8424,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8864,6 +8870,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 341459f7405..cef0ee4bb89 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -3040,6 +3040,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4165,6 +4166,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5558,6 +5560,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7175,6 +7179,7 @@ self: super: {
   "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";
@@ -8411,6 +8416,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8856,6 +8862,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 57889762d0c..b7a4aea50cf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -3035,6 +3035,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4160,6 +4161,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5553,6 +5555,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7166,6 +7170,7 @@ self: super: {
   "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";
@@ -8400,6 +8405,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8844,6 +8850,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 5f53f69d70c..1b57d9ff924 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -3048,6 +3048,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4181,6 +4182,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5586,6 +5588,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7208,6 +7212,7 @@ self: super: {
   "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";
@@ -8454,6 +8459,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8903,6 +8909,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 6939da3619d..d4f0bb300df 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -3047,6 +3047,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4178,6 +4179,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5583,6 +5585,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7204,6 +7208,7 @@ self: super: {
   "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";
@@ -8449,6 +8454,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8897,6 +8903,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index a53cb354aba..05ac5e89bf3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -3046,6 +3046,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4177,6 +4178,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5581,6 +5583,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7202,6 +7206,7 @@ self: super: {
   "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";
@@ -8445,6 +8450,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8893,6 +8899,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index d4405a6ea7b..bbbc05f2011 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -3046,6 +3046,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4177,6 +4178,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5575,6 +5577,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7196,6 +7200,7 @@ self: super: {
   "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";
@@ -8439,6 +8444,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8887,6 +8893,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 6a0e8545c28..27fa6d9416b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -3044,6 +3044,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4174,6 +4175,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5571,6 +5573,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7192,6 +7196,7 @@ self: super: {
   "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";
@@ -8434,6 +8439,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8881,6 +8887,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 93ff9524400..65cd4a24259 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -3044,6 +3044,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4173,6 +4174,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5570,6 +5572,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7191,6 +7195,7 @@ self: super: {
   "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";
@@ -8433,6 +8438,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8880,6 +8886,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 6e14e24c7ac..e07f079d116 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -3018,6 +3018,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4135,6 +4136,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5510,6 +5512,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7108,6 +7112,7 @@ self: super: {
   "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";
@@ -8334,6 +8339,7 @@ self: super: {
   "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_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8773,6 +8779,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 24a931f7d92..56984333492 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -3017,6 +3017,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4133,6 +4134,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5508,6 +5510,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7106,6 +7110,7 @@ self: super: {
   "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";
@@ -8331,6 +8336,7 @@ self: super: {
   "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_0_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8770,6 +8776,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 462a8aee2f1..79d8476e8e6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -2999,6 +2999,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_10";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4111,6 +4112,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5470,6 +5472,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7060,6 +7064,7 @@ self: super: {
   "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";
@@ -7181,6 +7186,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8273,6 +8279,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8709,6 +8716,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 4353c8d898c..a7655f5bea4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -2998,6 +2998,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_10";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4108,6 +4109,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5465,6 +5467,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7052,6 +7056,7 @@ self: super: {
   "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";
@@ -7173,6 +7178,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8263,6 +8269,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8699,6 +8706,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 4f4ce4b86e1..79581837878 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -2998,6 +2998,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_10";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4108,6 +4109,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5465,6 +5467,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7051,6 +7055,7 @@ self: super: {
   "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";
@@ -7172,6 +7177,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8262,6 +8268,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8698,6 +8705,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index c9464238e84..7d256156c8d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -2998,6 +2998,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_10";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4107,6 +4108,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5463,6 +5465,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7048,6 +7052,7 @@ self: super: {
   "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";
@@ -7169,6 +7174,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8259,6 +8265,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8695,6 +8702,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index e2a9927cabf..e65538bf920 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -2997,6 +2997,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4105,6 +4106,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5460,6 +5462,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7044,6 +7048,7 @@ self: super: {
   "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";
@@ -7164,6 +7169,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8254,6 +8260,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8687,6 +8694,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 53c0e3d69bd..9e373c8b8ba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -2996,6 +2996,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4104,6 +4105,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5459,6 +5461,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7040,6 +7044,7 @@ self: super: {
   "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";
@@ -7160,6 +7165,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8249,6 +8255,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8681,6 +8688,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 14116331de7..eebcd6863fb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -2989,7 +2989,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4097,6 +4099,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5451,6 +5454,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7032,6 +7037,7 @@ self: super: {
   "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";
@@ -7152,6 +7158,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8241,6 +8248,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8672,6 +8680,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index e1a2bbbc968..82d59bbc25d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -2986,7 +2986,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4092,6 +4094,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5446,6 +5449,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7026,6 +7031,7 @@ self: super: {
   "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";
@@ -7146,6 +7152,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8235,6 +8242,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8666,6 +8674,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 28058c94292..21cefb587e9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -2984,7 +2984,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4089,6 +4091,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5443,6 +5446,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7021,6 +7026,7 @@ self: super: {
   "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";
@@ -7141,6 +7147,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8229,6 +8236,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8238,6 +8246,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8658,6 +8667,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 26cb22600e1..6f165dfcc9a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -2984,7 +2984,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4088,6 +4090,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5441,6 +5444,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7018,6 +7023,7 @@ self: super: {
   "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";
@@ -7138,6 +7144,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8224,6 +8231,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8233,6 +8241,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8652,6 +8661,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 86dc3b2988a..cd307121973 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -3014,6 +3014,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4130,6 +4131,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5505,6 +5507,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7103,6 +7107,7 @@ self: super: {
   "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";
@@ -8328,6 +8333,7 @@ self: super: {
   "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_0_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8766,6 +8772,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index b931af0d41a..c7d6ff49218 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -2983,7 +2983,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4086,6 +4088,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5439,6 +5442,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7015,6 +7020,7 @@ self: super: {
   "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";
@@ -7134,6 +7140,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8220,6 +8227,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8229,6 +8237,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8648,6 +8657,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index d9d7c49b0a3..90a69ad5644 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -2983,7 +2983,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4086,6 +4088,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5438,6 +5441,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7013,6 +7018,7 @@ self: super: {
   "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";
@@ -7132,6 +7138,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8216,6 +8223,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8225,6 +8233,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8643,6 +8652,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 032fc30dfae..009959fe19e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -2983,7 +2983,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4086,6 +4088,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5437,6 +5440,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7011,6 +7016,7 @@ self: super: {
   "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";
@@ -7130,6 +7136,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8214,6 +8221,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8223,6 +8231,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8641,6 +8650,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index a73b8c61ac7..c546030ccf4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -3013,6 +3013,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4129,6 +4130,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5503,6 +5505,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7101,6 +7105,7 @@ self: super: {
   "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";
@@ -7222,6 +7227,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8325,6 +8331,7 @@ self: super: {
   "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_0_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8763,6 +8770,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 027b53e251f..92a77fdf3e0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -3012,6 +3012,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4128,6 +4129,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5501,6 +5503,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7096,6 +7100,7 @@ self: super: {
   "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";
@@ -7217,6 +7222,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8320,6 +8326,7 @@ self: super: {
   "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_0_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8758,6 +8765,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index d23b46cfd4b..dd09a2b1482 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -3011,6 +3011,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4127,6 +4128,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5499,6 +5501,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7094,6 +7098,7 @@ self: super: {
   "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";
@@ -7215,6 +7220,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8317,6 +8323,7 @@ self: super: {
   "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_0_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8755,6 +8762,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 079c34dca60..3467818cac8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -3008,6 +3008,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4122,6 +4123,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5494,6 +5496,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7088,6 +7092,7 @@ self: super: {
   "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";
@@ -7209,6 +7214,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8309,6 +8315,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8746,6 +8753,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 992831b11e5..a6b18dd1399 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -3007,6 +3007,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4121,6 +4122,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5493,6 +5495,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7087,6 +7091,7 @@ self: super: {
   "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";
@@ -7208,6 +7213,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8308,6 +8314,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8745,6 +8752,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 0ba988c6a2d..eae36c64f84 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -3006,6 +3006,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4119,6 +4120,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5489,6 +5491,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7082,6 +7086,7 @@ self: super: {
   "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";
@@ -7203,6 +7208,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8300,6 +8306,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8737,6 +8744,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "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_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 122ffd8e54b..e20360ec947 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -3001,6 +3001,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4113,6 +4114,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5479,6 +5481,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7071,6 +7075,7 @@ self: super: {
   "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";
@@ -7192,6 +7197,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8285,6 +8291,7 @@ self: super: {
   "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_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8721,6 +8728,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 0ddbfe9d767..e9b0d7e7f6c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -2886,7 +2886,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -3965,6 +3967,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = doDistribute super."hid_0_2_1";
@@ -5261,6 +5264,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_3_1";
@@ -6790,6 +6795,7 @@ self: super: {
   "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";
@@ -6908,6 +6914,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7959,6 +7966,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7968,6 +7976,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8372,6 +8381,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 7ee9850aed0..f56ea13f542 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -2883,7 +2883,9 @@ self: super: {
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -3960,6 +3962,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = doDistribute super."hid_0_2_1";
@@ -5255,6 +5258,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6781,6 +6786,7 @@ self: super: {
   "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";
@@ -6899,6 +6905,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7949,6 +7956,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7958,6 +7966,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8362,6 +8371,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index fef41afa423..db25ffbcf7e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -2838,7 +2838,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3901,6 +3904,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5097,6 +5101,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5178,6 +5183,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6671,6 +6678,7 @@ self: super: {
   "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";
@@ -6787,6 +6795,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7819,6 +7828,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7828,6 +7838,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8135,6 +8146,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8219,6 +8231,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index bf8a60ac2a8..6a5f4f91048 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -2835,7 +2835,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3897,6 +3900,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5093,6 +5097,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5174,6 +5179,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6665,6 +6672,7 @@ self: super: {
   "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";
@@ -6780,6 +6788,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7811,6 +7820,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7820,6 +7830,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8127,6 +8138,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8211,6 +8223,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 1cb9c893f80..ee4f7152ee0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -2830,7 +2830,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3891,6 +3894,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5087,6 +5091,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5168,6 +5173,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6658,6 +6665,7 @@ self: super: {
   "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";
@@ -6773,6 +6781,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7802,6 +7811,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7811,6 +7821,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8118,6 +8129,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8200,6 +8212,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 271da896c6e..aabbcc11e74 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -2830,7 +2830,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3890,6 +3893,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5085,6 +5089,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5166,6 +5171,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6654,6 +6661,7 @@ self: super: {
   "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";
@@ -6769,6 +6777,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7797,6 +7806,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7805,6 +7815,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8112,6 +8123,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8194,6 +8206,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 99ac875508e..55af508dd12 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -2822,7 +2822,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3882,6 +3885,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5075,6 +5079,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5156,6 +5161,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6642,6 +6649,7 @@ self: super: {
   "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";
@@ -6757,6 +6765,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7784,6 +7793,7 @@ self: super: {
   "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_2";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7792,6 +7802,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8097,6 +8108,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8179,6 +8191,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 2096bbe0e0f..7727c0f3d6d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -2821,7 +2821,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3879,6 +3882,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5070,6 +5074,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5151,6 +5156,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6634,6 +6641,7 @@ self: super: {
   "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";
@@ -6749,6 +6757,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7775,13 +7784,16 @@ self: super: {
   "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";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "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_13";
   "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-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8087,6 +8099,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8169,6 +8182,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 985b46e2af4..6a50af291be 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -2818,7 +2818,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3875,6 +3878,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5064,6 +5068,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5144,6 +5149,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6622,6 +6629,7 @@ self: super: {
   "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";
@@ -6737,6 +6745,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7759,13 +7768,16 @@ self: super: {
   "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";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "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_13";
   "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-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8071,6 +8083,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8153,6 +8166,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 0793e3e1cae..a50419cb506 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -2043,6 +2043,7 @@ 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";
   "conduit-audio" = dontDistribute super."conduit-audio";
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
@@ -2809,7 +2810,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3865,6 +3869,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5051,6 +5056,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5131,6 +5137,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6605,6 +6613,7 @@ self: super: {
   "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";
@@ -6720,6 +6729,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7741,13 +7751,16 @@ self: super: {
   "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";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "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_13";
   "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-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7790,6 +7803,7 @@ self: super: {
   "wai-throttler" = dontDistribute super."wai-throttler";
   "wai-transformers" = dontDistribute super."wai-transformers";
   "wai-util" = dontDistribute super."wai-util";
+  "wai-websockets" = doDistribute super."wai-websockets_3_0_0_7";
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
@@ -8031,6 +8045,7 @@ self: super: {
   "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-bin" = doDistribute super."yesod-bin_1_4_16_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
@@ -8047,6 +8062,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8129,6 +8145,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index de54f3f85ee..5ee263af1bc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -2043,6 +2043,7 @@ 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";
   "conduit-audio" = dontDistribute super."conduit-audio";
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
@@ -2809,7 +2810,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3860,6 +3864,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5042,6 +5047,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5122,6 +5128,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6592,6 +6600,7 @@ self: super: {
   "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";
@@ -6706,6 +6715,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7724,13 +7734,16 @@ self: super: {
   "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";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "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_13";
   "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-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7772,6 +7785,7 @@ self: super: {
   "wai-throttler" = dontDistribute super."wai-throttler";
   "wai-transformers" = dontDistribute super."wai-transformers";
   "wai-util" = dontDistribute super."wai-util";
+  "wai-websockets" = doDistribute super."wai-websockets_3_0_0_7";
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
@@ -8013,6 +8027,7 @@ self: super: {
   "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-bin" = doDistribute super."yesod-bin_1_4_16_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
@@ -8029,6 +8044,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8111,6 +8127,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 9a3e399043a..b2719512902 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -2035,6 +2035,7 @@ 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";
   "conduit-audio" = dontDistribute super."conduit-audio";
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
@@ -2801,7 +2802,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3851,6 +3855,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5028,6 +5033,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5108,6 +5114,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6573,6 +6581,7 @@ self: super: {
   "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";
@@ -6687,6 +6696,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7702,13 +7712,17 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "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";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "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_13";
   "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-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7750,6 +7764,7 @@ self: super: {
   "wai-throttler" = dontDistribute super."wai-throttler";
   "wai-transformers" = dontDistribute super."wai-transformers";
   "wai-util" = dontDistribute super."wai-util";
+  "wai-websockets" = doDistribute super."wai-websockets_3_0_0_7";
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
@@ -7990,6 +8005,7 @@ self: super: {
   "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-bin" = doDistribute super."yesod-bin_1_4_16_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
@@ -8005,6 +8021,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8087,6 +8104,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 4461c0812ff..cd7a87951e3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -2879,7 +2879,9 @@ self: super: {
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -3955,6 +3957,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = doDistribute super."hid_0_2_1";
@@ -5248,6 +5251,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6770,6 +6775,7 @@ self: super: {
   "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";
@@ -6887,6 +6893,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7935,6 +7942,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7944,6 +7952,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8347,6 +8356,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 407b9840cdd..04b5fdf0d4f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -2030,6 +2030,7 @@ 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";
   "conduit-audio" = dontDistribute super."conduit-audio";
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
@@ -2796,7 +2797,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3846,6 +3850,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5021,6 +5026,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5101,6 +5107,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6564,6 +6572,7 @@ self: super: {
   "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";
@@ -6678,6 +6687,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7690,13 +7700,17 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "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";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "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_13";
   "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-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7738,6 +7752,7 @@ self: super: {
   "wai-throttler" = dontDistribute super."wai-throttler";
   "wai-transformers" = dontDistribute super."wai-transformers";
   "wai-util" = dontDistribute super."wai-util";
+  "wai-websockets" = doDistribute super."wai-websockets_3_0_0_7";
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
@@ -7976,6 +7991,7 @@ self: super: {
   "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-bin" = doDistribute super."yesod-bin_1_4_16_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
@@ -7991,6 +8007,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8073,6 +8090,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index ebe29e181a8..14ca501a307 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -2875,7 +2875,9 @@ self: super: {
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -3950,6 +3952,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = doDistribute super."hid_0_2_1";
@@ -5241,6 +5244,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6762,6 +6767,7 @@ self: super: {
   "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";
@@ -6879,6 +6885,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7924,6 +7931,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7933,6 +7941,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8335,6 +8344,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 8a8faeb8829..91755dcdbc4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -2874,7 +2874,9 @@ self: super: {
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -3949,6 +3951,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = doDistribute super."hid_0_2_1";
@@ -5240,6 +5243,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6760,6 +6765,7 @@ self: super: {
   "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";
@@ -6877,6 +6883,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7921,6 +7928,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7930,6 +7938,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8331,6 +8340,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index b4746be3310..0eb506044e4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -2871,7 +2871,9 @@ self: super: {
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3943,6 +3945,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5229,6 +5232,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6743,6 +6748,7 @@ self: super: {
   "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";
@@ -6860,6 +6866,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7901,6 +7908,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7910,6 +7918,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8308,6 +8317,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 83635b005ae..b7e7ce31b3a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -2867,7 +2867,9 @@ self: super: {
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3936,6 +3938,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5218,6 +5221,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6730,6 +6735,7 @@ self: super: {
   "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";
@@ -6847,6 +6853,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7886,6 +7893,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7895,6 +7903,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8292,6 +8301,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 706ac59c44b..883096aa7f4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -2861,7 +2861,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3927,6 +3930,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5125,6 +5129,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5206,6 +5211,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6713,6 +6720,7 @@ self: super: {
   "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";
@@ -6830,6 +6838,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7866,6 +7875,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7875,6 +7885,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8185,6 +8196,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8269,6 +8281,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 50f10a62620..9ea33f85d85 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -2852,7 +2852,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3918,6 +3921,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5115,6 +5119,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5196,6 +5201,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6699,6 +6706,7 @@ self: super: {
   "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";
@@ -6816,6 +6824,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7851,6 +7860,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7860,6 +7870,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8170,6 +8181,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8254,6 +8266,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index a05341eb8b4..3e21be78b0b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -2845,7 +2845,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3910,6 +3913,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5107,6 +5111,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5188,6 +5193,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "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_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6690,6 +6697,7 @@ self: super: {
   "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";
@@ -6807,6 +6815,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7842,6 +7851,7 @@ self: super: {
   "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_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7851,6 +7861,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8161,6 +8172,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8245,6 +8257,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 26288e13884..fcb0354fd65 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -876,6 +876,7 @@ 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
@@ -4038,6 +4039,7 @@ self: {
        ];
        description = "Database Supported Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DSTM" = callPackage
@@ -5988,6 +5990,7 @@ 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
@@ -8305,21 +8308,42 @@ self: {
 
   "HPDF" = callPackage
     ({ mkDerivation, array, base, base64-bytestring, binary, bytestring
-     , containers, mtl, random, vector, zlib
+     , containers, errors, HTF, mtl, random, vector, zlib
      }:
      mkDerivation {
        pname = "HPDF";
-       version = "1.4.8";
-       sha256 = "717d05dda2a5bcdc482056afa6543774a6fcd0e180232f24bcd6240ddf489690";
+       version = "1.4.9";
+       sha256 = "fde0b80704ae10ba5ffc5a7817bfbfbecf48db3b556f14f0c4021d6297dbdc17";
        libraryHaskellDepends = [
-         array base base64-bytestring binary bytestring containers mtl
-         random vector zlib
+         array base base64-bytestring binary bytestring containers errors
+         mtl random vector zlib
        ];
+       testHaskellDepends = [ base HTF ];
+       doCheck = false;
        homepage = "http://www.alpheccar.org";
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HPDF_1_4_10" = callPackage
+    ({ mkDerivation, array, base, base64-bytestring, binary, bytestring
+     , containers, errors, HTF, mtl, random, vector, zlib
+     }:
+     mkDerivation {
+       pname = "HPDF";
+       version = "1.4.10";
+       sha256 = "de2bfddd93eeef2129a2378e8dce486d086bec3c48ee2a1bf1a5fb01581607d4";
+       libraryHaskellDepends = [
+         array base base64-bytestring binary bytestring containers errors
+         mtl random vector zlib
+       ];
+       testHaskellDepends = [ base HTF ];
+       homepage = "http://www.alpheccar.org";
+       description = "Generation of PDF documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HPath" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath
      , haskell-src-exts, mtl, parsec, utf8-string
@@ -10593,12 +10617,11 @@ self: {
      }:
      mkDerivation {
        pname = "HueAPI";
-       version = "0.2.5";
-       sha256 = "91985ae679c725b2214c247c64be63906afc074b0eb724a1383b73cf9464e0fb";
+       version = "0.2.6";
+       sha256 = "19515ecd8501ae038f060a3b10d391c865d07391d240b1819a55a165340e35c2";
        libraryHaskellDepends = [
          aeson base containers lens lens-aeson mtl transformers wreq
        ];
-       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/HueAPI";
        description = "API for controlling Philips Hue lights";
        license = stdenv.lib.licenses.bsd3;
@@ -11794,6 +11817,7 @@ 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
@@ -13078,8 +13102,8 @@ self: {
     ({ mkDerivation, base, MonadRandom, mtl, random }:
      mkDerivation {
        pname = "MonadRandomLazy";
-       version = "0.1";
-       sha256 = "525c531642d111efd8768758edf6cfd870a34dea7ac3b3ab5e444d5e0fd956db";
+       version = "0.1.1.1";
+       sha256 = "0289455d870512953d9e9f30e21d31f26469c0de4fca55abcce2f496cc1b1c7f";
        libraryHaskellDepends = [ base MonadRandom mtl random ];
        description = "Lazy monad for psuedo random-number generation";
        license = stdenv.lib.licenses.bsd3;
@@ -14974,8 +14998,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.7.0.0";
-       sha256 = "8fb8ca89074e10f325c7c0107a405718455bf6120e74140623252b9347aa2c97";
+       version = "0.7.0.1";
+       sha256 = "ff670da50a981cc665d1c17a813b94850fd1080e5b8db5e1602a1bc0ae86be32";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -17301,6 +17325,7 @@ self: {
        jailbreak = true;
        description = "Static code analysis using graph-theoretic techniques";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Southpaw" = callPackage
@@ -21630,8 +21655,8 @@ self: {
      }:
      mkDerivation {
        pname = "adblock2privoxy";
-       version = "1.4.0";
-       sha256 = "2503df4fb073fd03d2f66467b5a14eb31cf5a6a315823cbef09dd96db7c7e1cb";
+       version = "1.4.1";
+       sha256 = "6b3242a5ddba181659f9b8eb4786dfa929751aaf48a62b070040043a3e8e0613";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -23227,6 +23252,7 @@ self: {
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic" = callPackage
@@ -30245,8 +30271,8 @@ self: {
      }:
      mkDerivation {
        pname = "atp-haskell";
-       version = "1.8";
-       sha256 = "4bac41afc35571b2ad1a711d08e6f0cb223bb165615e511f2fc22ff9397fb467";
+       version = "1.9";
+       sha256 = "ef3c046d722fd5b8a2cd2662a0585fa2c2ea2131e58177f094e7a9b4d0909245";
        libraryHaskellDepends = [
          applicative-extras base containers HUnit mtl parsec pretty
          template-haskell time
@@ -31037,6 +31063,7 @@ self: {
        ];
        description = "empty";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avl-static" = callPackage
@@ -32457,6 +32484,7 @@ 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
@@ -33352,6 +33380,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bcrypt_0_0_8" = callPackage
+    ({ mkDerivation, base, bytestring, entropy, memory }:
+     mkDerivation {
+       pname = "bcrypt";
+       version = "0.0.8";
+       sha256 = "9cd100975d7349190a1d8ed6459d9e2677a74385ce86b35f2da3f5c582e11100";
+       libraryHaskellDepends = [ base bytestring entropy memory ];
+       description = "Haskell bindings to the bcrypt password hash";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bdd" = callPackage
     ({ mkDerivation, base, directory, HUnit, mtl, process
      , test-framework, test-framework-hunit, transformers
@@ -33636,6 +33676,7 @@ self: {
        homepage = "https://github.com/Noeda/bet/";
        description = "Betfair API bindings. Bet on sports on betting exchanges.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "betacode" = callPackage
@@ -33743,8 +33784,8 @@ self: {
     ({ mkDerivation, base, latex, parsec, utility-ht }:
      mkDerivation {
        pname = "bibtex";
-       version = "0.1.0.4";
-       sha256 = "804514bdd2c801b7a0d858ea1df16811466eb53fd87a195411a205334471d278";
+       version = "0.1.0.5";
+       sha256 = "dd06fbd5d597a558f059775b258ae526baa41c656a92e7d8a45646c64c1bc74b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base latex parsec utility-ht ];
@@ -34070,6 +34111,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary_0_7_6_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers
+     , directory, filepath, HUnit, QuickCheck, random, test-framework
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "binary";
+       version = "0.7.6.1";
+       sha256 = "8f85cafc15be660757878a665d024ce595d4422fead174e20a501c9ec8f81067";
+       libraryHaskellDepends = [ array base bytestring containers ];
+       testHaskellDepends = [
+         array base bytestring Cabal containers directory filepath HUnit
+         QuickCheck random test-framework test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/kolmodin/binary";
+       description = "Binary serialisation for Haskell values using lazy ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "binary_0_8_0_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HUnit, QuickCheck, random, test-framework
@@ -35006,6 +35067,7 @@ 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
@@ -37411,6 +37473,7 @@ 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
@@ -38561,6 +38624,7 @@ self: {
        homepage = "http://www.freedesktop.org/wiki/Software/Bustle/";
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "butterflies" = callPackage
@@ -39361,8 +39425,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "c-storable-deriving";
-       version = "0.1.2";
-       sha256 = "a127c61b4989de5ca808c0e5aa13d5538abeaeebf163c0bca2e55f8abc1bbe31";
+       version = "0.1.3";
+       sha256 = "68432da5e33d769c514402ad00bcd66c6a2742dd238825b4988476e5f4c9a67f";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/maurer/c-storable-deriving";
        description = "Generate C-like storable instances from datatypes";
@@ -40173,24 +40237,24 @@ self: {
      }) {};
 
   "cabal-macosx" = callPackage
-    ({ mkDerivation, base, Cabal, directory, fgl, filepath, HUnit
-     , parsec, process, temporary, test-framework, test-framework-hunit
-     , text
+    ({ mkDerivation, base, Cabal, containers, directory, fgl, filepath
+     , HUnit, parsec, process, temporary, test-framework
+     , test-framework-hunit, text
      }:
      mkDerivation {
        pname = "cabal-macosx";
-       version = "0.2.3.2";
-       sha256 = "054f891068c9ce0161610e929716e8fa2022ef0bc093fb42bcb30733c38026b7";
+       version = "0.2.3.3";
+       sha256 = "0ff1241a0b0a8d9107bba400f0af7f5f35552f988db0096e28e574e771de73ea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal directory fgl filepath parsec process text
+         base Cabal containers directory fgl filepath parsec process text
        ];
        executableHaskellDepends = [
-         base Cabal directory fgl filepath parsec process text
+         base Cabal containers directory fgl filepath parsec process text
        ];
        testHaskellDepends = [
-         base HUnit temporary test-framework test-framework-hunit
+         base Cabal HUnit temporary test-framework test-framework-hunit
        ];
        homepage = "http://github.com/danfran/cabal-macosx";
        description = "Cabal support for creating Mac OSX application bundles";
@@ -41680,8 +41744,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.4.1.4";
-       sha256 = "f04064cf031d10675b5295252dace0ab4b4fc401f78c5d0a4802a2a6dbea6fab";
+       version = "2.4.1.5";
+       sha256 = "87150f2cf93c8e6aa049d1dc2820e09a52a8178e53539f750f77c40e2322219c";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear vector vector-binary-instances
@@ -43493,6 +43557,7 @@ 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
@@ -44315,8 +44380,8 @@ self: {
      }:
      mkDerivation {
        pname = "clarifai";
-       version = "0.1.1.0";
-       sha256 = "40ef0baf628d4569138192128dd5f6f07a38b2963ec54e4968646f5953caf718";
+       version = "0.2.0.0";
+       sha256 = "4a382f92c21d1571861ddb557f721edce63c9b356960ea74a779175e13c41d2d";
        libraryHaskellDepends = [
          aeson base bytestring containers easy-file HTTP http-client lens
          lens-aeson scientific text unordered-containers vector wreq
@@ -46303,6 +46368,7 @@ 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
@@ -46493,6 +46559,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cmark_0_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, text }:
+     mkDerivation {
+       pname = "cmark";
+       version = "0.5.0";
+       sha256 = "a95dd6c5135159d0d1b797eb99bbad757a298f4a8fb580865323bff37cba2cb8";
+       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
     ({ mkDerivation, base }:
      mkDerivation {
@@ -48034,6 +48114,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "composition_1_0_2_1" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "composition";
+       version = "1.0.2.1";
+       sha256 = "7123300f5eca5a7cec4eb731dc0e9c2c44aabe26b37e6579582a7267d9f7ad6a";
+       description = "Combinators for unorthodox function composition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "composition-extra_1_1_0" = callPackage
     ({ mkDerivation, base, contravariant }:
      mkDerivation {
@@ -48791,7 +48882,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit" = callPackage
+  "conduit_1_2_6" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
      , mmorph, mtl, QuickCheck, resourcet, safe, transformers
      , transformers-base
@@ -48811,6 +48902,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.1";
+       sha256 = "ae38875a01312070cc1f59aba6687b7b8619416f426299ab126e08023c22309c";
+       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
@@ -52436,6 +52550,7 @@ 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
@@ -53532,14 +53647,13 @@ self: {
      }:
      mkDerivation {
        pname = "ctrie";
-       version = "0.1.0.2";
-       sha256 = "24808c8eae2fe71e92060f93479e5be1b97a7a90ffbdcf74bcb70470abe4d487";
+       version = "0.1.0.3";
+       sha256 = "39111bf907776cb33890ca5cba82e204d576aacd320df2f150fc090e34055b7c";
        libraryHaskellDepends = [ atomic-primops base hashable primitive ];
        testHaskellDepends = [
          base containers hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/mcschroeder/ctrie";
        description = "Non-blocking concurrent map";
        license = stdenv.lib.licenses.mit;
@@ -56005,13 +56119,13 @@ self: {
   "dbmigrations" = callPackage
     ({ mkDerivation, base, bytestring, configurator, containers
      , directory, fgl, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3
-     , HUnit, mtl, process, random, template-haskell, text, time
-     , yaml-light
+     , HUnit, MissingH, mtl, process, random, template-haskell, text
+     , time, yaml-light
      }:
      mkDerivation {
        pname = "dbmigrations";
-       version = "0.9.1";
-       sha256 = "02fa493a7743c453eca74396e6f359c3e73f1265a9ef40d8d7a0e99fb259dde4";
+       version = "1.0";
+       sha256 = "5dcd9d29eb4794070b8f41f1ec59e1937eebc68cc6de40c14219e815e56e16f6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56021,9 +56135,9 @@ self: {
        ];
        executableHaskellDepends = [ base configurator ];
        testHaskellDepends = [
-         base bytestring containers directory fgl filepath HDBC
-         HDBC-postgresql HDBC-sqlite3 HUnit mtl process template-haskell
-         time yaml-light
+         base bytestring configurator containers directory fgl filepath HDBC
+         HDBC-postgresql HDBC-sqlite3 HUnit MissingH mtl process
+         template-haskell text time yaml-light
        ];
        doCheck = false;
        description = "An implementation of relational database \"migrations\"";
@@ -60573,6 +60687,8 @@ self: {
        pname = "directory";
        version = "1.2.5.0";
        sha256 = "ac9d7fdd402c3281fab7ffad004229671f0ecfb7ddd70fd58b90b0a48c1ddef7";
+       revision = "1";
+       editedCabalFile = "1ae6631d1a4234329263792b1809c156f9f85a05753379e69fd6b2e93c61c6a0";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -60797,6 +60913,7 @@ 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
@@ -61039,6 +61156,7 @@ 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-execution_0_1_1" = callPackage
@@ -61109,6 +61227,7 @@ 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
@@ -61276,6 +61395,7 @@ 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
@@ -61408,6 +61528,7 @@ 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
@@ -61480,6 +61601,7 @@ 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
@@ -62928,6 +63050,7 @@ self: {
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dsmc" = callPackage
@@ -63402,6 +63525,7 @@ 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
@@ -65322,7 +65446,7 @@ 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 = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email" = callPackage
@@ -69453,7 +69577,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fb" = callPackage
+  "fb_1_0_12" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, bytestring, cereal, conduit, conduit-extra
      , containers, crypto-api, cryptohash, cryptohash-cryptoapi
@@ -69482,6 +69606,38 @@ self: {
        homepage = "https://github.com/prowdsponsor/fb";
        description = "Bindings to Facebook's API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "fb" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , base64-bytestring, bytestring, cereal, conduit, conduit-extra
+     , containers, crypto-api, cryptohash, cryptohash-cryptoapi
+     , data-default, hspec, http-conduit, http-types, HUnit, lifted-base
+     , monad-control, monad-logger, old-locale, QuickCheck, resourcet
+     , text, time, transformers, transformers-base, unordered-containers
+     }:
+     mkDerivation {
+       pname = "fb";
+       version = "1.0.13";
+       sha256 = "52af3e05b5721b5d38fea9231e9fde68b0e1987c4cc979acaf6e2f940537935e";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring base64-bytestring
+         bytestring cereal conduit conduit-extra crypto-api cryptohash
+         cryptohash-cryptoapi data-default http-conduit http-types
+         lifted-base monad-control monad-logger old-locale resourcet text
+         time transformers transformers-base unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conduit containers data-default hspec
+         http-conduit HUnit lifted-base monad-control QuickCheck resourcet
+         text time transformers
+       ];
+       jailbreak = true;
+       doCheck = false;
+       homepage = "https://github.com/prowdsponsor/fb";
+       description = "Bindings to Facebook's API";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "fb-persistent_0_3_4" = callPackage
@@ -69498,7 +69654,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fb-persistent" = callPackage
+  "fb-persistent_0_3_5" = callPackage
     ({ mkDerivation, base, cereal, fb, persistent, text, time }:
      mkDerivation {
        pname = "fb-persistent";
@@ -69508,6 +69664,19 @@ self: {
        homepage = "https://github.com/prowdsponsor/fb-persistent";
        description = "Provides Persistent instances to Facebook types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "fb-persistent" = callPackage
+    ({ mkDerivation, base, cereal, fb, persistent, text, time }:
+     mkDerivation {
+       pname = "fb-persistent";
+       version = "0.3.6";
+       sha256 = "9a24e190b70fd3bcd5a70813e50872398217b24d39da76b175cbcbbd693580c6";
+       libraryHaskellDepends = [ base cereal fb persistent text time ];
+       homepage = "https://github.com/prowdsponsor/fb-persistent";
+       description = "Provides Persistent instances to Facebook types";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "fca" = callPackage
@@ -69527,6 +69696,23 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "fcache" = callPackage
+    ({ mkDerivation, base, containers, hashable, hspec, mtl
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "fcache";
+       version = "0.1.0.0";
+       sha256 = "52340d228a564a7eb0fe84d386075af019540145fbe53b4e20925b746e3a0eae";
+       libraryHaskellDepends = [
+         base containers hashable mtl unordered-containers
+       ];
+       testHaskellDepends = [ base hspec mtl ];
+       homepage = "http://github.com/ylilarry/fcache#readme";
+       description = "Cache a function (a -> b)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fcd" = callPackage
     ({ mkDerivation, array, base, directory, process, tasty
      , tasty-hunit, text, unix, vty, vty-ui
@@ -70120,8 +70306,8 @@ self: {
      }:
      mkDerivation {
        pname = "ffmpeg-light";
-       version = "0.9.0";
-       sha256 = "309ce75c56dfef61ad0e08ef34324873b24cdeb32ae2ace406caf0e9ca788897";
+       version = "0.10.0";
+       sha256 = "4b8347300fbc1c687f9db5a00baa59dc654be11d9299258f5bd2256a61501395";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70708,15 +70894,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "filepath_1_4_0_0" = callPackage
+  "filepath_1_4_1_0" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "filepath";
-       version = "1.4.0.0";
-       sha256 = "a43b3590476b1ca594ca108a4e8d4f8b0f0f5abb312666e6a42c24d8dd83b028";
+       version = "1.4.1.0";
+       sha256 = "bd6dbfd1ecba2322ef166b4805d4276cbde1e551bd5c61fbee396782b9923d00";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
-       jailbreak = true;
        homepage = "https://github.com/haskell/filepath#readme";
        description = "Library for manipulating FilePaths in a cross platform way";
        license = stdenv.lib.licenses.bsd3;
@@ -71842,6 +72027,7 @@ 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
@@ -72339,8 +72525,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.4.6.0";
-       sha256 = "91a3114417eccc322d7b151029c88582a8875151a452df487c9fb857d724b2b5";
+       version = "0.4.7.0";
+       sha256 = "8836b026467a5940be86015d34f2dfca7f0b1787fd608d1bad81a8bd25cbc8e9";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers foldl free
          monoid-subclasses profunctors semigroupoids semigroups split text
@@ -73441,15 +73627,14 @@ self: {
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.6.4.1";
-       sha256 = "f3cf80e02a6fe54737ff73cf7cc81e500a5b9d653d2dde8410144e2293f085d5";
+       version = "0.6.5";
+       sha256 = "be107f1140b11d043e93682e1ab988a4aa7fd00cb460417daca97c90d61f7ddf";
        libraryHaskellDepends = [
          algebraic-classes base comonad constraints template-haskell
          transformers void
        ];
-       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/free-functors";
-       description = "Provides free functors that are adjoint to functors that forget class constraints";
+       description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -73484,8 +73669,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-http";
-       version = "0.1.1.3";
-       sha256 = "d5a161832284329c59b5f96f8e06d3640ea24dfab13304d4a9abe60a6275aabe";
+       version = "0.2.0";
+       sha256 = "d873e7dcef909cf6ec38e00273531c2831cc9a5ab4f2b73de8ec39441a6454b7";
        libraryHaskellDepends = [
          base bytestring free http-client http-types mtl QuickCheck text
          time transformers
@@ -74266,6 +74451,7 @@ 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
@@ -79704,6 +79890,7 @@ 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
@@ -79867,6 +80054,7 @@ self: {
        ];
        description = "Mealy based simulation tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "goatee" = callPackage
@@ -82151,17 +82339,18 @@ self: {
 
   "gremlin-haskell" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, containers, hspec, lens
-     , lens-aeson, mtl, stm, text, unordered-containers, uuid
-     , websockets
+     , lens-aeson, mtl, stm, text, transformers, unordered-containers
+     , uuid, websockets
      }:
      mkDerivation {
        pname = "gremlin-haskell";
-       version = "0.1.0.1";
-       sha256 = "e73f628ffd27098147e51e301ab531ae01b964ddeaf4fa1104a508300cc15f8f";
+       version = "0.1.0.2";
+       sha256 = "3e33c59fb09c435d89c30fe7ae7dff88246f05d6ad43bd9fcf27c47bd68353aa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-qq base containers lens mtl stm text uuid websockets
+         aeson aeson-qq base containers lens mtl stm text transformers uuid
+         websockets
        ];
        executableHaskellDepends = [
          aeson base lens lens-aeson mtl text unordered-containers
@@ -82170,6 +82359,7 @@ 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;
      }) {};
 
   "grid" = callPackage
@@ -85175,6 +85365,7 @@ self: {
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hactor" = callPackage
@@ -86691,6 +86882,7 @@ self: {
        ];
        description = "Graphviz code generation with Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hapistrano" = callPackage
@@ -88771,6 +88963,7 @@ 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
@@ -89005,6 +89198,7 @@ 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
@@ -91018,8 +91212,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.15.0.2";
-       sha256 = "1264ebf39cd39977175f96f00c4330bbecd96882ac7463dd627b1e7cff3c9f52";
+       version = "0.15.1";
+       sha256 = "8eefdfca21975e215708126b805ee8ba1803e3e3ce32e5c29a1b3e5912ededf8";
        libraryHaskellDepends = [
          aeson attoparsec base base-prelude bytestring contravariant
          contravariant-extras data-default-class dlist either hashable
@@ -91038,37 +91232,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hasql_0_15_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";
-       sha256 = "8eefdfca21975e215708126b805ee8ba1803e3e3ce32e5c29a1b3e5912ededf8";
-       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
-       ];
-       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
@@ -91516,6 +91679,7 @@ 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
@@ -91531,6 +91695,7 @@ 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
@@ -91782,6 +91947,7 @@ 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
@@ -94746,6 +94912,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hi3status" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre
+     , network, prefix-units, process, regex-pcre-builtin, text, time
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "hi3status";
+       version = "0.1.1.0";
+       sha256 = "de4c03916349148592e2f3b92a26f5f0b315762b8af61cfe41b556f427a43366";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring dbus dyre network prefix-units process
+         regex-pcre-builtin text time transformers vector
+       ];
+       executableHaskellDepends = [ base dbus process ];
+       description = "Status line for i3bar";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hiccup" = callPackage
     ({ mkDerivation, base, bytestring, containers, haskell98, HUnit
      , mtl, parsec, random, readline, time
@@ -98601,6 +98787,7 @@ self: {
        homepage = "https://github.com/mgajda/homplexity";
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "honi" = callPackage
@@ -99475,8 +99662,8 @@ self: {
      }:
      mkDerivation {
        pname = "hops";
-       version = "0.4.0";
-       sha256 = "7683f48ef77af14236a5a4f65f5292504cd1db333f76df91aab84a18925287d6";
+       version = "0.4.1";
+       sha256 = "e28a457b5f75c3e375f17143244da60e7754c6948bb0f8826c6d5efcbcf07d49";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -99648,6 +99835,7 @@ 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
@@ -100837,6 +101025,7 @@ self: {
        ];
        description = "Utility to generate haskell-names interface files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-gizapp" = callPackage
@@ -101875,6 +102064,7 @@ 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
@@ -104487,6 +104677,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Haskell bindings to libseccomp";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {seccomp = null;};
 
   "hsshellscript" = callPackage
@@ -104949,6 +105140,7 @@ self: {
          base base64-bytestring bytestring containers filepath hxt split
          zlib
        ];
+       jailbreak = true;
        description = "Import from the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106493,8 +106685,8 @@ self: {
        pname = "http-conduit";
        version = "2.1.8";
        sha256 = "550d86ea9ee6dd90994a460c5c85ddc861fb5c0f007304dc4a2e2035f980ea3d";
-       revision = "1";
-       editedCabalFile = "281d76f2884547539aae5dbcd45997ae889d9f04f4bf55ff282937960ff256f1";
+       revision = "2";
+       editedCabalFile = "970d73310cb9628d120eaa029aac6b9dd8b79ce63e91959cce8ca26afa952c7f";
        libraryHaskellDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -106641,6 +106833,7 @@ self: {
        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;
@@ -113909,6 +114102,7 @@ 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
@@ -115571,6 +115765,7 @@ 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
@@ -116794,6 +116989,8 @@ self: {
        pname = "keter";
        version = "1.4.3.1";
        sha256 = "1111d0f97dc36e84c041f34176d652911a1e7b9c48943533835ac73ccf37582f";
+       revision = "1";
+       editedCabalFile = "197ee783d18b293bb5fbe286623ca588695ec2115a012c3547535702fafc571f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117822,6 +118019,7 @@ 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
@@ -117848,6 +118046,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot core functionality";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-haskell-plugins" = callPackage
@@ -117874,6 +118073,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -117892,6 +118092,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "IRC plugins for lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-misc-plugins" = callPackage
@@ -117915,6 +118116,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-novelty-plugins" = callPackage
@@ -117935,6 +118137,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-reference-plugins" = callPackage
@@ -117953,6 +118156,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot reference plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-social-plugins" = callPackage
@@ -117971,6 +118175,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Social plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-trusted" = callPackage
@@ -118315,13 +118520,17 @@ self: {
      }) {};
 
   "language-bash" = callPackage
-    ({ mkDerivation, base, parsec, pretty, transformers }:
+    ({ mkDerivation, base, parsec, pretty, process, QuickCheck, tasty
+     , tasty-quickcheck, transformers
+     }:
      mkDerivation {
        pname = "language-bash";
-       version = "0.6.0";
-       sha256 = "7a07f1713c7b5018e94b6b5e529feb8dd499f040a5ba4d7f00aee6471e4c0b1e";
+       version = "0.6.1";
+       sha256 = "7fb4fb293aec5f3c9b0e7ca2b99f895115d1bbe13f8dbfe02003560e3c063c8d";
        libraryHaskellDepends = [ base parsec pretty transformers ];
-       jailbreak = true;
+       testHaskellDepends = [
+         base parsec process QuickCheck tasty tasty-quickcheck
+       ];
        homepage = "http://github.com/knrafto/language-bash/";
        description = "Parsing and pretty-printing Bash shell scripts";
        license = stdenv.lib.licenses.bsd3;
@@ -124075,6 +124284,7 @@ self: {
        ];
        description = "Very simple poll lock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lockfree-queue" = callPackage
@@ -125263,6 +125473,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lucid-svg_0_6_0_1" = callPackage
+    ({ mkDerivation, base, blaze-builder, lucid, text, transformers }:
+     mkDerivation {
+       pname = "lucid-svg";
+       version = "0.6.0.1";
+       sha256 = "a8cff758914de95defca5640a1f6c3ddf995078063fb8553da02249510db67cc";
+       libraryHaskellDepends = [
+         base blaze-builder lucid text transformers
+       ];
+       homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git";
+       description = "DSL for SVG using lucid for HTML";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lucienne" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bson
      , bytestring, compact-string-fix, feed, happstack, happstack-server
@@ -125333,8 +125558,8 @@ self: {
      }:
      mkDerivation {
        pname = "luminance";
-       version = "0.9";
-       sha256 = "8bbee1483bca9a073a8ca7f4f1d3bec00f99c3d59bfa637702afda5a88eb2ada";
+       version = "0.9.1";
+       sha256 = "1b968fe815bf11c784474eead8f62ec1aefecfdc058fa99148867266669979dd";
        libraryHaskellDepends = [
          base containers contravariant dlist gl linear mtl resourcet
          semigroups transformers vector void
@@ -126928,7 +127153,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mangopay" = callPackage
+  "mangopay_1_11_5" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, bytestring, case-insensitive
      , conduit, conduit-extra, connection, country-codes, data-default
@@ -126966,6 +127191,47 @@ self: {
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mangopay" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
+     , base64-bytestring, blaze-builder, bytestring, case-insensitive
+     , conduit, conduit-extra, connection, country-codes, data-default
+     , HTF, http-conduit, http-types, HUnit, lifted-base, monad-control
+     , monad-logger, resourcet, template-haskell, text, time, tls
+     , transformers, transformers-base, unordered-containers
+     , utf8-string, vector, wai, warp, x509-system
+     }:
+     mkDerivation {
+       pname = "mangopay";
+       version = "1.12";
+       sha256 = "859ea675506f505666857b1d694d57c0e34cc58cfd3b9da2c5216e78aff47f73";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async attoparsec base base16-bytestring base64-bytestring
+         blaze-builder bytestring case-insensitive conduit conduit-extra
+         connection country-codes data-default http-conduit http-types HUnit
+         lifted-base monad-control monad-logger resourcet template-haskell
+         text time tls transformers transformers-base unordered-containers
+         utf8-string vector wai warp x509-system
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring http-conduit monad-logger text transformers
+       ];
+       testHaskellDepends = [
+         aeson async attoparsec base base16-bytestring base64-bytestring
+         blaze-builder bytestring case-insensitive conduit conduit-extra
+         connection country-codes data-default HTF http-conduit http-types
+         HUnit lifted-base monad-control monad-logger resourcet
+         template-haskell text time tls transformers transformers-base
+         unordered-containers utf8-string vector wai warp x509-system
+       ];
+       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
@@ -128901,6 +129167,55 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens_0_4_0_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "microlens";
+       version = "0.4.0.0";
+       sha256 = "6e01798e936ac52295b803c9bf3e9c7999f628c1f928e312b05ddf3787493d42";
+       libraryHaskellDepends = [ base ];
+       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-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.0.0";
+       sha256 = "2643285013e2709100e0e3ded10e3d1a1f4ab75faae604e36d37c2688d9c3743";
+       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
+    ({ mkDerivation, base, contravariant, microlens }:
+     mkDerivation {
+       pname = "microlens-contra";
+       version = "0.1.0.0";
+       sha256 = "27d58e82c94efa174507d30b3cd98cbb30591eed8f37fb772ba6915e66fd2567";
+       libraryHaskellDepends = [ base contravariant microlens ];
+       jailbreak = true;
+       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
     ({ mkDerivation, base, microlens }:
      mkDerivation {
@@ -128944,6 +129259,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-ghc_0_4_0_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, microlens }:
+     mkDerivation {
+       pname = "microlens-ghc";
+       version = "0.4.0.0";
+       sha256 = "d910ea55820f8a9175df750c2dec3ba09ce8f16005c970c396010350de66933c";
+       libraryHaskellDepends = [
+         array base bytestring containers microlens
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens + all features depending on packages coming with GHC (array, bytestring, containers)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-mtl_0_1_3_1" = callPackage
     ({ mkDerivation, base, microlens, mtl, transformers
      , transformers-compat
@@ -128995,6 +129326,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-mtl_0_1_6_1" = callPackage
+    ({ mkDerivation, base, microlens, mtl, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "microlens-mtl";
+       version = "0.1.6.1";
+       sha256 = "af2a9763a35ee85bb27a9ff14d7fe1f653407a96a35835f9d182cdfd532ef0c3";
+       libraryHaskellDepends = [
+         base microlens mtl transformers transformers-compat
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens support for Reader/Writer/State from mtl";
+       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
@@ -129012,6 +129361,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-platform_0_2_0_0" = callPackage
+    ({ mkDerivation, base, hashable, microlens, microlens-ghc
+     , microlens-mtl, microlens-th, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-platform";
+       version = "0.2.0.0";
+       sha256 = "70554347be8b059376860a45f411c89fbd30c1e542a81cea763f0495ecc8823f";
+       libraryHaskellDepends = [
+         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-th_0_2_1_0" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
@@ -129057,6 +129425,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-th_0_3_0_0" = callPackage
+    ({ mkDerivation, base, containers, microlens, template-haskell }:
+     mkDerivation {
+       pname = "microlens-th";
+       version = "0.3.0.0";
+       sha256 = "951eaf33daf3b648082f754a6c091a8401bad39f5d5f659bad22252fe214d866";
+       libraryHaskellDepends = [
+         base containers microlens template-haskell
+       ];
+       jailbreak = true;
+       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 {
@@ -129247,8 +129631,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.2.10";
-       sha256 = "b5d8b8a310598d952f3b4329808ef8211a6a0b224d66fcc18cef4f0a737d25f1";
+       version = "3.3.0";
+       sha256 = "cc39bcd4a08a4ea71c9bfb11f5ab70a7aee91e927885cc88f7e71104fdc71966";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129263,6 +129647,7 @@ 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;
@@ -133011,6 +133396,7 @@ 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
@@ -137481,12 +137867,16 @@ self: {
      }) {};
 
   "niagra" = callPackage
-    ({ mkDerivation, base, containers, mtl, text, transformers }:
+    ({ mkDerivation, base, containers, ghc-prim, mtl, text
+     , transformers
+     }:
      mkDerivation {
        pname = "niagra";
-       version = "0.1.0";
-       sha256 = "dd95efe3c72f07dc4e82ace01b13f26406dc0d40a476416dbbb0e6d77dcdcf7d";
-       libraryHaskellDepends = [ base containers mtl text transformers ];
+       version = "0.2.0";
+       sha256 = "ad2432ca574c5626a7340d09d37113670ae75e7db5e371469983db0676560d34";
+       libraryHaskellDepends = [
+         base containers ghc-prim mtl text transformers
+       ];
        homepage = "https://github.com/fhsjaagshs/niagra";
        description = "CSS EDSL for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -139227,8 +139617,8 @@ self: {
     ({ mkDerivation, base, contravariant, ghc-prim, transformers }:
      mkDerivation {
        pname = "one-liner";
-       version = "0.5.1";
-       sha256 = "00ba698e3ac6ddec6b3b364bd13ddfac487380513dec5ab6017a5b817a646359";
+       version = "0.5.2";
+       sha256 = "9b2332118fd4e8ce127b11989b73af2a9812c98bbf1e2dfa762c718561b6df79";
        libraryHaskellDepends = [
          base contravariant ghc-prim transformers
        ];
@@ -140797,6 +141187,7 @@ 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
@@ -143540,7 +143931,7 @@ 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 = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "paypal-api" = callPackage
@@ -146887,28 +147278,6 @@ self: {
      }) {};
 
   "pinch" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , hashable, hspec, hspec-discover, QuickCheck, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pinch";
-       version = "0.1.0.2";
-       sha256 = "39add08af0cea1f818708fc69ecab07112b04aed575ab2724ced55e13ddf02ea";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq hashable text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec hspec-discover QuickCheck text
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/abhinav/pinch";
-       description = "An alternative implementation of Thrift for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pinch_0_2_0_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
      , unordered-containers, vector
@@ -146928,7 +147297,6 @@ self: {
        homepage = "https://github.com/abhinav/pinch";
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinchot" = callPackage
@@ -147928,6 +148296,7 @@ self: {
        ];
        description = "Interfacing pipes with foldl folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-vector" = callPackage
@@ -148287,6 +148656,7 @@ self: {
        ];
        description = "Remote monad for editing plists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plivo" = callPackage
@@ -149395,6 +149765,7 @@ 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;};
 
@@ -150188,58 +150559,48 @@ self: {
      }) {};
 
   "postgrest" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base64-string, bcrypt
-     , bifunctors, blaze-builder, bytestring, case-insensitive, cassava
-     , containers, convertible, errors, hasql, hasql-backend
-     , hasql-postgres, heredoc, hlint, hspec, hspec-wai, hspec-wai-json
-     , HTTP, http-media, http-types, jwt, MissingH, mtl, network
-     , network-uri, optparse-applicative, packdeps, parsec, process
-     , QuickCheck, Ranged-sets, regex-base, regex-tdfa, resource-pool
-     , scientific, split, string-conversions, stringsearch, text, time
-     , transformers, unordered-containers, vector, wai, wai-cors
+    ({ mkDerivation, aeson, base, base64-string, bytestring
+     , case-insensitive, cassava, containers, errors, hasql
+     , hasql-backend, hasql-postgres, heredoc, hlint, hspec, hspec-wai
+     , hspec-wai-json, HTTP, http-types, jwt, MissingH
+     , optparse-applicative, packdeps, parsec, process, Ranged-sets
+     , regex-tdfa, safe, scientific, string-conversions, text, time
+     , transformers, unix, unordered-containers, vector, wai, wai-cors
      , wai-extra, wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "postgrest";
-       version = "0.3.0.0";
-       sha256 = "be45f6e85d007ba52c389f12e8a68336008bdf5f16ff6e6d30606d6f27d3ccc6";
+       version = "0.3.0.2";
+       sha256 = "5ce3b9b85a51ca6cb3aecc9e1ba84047ab276915c1c0293d2bf91d252c4ee366";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base base64-string bcrypt bifunctors blaze-builder bytestring
-         case-insensitive cassava containers convertible errors hasql
-         hasql-backend hasql-postgres HTTP http-types jwt MissingH mtl
-         network network-uri optparse-applicative parsec Ranged-sets
-         regex-base regex-tdfa resource-pool scientific split
-         string-conversions stringsearch text time transformers
-         unordered-containers vector wai wai-cors wai-extra
-         wai-middleware-static warp
+         aeson base bytestring case-insensitive cassava containers errors
+         hasql hasql-backend hasql-postgres HTTP http-types jwt MissingH
+         optparse-applicative parsec Ranged-sets regex-tdfa safe scientific
+         string-conversions text time unordered-containers vector wai
+         wai-cors wai-extra wai-middleware-static
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty base base64-string bcrypt bifunctors
-         blaze-builder bytestring case-insensitive cassava containers
-         convertible errors hasql hasql-backend hasql-postgres HTTP
-         http-types jwt MissingH mtl network network-uri
-         optparse-applicative parsec Ranged-sets regex-base regex-tdfa
-         resource-pool scientific split string-conversions stringsearch text
-         time transformers unordered-containers vector wai wai-cors
-         wai-extra wai-middleware-static warp
+         aeson base bytestring case-insensitive cassava containers errors
+         hasql hasql-backend hasql-postgres HTTP http-types jwt MissingH
+         optparse-applicative parsec Ranged-sets regex-tdfa safe scientific
+         string-conversions text time transformers unix unordered-containers
+         vector wai wai-cors wai-extra wai-middleware-static warp
        ];
        testHaskellDepends = [
-         aeson base base64-string bcrypt bifunctors blaze-builder bytestring
-         case-insensitive cassava containers convertible errors hasql
-         hasql-backend hasql-postgres heredoc hlint hspec hspec-wai
-         hspec-wai-json HTTP http-media http-types jwt MissingH mtl network
-         network-uri optparse-applicative packdeps parsec process QuickCheck
-         Ranged-sets regex-base regex-tdfa resource-pool scientific split
-         string-conversions stringsearch text time transformers
-         unordered-containers vector wai wai-cors wai-extra
-         wai-middleware-static warp
+         aeson base base64-string bytestring case-insensitive cassava
+         containers errors hasql hasql-backend hasql-postgres heredoc hlint
+         hspec hspec-wai hspec-wai-json HTTP http-types jwt MissingH
+         optparse-applicative packdeps parsec process Ranged-sets regex-tdfa
+         safe scientific string-conversions text time unordered-containers
+         vector wai wai-cors wai-extra wai-middleware-static
        ];
        jailbreak = true;
        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
@@ -150533,6 +150894,7 @@ self: {
        ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "predicates" = callPackage
@@ -150912,6 +151274,7 @@ self: {
        jailbreak = true;
        description = "An HDBC connector for Presto";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prettify" = callPackage
@@ -153862,6 +154225,7 @@ self: {
        homepage = "https://github.com/ndmitchell/qed#readme";
        description = "Simple prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qhull-simple" = callPackage
@@ -156274,6 +156638,7 @@ 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
@@ -156296,6 +156661,7 @@ 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
@@ -156951,6 +157317,7 @@ 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
@@ -156969,6 +157336,7 @@ 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
@@ -157033,6 +157401,7 @@ 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
@@ -157062,7 +157431,7 @@ self: {
        homepage = "https://github.com/saulzar/reflex-gloss-scene";
        description = "A simple scene-graph using reflex and gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-transformers" = callPackage
@@ -157080,6 +157449,7 @@ 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
@@ -157999,8 +158369,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.7.0.1";
-       sha256 = "eb186d8bc97fe48e1a4f8933a2a7a13f7e3269eaafa5c3eb6509cfb58cf53e8a";
+       version = "0.7.1.0";
+       sha256 = "04fbd9d0cfee03a299a9642d40470a8d6c89bc8163905ffa232dbd8499eb6c9d";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -160298,6 +160668,8 @@ self: {
        pname = "rest-wai";
        version = "0.2";
        sha256 = "92d7455c537d24c6d2ccadd9272cac385659ed2a828fbe20bca9249016897413";
+       revision = "1";
+       editedCabalFile = "66767f5908d25ffaeaf9f15ad093f57f88ed212638bbfb7ec23190ed77c133b4";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types mime-types
          mtl rest-core text unordered-containers wai
@@ -163882,6 +164254,7 @@ 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
@@ -166783,18 +167156,23 @@ self: {
      }) {};
 
   "servant-swagger" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hashable
-     , lens, servant, text, unordered-containers, uuid
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
+     , http-media, lens, servant, swagger2, text, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "servant-swagger";
-       version = "0.0.0.1";
-       sha256 = "7c9b93912cc6aa617b4d068624c3b927f58f8dfb3f153c8be51c7fc5c22c0b4e";
+       version = "0.1";
+       sha256 = "ee47a6f51afb029abe1add54a1f579340ec48e5b816b592d1b976d0bdfd8346e";
        libraryHaskellDepends = [
-         aeson base bytestring containers hashable lens servant text
-         unordered-containers uuid
+         aeson base bytestring http-media lens servant swagger2 text
+         unordered-containers
        ];
-       description = "Swagger";
+       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;
      }) {};
 
@@ -166885,6 +167263,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "serversession-backend-acid-state_1_0_3" = callPackage
+    ({ mkDerivation, acid-state, base, containers, hspec, mtl, safecopy
+     , serversession, unordered-containers
+     }:
+     mkDerivation {
+       pname = "serversession-backend-acid-state";
+       version = "1.0.3";
+       sha256 = "005317d6b31500738979d5affc858c5d2642dc86122b360c28a0737aac2a7ce6";
+       libraryHaskellDepends = [
+         acid-state base containers mtl safecopy serversession
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         acid-state base containers hspec mtl safecopy serversession
+         unordered-containers
+       ];
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "Storage backend for serversession using acid-state";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "serversession-backend-persistent" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
      , hspec, monad-logger, path-pieces, persistent
@@ -166912,6 +167312,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "serversession-backend-persistent_1_0_2" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
+     , hspec, monad-logger, path-pieces, persistent
+     , persistent-postgresql, persistent-sqlite, persistent-template
+     , QuickCheck, resource-pool, serversession, tagged, text, time
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "serversession-backend-persistent";
+       version = "1.0.2";
+       sha256 = "19dfb2c55d64168e3fa2ceb6476ac55c67e69a750e0a39b400d9b3b0fbd3be4b";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cereal path-pieces
+         persistent serversession tagged text time transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base base64-bytestring bytestring cereal hspec monad-logger
+         path-pieces persistent persistent-postgresql persistent-sqlite
+         persistent-template QuickCheck resource-pool serversession text
+         time transformers unordered-containers
+       ];
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "Storage backend for serversession using persistent and an RDBMS";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "serversession-backend-redis" = callPackage
     ({ mkDerivation, base, bytestring, hedis, hspec, path-pieces
      , serversession, tagged, text, time, transformers
@@ -166935,6 +167363,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "serversession-backend-redis_1_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, hedis, hspec, path-pieces
+     , serversession, tagged, text, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "serversession-backend-redis";
+       version = "1.0.1";
+       sha256 = "b4b30860fa2e431fd7101b3fb5541e7a687bce71886ca164564c35fbf104af4f";
+       libraryHaskellDepends = [
+         base bytestring hedis path-pieces serversession tagged text time
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring hedis hspec path-pieces serversession text time
+         transformers unordered-containers
+       ];
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "Storage backend for serversession using Redis";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "serversession-frontend-snap" = callPackage
     ({ mkDerivation, base, bytestring, nonce, path-pieces
      , serversession, snap, snap-core, text, time, transformers
@@ -166998,8 +167449,8 @@ self: {
        pname = "servius";
        version = "1.2.0.1";
        sha256 = "3839d725b5b01be2baf46bb93a5c3090494a43aefa09e2a300a7e96b826f9a01";
-       revision = "1";
-       editedCabalFile = "febebdf7c47660c5f61502b7537258d4fad717fd9ef6668c7e5d196450b2fba1";
+       revision = "2";
+       editedCabalFile = "9f2fe5d7ad9f90e4314675f47634a41ba37a14746c0b72d576323d672f1ca580";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -167283,6 +167734,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sexp-grammar" = callPackage
+    ({ mkDerivation, array, base, containers, mtl, QuickCheck
+     , scientific, semigroups, split, stack-prism, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "sexp-grammar";
+       version = "1.0.0";
+       sha256 = "e90495a6fd7993cd4f943a5a9e2759304a9f055a8cea0c2bc2f94645bc150a1e";
+       libraryHaskellDepends = [
+         array base containers mtl scientific semigroups split stack-prism
+         template-haskell text wl-pprint-text
+       ];
+       testHaskellDepends = [
+         base QuickCheck scientific semigroups stack-prism tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       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
     ({ mkDerivation, base, pretty-show }:
      mkDerivation {
@@ -170329,7 +170803,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "skein" = callPackage
+  "skein_1_0_9_3" = callPackage
     ({ mkDerivation, base, bytestring, cereal, crypto-api, filepath
      , hspec, tagged
      }:
@@ -170346,6 +170820,26 @@ self: {
        homepage = "https://github.com/meteficha/skein";
        description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "skein" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, crypto-api, filepath
+     , hspec, tagged
+     }:
+     mkDerivation {
+       pname = "skein";
+       version = "1.0.9.4";
+       sha256 = "f882ca0cc5ed336ef898fb3c89579e392900259296b2320edf968b9fc16cb8c9";
+       libraryHaskellDepends = [
+         base bytestring cereal crypto-api tagged
+       ];
+       testHaskellDepends = [
+         base bytestring cereal crypto-api filepath hspec tagged
+       ];
+       homepage = "https://github.com/meteficha/skein";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "skeleton" = callPackage
@@ -172217,6 +172711,7 @@ 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
@@ -172697,6 +173192,7 @@ 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
@@ -173753,16 +174249,18 @@ self: {
 
   "spatial-math" = callPackage
     ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, lens
-     , linear
+     , linear, QuickCheck, test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "spatial-math";
-       version = "0.2.4.0";
-       sha256 = "7bcb1ca70702e6b66accab8a20eaa02e737989924214d3cc89f1f89c3262da2b";
+       version = "0.2.5.0";
+       sha256 = "3fbdac29649d0bba318766e271eab808732acd529667c4a9f064aab2858d3ef8";
        libraryHaskellDepends = [
          base binary cereal ghc-prim lens linear
        ];
-       testHaskellDepends = [ base doctest ];
+       testHaskellDepends = [
+         base doctest QuickCheck test-framework test-framework-quickcheck2
+       ];
        description = "3d math including quaternions/euler angles/dcms and utility functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -174634,6 +175132,7 @@ self: {
        homepage = "http://functionalley.eu/Squeeze/squeeze.html";
        description = "A file-packing application";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sr-extra" = callPackage
@@ -179723,8 +180222,8 @@ self: {
      }:
      mkDerivation {
        pname = "swagger2";
-       version = "1.0";
-       sha256 = "04ccac8d97cac4a4673151a751a813de7fd6f948b0f98f9b23f447016c19021d";
+       version = "1.1.1";
+       sha256 = "bb441e8c160db9fe91ff62cc14b36ecfce683cd033a61aef7700acf763a526aa";
        libraryHaskellDepends = [
          aeson base containers hashable http-media lens mtl network
          scientific text time unordered-containers
@@ -180141,6 +180640,7 @@ 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
@@ -185038,6 +185538,7 @@ 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
@@ -185543,8 +186044,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "0.31";
-       sha256 = "b78d39424245b1493e2b693971d960123b09aca45e0c389be588eb473672704a";
+       version = "0.32";
+       sha256 = "a01b758d99f95fa012c8266bb3c083a77c022a95fc86bdfcde493888e4bea3c5";
        libraryHaskellDepends = [
          base base-compat containers data-default haskell-src-exts lens mtl
          mtl-unleashed set-extra syb template-haskell th-desugar th-orphans
@@ -185585,6 +186086,7 @@ 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
@@ -189671,6 +190173,7 @@ 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
@@ -189781,6 +190284,7 @@ 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
@@ -189797,6 +190301,7 @@ 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
@@ -191206,8 +191711,8 @@ self: {
      }:
      mkDerivation {
        pname = "unbreak";
-       version = "0.3.0";
-       sha256 = "63de23dd0adf5183498b6ba37efe5bc867d935b5a56b839d4ae553d8918ec91c";
+       version = "0.3.1";
+       sha256 = "463b65c79e7d4edac74d23bf10d61956ee6f30ebe1c373624d1583dfcb841286";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -191215,7 +191720,8 @@ self: {
          cryptonite memory process text unix
        ];
        executableHaskellDepends = [ base bytestring cmdargs ];
-       description = "Secure editing of remote documents with unstable connection";
+       homepage = "https://e.xtendo.org/scs/unbreak";
+       description = "Secure and resilient remote file storage utility";
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
@@ -191236,8 +191742,8 @@ self: {
      }:
      mkDerivation {
        pname = "unfoldable";
-       version = "0.8.2";
-       sha256 = "51e42a450f794ffcd28517bb4f5e519020a5975b316bfc3b388a8a28aa73d264";
+       version = "0.8.3";
+       sha256 = "62926d1f12db96468ca2c9c7e55cb63201c62d97c7486ef30a62a910893e2ddd";
        libraryHaskellDepends = [
          base ghc-prim QuickCheck random transformers
        ];
@@ -191848,6 +192354,8 @@ self: {
        pname = "unix";
        version = "2.7.1.0";
        sha256 = "6bd4e6013855541535a1317197aa6a11e7f24ba0e4dd64a8b7fcfd40b5a4e45c";
+       revision = "1";
+       editedCabalFile = "ee3232af128d50f0b51e8ee786cd928399371d13942581da1bc73232d8f6d802";
        libraryHaskellDepends = [ base bytestring time ];
        homepage = "https://github.com/haskell/unix";
        description = "POSIX functionality";
@@ -192253,14 +192761,13 @@ self: {
      }:
      mkDerivation {
        pname = "uom-plugin";
-       version = "0.1.1.0";
-       sha256 = "3d019d48c8172bf17acb5d5562a5394731c301df655a24f521f60e49ebab2554";
+       version = "0.2.0.0";
+       sha256 = "c9eb1b27d940f7ce7ff2850f5f9c5bc2a5b23d472c8bcfaca0aec6a8b1c72daf";
        libraryHaskellDepends = [
          base containers deepseq ghc ghc-tcplugins-extra template-haskell
          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;
@@ -195128,6 +195635,7 @@ 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
@@ -195289,8 +195797,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "visibility";
-       version = "0.1.0.0";
-       sha256 = "bdac4ba5246e3a1e8759d3c0d886f0671e3baf962479e67b44888412a9dd7784";
+       version = "0.1.0.1";
+       sha256 = "5218ceb6f0e6e396a67721e88f00392f9348f59ade898f1a07bee08f920bc434";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/LukaHorvat/visibility";
        description = "Simple computation of visibility polygons";
@@ -195537,6 +196045,7 @@ 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
@@ -195819,6 +196328,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai_3_2_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring
+     , bytestring-builder, hspec, http-types, network, text
+     , transformers, vault
+     }:
+     mkDerivation {
+       pname = "wai";
+       version = "3.2.0";
+       sha256 = "7f8e6903de20d64251657fdaba77c798249b6ddbe358cdb5eb277c1193467c9a";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring bytestring-builder http-types network
+         text transformers vault
+       ];
+       testHaskellDepends = [ base blaze-builder bytestring hspec ];
+       homepage = "https://github.com/yesodweb/wai";
+       description = "Web Application Interface";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-accept-language" = callPackage
     ({ mkDerivation, base, bytestring, file-embed, http-types, text
      , wai, wai-app-static, wai-extra, warp, word8
@@ -195851,8 +196380,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-app-file-cgi";
-       version = "3.0.9";
-       sha256 = "947a818500ef5b1f2c1868d15a6a1054a3abb9e83ddfcacfb0d66d4e78ea308d";
+       version = "3.1.0";
+       sha256 = "fef1e40473f5d2a3355f8160c88f1626c0c90ca04e0bc5d57a06747384ab5a92";
        libraryHaskellDepends = [
          array attoparsec attoparsec-conduit base blaze-builder blaze-html
          bytestring case-insensitive conduit conduit-extra containers
@@ -195865,6 +196394,7 @@ 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;
@@ -196201,7 +196731,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-app-static" = callPackage
+  "wai-app-static_3_1_4" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, cryptohash
      , cryptohash-conduit, directory, file-embed, filepath, hspec
@@ -196235,6 +196765,43 @@ self: {
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-app-static" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, cryptohash
+     , cryptohash-conduit, directory, file-embed, filepath, hspec
+     , http-date, http-types, mime-types, network, old-locale
+     , optparse-applicative, template-haskell, temporary, text, time
+     , transformers, unix-compat, unordered-containers, wai, wai-extra
+     , warp, zlib
+     }:
+     mkDerivation {
+       pname = "wai-app-static";
+       version = "3.1.4.1";
+       sha256 = "7280e15192be2d80b2505da152ea828c448e1466401fc4a02e87052ce3515bd4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-builder blaze-html blaze-markup
+         byteable bytestring containers cryptohash cryptohash-conduit
+         directory file-embed filepath http-date http-types mime-types
+         old-locale optparse-applicative template-haskell text time
+         transformers unix-compat unordered-containers wai wai-extra warp
+         zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory mime-types text
+       ];
+       testHaskellDepends = [
+         base bytestring filepath hspec http-date http-types mime-types
+         network old-locale temporary text time transformers unix-compat wai
+         wai-extra zlib
+       ];
+       homepage = "http://www.yesodweb.com/book/web-application-interface";
+       description = "WAI application for static serving";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-conduit_3_0_0_1" = callPackage
@@ -196254,7 +196821,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-conduit" = callPackage
+  "wai-conduit_3_0_0_2" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , http-types, transformers, wai
      }:
@@ -196268,6 +196835,23 @@ self: {
        homepage = "https://github.com/yesodweb/wai";
        description = "conduit wrappers for WAI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-conduit" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, conduit
+     , http-types, transformers, wai
+     }:
+     mkDerivation {
+       pname = "wai-conduit";
+       version = "3.0.0.3";
+       sha256 = "e49720a7c7b58e78a56991e42fa550a722936af274dc27755a735781258f7aff";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring conduit http-types transformers wai
+       ];
+       homepage = "https://github.com/yesodweb/wai";
+       description = "conduit wrappers for WAI";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-cors_0_2_3" = callPackage
@@ -196852,7 +197436,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-extra" = callPackage
+  "wai-extra_3_0_13" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -196879,6 +197463,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.13.1";
+       sha256 = "37540b32387929716922be563238fe29c4db2c820356cc9b27d9ab1554300756";
+       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
@@ -196887,8 +197501,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-frontend-monadcgi";
-       version = "3.0.0.1";
-       sha256 = "526feb9b37c9f06a4c433f716c3b691a06ab90c726930768a33b45c7dc9c143c";
+       version = "3.0.0.2";
+       sha256 = "c3e01b29a1a1c2a0934adc7e0c208454be525b2da1303a8b86391aa70c8ddc91";
        libraryHaskellDepends = [
          base bytestring case-insensitive cgi containers http-types
          transformers wai
@@ -196938,8 +197552,8 @@ self: {
     ({ mkDerivation, base, bytestring, fcgi, wai, wai-extra }:
      mkDerivation {
        pname = "wai-handler-fastcgi";
-       version = "3.0.0.1";
-       sha256 = "3bf0b346b5facc626a8cd1c46abc1a10242575bc91f56943eb720401d74e9592";
+       version = "3.0.0.2";
+       sha256 = "b555badd0fcae6519eb6f52dc0579d6a6ec4964aadf8b725bab8501cf7f473df";
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        librarySystemDepends = [ fcgi ];
        homepage = "http://www.yesodweb.com/book/web-application-interface";
@@ -196965,7 +197579,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-handler-launch" = callPackage
+  "wai-handler-launch_3_0_0_4" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, http-types
      , process, streaming-commons, transformers, wai, warp
      }:
@@ -196979,6 +197593,23 @@ self: {
        ];
        description = "Launch a web app in the default browser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-handler-launch" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, http-types
+     , process, streaming-commons, transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "wai-handler-launch";
+       version = "3.0.0.5";
+       sha256 = "768eee5028d2ebf8684fb01ee064f8034c9c5c0f7b4e7a4a503d0b7f08df1227";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring http-types process streaming-commons
+         transformers wai warp
+       ];
+       description = "Launch a web app in the default browser";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-handler-scgi" = callPackage
@@ -197017,8 +197648,8 @@ self: {
     ({ mkDerivation, base, QtWebKit, wai, warp }:
      mkDerivation {
        pname = "wai-handler-webkit";
-       version = "3.0.0.2";
-       sha256 = "9afd5ac9b886b3c2640c57f2d01577785da7a77ba45314f16c24e66c6f89ed78";
+       version = "3.0.0.3";
+       sha256 = "08609d9bd78fafc130fc231b532a64b8292fb1700ab2ba3ee3cc96d45e4f5983";
        libraryHaskellDepends = [ base wai warp ];
        libraryPkgconfigDepends = [ QtWebKit ];
        homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit";
@@ -197914,16 +198545,16 @@ self: {
      , 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, wai, wai-app-static, wai-extra
+     , template-haskell, text, vault, wai, wai-app-static, wai-extra
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.9.3";
-       sha256 = "67e2db99c012e31210b50170e29041dfac3c6bb190d6a1bdfc1ed4c06b428915";
+       version = "0.9.4";
+       sha256 = "b8c28e1209efd4a45ec90c027cd50a3a415cb6431b3490ce68c79a3bcbde007c";
        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 wai
+         monad-loops mtl path-pieces random template-haskell text vault wai
          wai-app-static wai-extra
        ];
        testHaskellDepends = [
@@ -198317,7 +198948,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-websockets" = callPackage
+  "wai-websockets_3_0_0_7" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
      , file-embed, http-types, network, text, transformers, wai
      , wai-app-static, warp, websockets
@@ -198340,6 +198971,32 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Provide a bridge between WAI and the websockets package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-websockets" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
+     , file-embed, http-types, network, text, transformers, wai
+     , wai-app-static, warp, websockets
+     }:
+     mkDerivation {
+       pname = "wai-websockets";
+       version = "3.0.0.8";
+       sha256 = "353c324bbc26920d8f3adddc415f0d2a7cb01b89230dc95707fb19a74bf8a842";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring case-insensitive http-types network
+         transformers wai websockets
+       ];
+       executableHaskellDepends = [
+         base blaze-builder bytestring case-insensitive file-embed
+         http-types network text transformers wai wai-app-static warp
+         websockets
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provide a bridge between WAI and the websockets package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wait-handle" = callPackage
@@ -199129,6 +199786,39 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "warp_3_2_0" = 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.0";
+       sha256 = "a0e3d41261d6842e1e58371a2013f1e5ea942fea78b51fafd6cb14c62b874355";
+       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
+       ];
+       jailbreak = true;
+       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
     ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
      mkDerivation {
@@ -199468,6 +200158,25 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "warp-tls";
+       version = "3.2.0";
+       sha256 = "1751b8fc4e24c909ed94db39a2aa20048e694ddf6e68c4acbdfe8924773f3dd8";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "warp-tls-uid" = callPackage
     ({ mkDerivation, base, bytestring, certificate, conduit
      , crypto-random, http-types, network, network-conduit, pem, tls
@@ -199932,7 +200641,7 @@ self: {
      }) {};
 
   "webapp" = callPackage
-    ({ mkDerivation, alex, attoparsec, base, base16-bytestring, bcrypt
+    ({ 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
@@ -199941,12 +200650,10 @@ self: {
      }:
      mkDerivation {
        pname = "webapp";
-       version = "0.1.0";
-       sha256 = "e7c3f6ebbd9f254f8d9323e240a6029bafcbb0c2e86e4d7a8f45e42255704a3f";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.2";
+       sha256 = "90d46c20134075352f6626509d01bd51d6862ef6c4509e524f299205e1063d0c";
        libraryHaskellDepends = [
-         attoparsec base base16-bytestring bcrypt blaze-builder bytestring
+         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
@@ -199954,10 +200661,6 @@ self: {
          zlib
        ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [
-         base bytestring http-types optparse-applicative scotty text
-         transformers
-       ];
        jailbreak = true;
        homepage = "https://github.com/fhsjaagshs/webapp";
        description = "Haskell web scaffolding using Scotty, WAI, and Warp";
@@ -201511,6 +202214,7 @@ 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
@@ -203126,7 +203830,7 @@ self: {
        testHaskellDepends = [ base unix ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
@@ -207844,7 +208548,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-bin" = callPackage
+  "yesod-bin_1_4_16_1" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, Cabal, conduit, conduit-extra
      , containers, data-default-class, deepseq, directory, file-embed
@@ -207875,6 +208579,40 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-bin" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, Cabal, conduit, conduit-extra
+     , containers, data-default-class, deepseq, directory, file-embed
+     , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit
+     , http-reverse-proxy, http-types, lifted-base, network
+     , optparse-applicative, parsec, process, project-template
+     , resourcet, shakespeare, split, streaming-commons, tar
+     , template-haskell, text, time, transformers, transformers-compat
+     , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls
+     , yaml, zlib
+     }:
+     mkDerivation {
+       pname = "yesod-bin";
+       version = "1.4.17";
+       sha256 = "bc5721479fb3aaa40153c092b899ccd99b18449a48154eb3a1bc5d8b5518dbb7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder bytestring
+         Cabal conduit conduit-extra containers data-default-class deepseq
+         directory file-embed filepath fsnotify ghc ghc-paths http-client
+         http-conduit http-reverse-proxy http-types lifted-base network
+         optparse-applicative parsec process project-template resourcet
+         shakespeare split streaming-commons tar template-haskell text time
+         transformers transformers-compat unix-compat unordered-containers
+         wai wai-extra warp warp-tls yaml zlib
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "The yesod helper executable";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -209341,7 +210079,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-mangopay" = callPackage
+  "yesod-mangopay_1_11_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
      , containers, country-codes, data-default, directory, fast-logger
      , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay
@@ -209374,6 +210112,42 @@ 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-mangopay" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
+     , containers, country-codes, data-default, directory, fast-logger
+     , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay
+     , monad-control, monad-logger, persistent, persistent-postgresql
+     , persistent-template, resourcet, shakespeare, template-haskell
+     , text, time, wai, wai-extra, wai-logger, warp, yaml, yesod
+     , yesod-auth, yesod-core, yesod-form, yesod-persistent
+     , yesod-static
+     }:
+     mkDerivation {
+       pname = "yesod-mangopay";
+       version = "1.12";
+       sha256 = "a53c0d1e8e1654a4c251b1830264f581a1ed668fffb303c05993e10e20932754";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers http-conduit http-types lifted-base mangopay
+         persistent-template text time yesod yesod-core
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring conduit conduit-extra containers
+         country-codes data-default directory fast-logger hamlet hjsmin
+         http-conduit lifted-base mangopay monad-control monad-logger
+         persistent persistent-postgresql persistent-template resourcet
+         shakespeare template-haskell text time wai wai-extra wai-logger
+         warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent
+         yesod-static
+       ];
+       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
@@ -211764,7 +212538,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "zlib" = callPackage
+  "zlib_0_5_4_2" = callPackage
     ({ mkDerivation, base, bytestring, zlib }:
      mkDerivation {
        pname = "zlib";
@@ -211774,9 +212548,10 @@ self: {
        librarySystemDepends = [ zlib ];
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
-  "zlib_0_6_1_1" = callPackage
+  "zlib" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck, zlib
      }:
@@ -211784,17 +212559,17 @@ self: {
        pname = "zlib";
        version = "0.6.1.1";
        sha256 = "c5f5b4285473657a7997d74f7642f3e7bda40f92c3c5d49471a899e27a4ba735";
-       revision = "1";
-       editedCabalFile = "e94fcf5a5822e569221c7897bdc15d9ddb31c0d844df0448cd388472d644b212";
+       revision = "3";
+       editedCabalFile = "b5fff98d06289c9c16ab78d994f88f18345ccf7d0ef3e5334bb417d763b07046";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ zlib ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        jailbreak = true;
+       doCheck = false;
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "zlib-bindings" = callPackage

From 9955602aa0c29d9ac7e02b64a2bef01528408b6f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 31 Dec 2015 13:16:41 +0100
Subject: [PATCH 198/249] configuration-hackage2nix.yaml: update list of broken
 packages

---
 .../configuration-hackage2nix.yaml            | 90 ++++++++++++++++++-
 1 file changed, 87 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 713f5531eb1..c75d0916b23 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -203,8 +203,10 @@ dont-distribute-packages:
   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 ]
@@ -303,6 +305,7 @@ dont-distribute-packages:
   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 ]
@@ -333,6 +336,7 @@ dont-distribute-packages:
   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 ]
@@ -351,6 +355,7 @@ dont-distribute-packages:
   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 ]
@@ -383,6 +388,7 @@ dont-distribute-packages:
   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 ]
@@ -454,6 +460,7 @@ dont-distribute-packages:
   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 ]
   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 ]
@@ -480,6 +487,7 @@ dont-distribute-packages:
   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 ]
   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 ]
@@ -571,6 +579,7 @@ dont-distribute-packages:
   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 ]
@@ -612,6 +621,7 @@ dont-distribute-packages:
   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 ]
@@ -739,6 +749,7 @@ dont-distribute-packages:
   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 ]
@@ -882,8 +893,14 @@ dont-distribute-packages:
   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 ]
@@ -920,6 +937,8 @@ dont-distribute-packages:
   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 ]
@@ -936,6 +955,7 @@ dont-distribute-packages:
   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 ]
@@ -975,7 +995,7 @@ dont-distribute-packages:
   elerea-examples:                              [ x86_64-darwin ]
   elerea-sdl:                                   [ x86_64-darwin ]
   elm-init:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  emacs-keys:                                   [ 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 ]
@@ -1101,6 +1121,7 @@ dont-distribute-packages:
   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 ]
@@ -1135,6 +1156,7 @@ dont-distribute-packages:
   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 ]
@@ -1166,6 +1188,7 @@ dont-distribute-packages:
   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 ]
@@ -1280,7 +1303,9 @@ dont-distribute-packages:
   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 ]
@@ -1328,6 +1353,7 @@ dont-distribute-packages:
   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 ]
@@ -1387,6 +1413,7 @@ dont-distribute-packages:
   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 ]
@@ -1408,6 +1435,7 @@ dont-distribute-packages:
   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 ]
@@ -1487,8 +1515,10 @@ dont-distribute-packages:
   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 ]
@@ -1529,12 +1559,15 @@ dont-distribute-packages:
   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 ]
   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 ]
@@ -1747,6 +1780,7 @@ dont-distribute-packages:
   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 ]
@@ -1770,6 +1804,7 @@ dont-distribute-packages:
   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 ]
@@ -1824,6 +1859,7 @@ dont-distribute-packages:
   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 ]
@@ -1835,6 +1871,7 @@ dont-distribute-packages:
   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 ]
@@ -1883,6 +1920,7 @@ dont-distribute-packages:
   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 ]
@@ -2057,6 +2095,7 @@ dont-distribute-packages:
   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 ]
@@ -2086,6 +2125,7 @@ dont-distribute-packages:
   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 ]
@@ -2141,6 +2181,14 @@ dont-distribute-packages:
   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 ]
@@ -2153,6 +2201,7 @@ dont-distribute-packages:
   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 ]
@@ -2277,6 +2326,7 @@ dont-distribute-packages:
   lmdb:                                         [ 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 ]
@@ -2340,6 +2390,7 @@ dont-distribute-packages:
   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 ]
@@ -2386,6 +2437,7 @@ dont-distribute-packages:
   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 ]
@@ -2470,6 +2522,7 @@ dont-distribute-packages:
   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 ]
@@ -2645,6 +2698,7 @@ dont-distribute-packages:
   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 ]
@@ -2683,6 +2737,7 @@ dont-distribute-packages:
   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 ]
@@ -2731,11 +2786,13 @@ dont-distribute-packages:
   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 ]
@@ -2761,6 +2818,7 @@ dont-distribute-packages:
   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 ]
@@ -2772,6 +2830,7 @@ dont-distribute-packages:
   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 ]
@@ -2781,12 +2840,14 @@ dont-distribute-packages:
   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 ]
@@ -2847,6 +2908,7 @@ dont-distribute-packages:
   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 ]
@@ -2911,8 +2973,10 @@ dont-distribute-packages:
   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 ]
@@ -2921,9 +2985,13 @@ dont-distribute-packages:
   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-scene:                           [ 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 ]
@@ -3061,6 +3129,7 @@ dont-distribute-packages:
   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 ]
@@ -3121,6 +3190,7 @@ dont-distribute-packages:
   SessionLogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sessions:                                     [ 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 ]
@@ -3200,6 +3270,7 @@ dont-distribute-packages:
   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 ]
@@ -3211,6 +3282,7 @@ dont-distribute-packages:
   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 ]
@@ -3237,6 +3309,7 @@ dont-distribute-packages:
   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 ]
@@ -3271,6 +3344,7 @@ dont-distribute-packages:
   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 ]
@@ -3333,6 +3407,7 @@ dont-distribute-packages:
   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 ]
@@ -3410,6 +3485,8 @@ dont-distribute-packages:
   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 ]
@@ -3496,8 +3573,11 @@ dont-distribute-packages:
   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 ]
@@ -3602,6 +3682,7 @@ dont-distribute-packages:
   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 ]
@@ -3616,6 +3697,7 @@ dont-distribute-packages:
   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 ]
@@ -3685,6 +3767,7 @@ dont-distribute-packages:
   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 ]
@@ -3727,7 +3810,7 @@ dont-distribute-packages:
   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:                                    [ x86_64-darwin ]
+  xkbcommon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkcd:                                         [ 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 ]
@@ -3796,6 +3879,7 @@ dont-distribute-packages:
   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 ]

From 5f47b751b3b8baa2aadd1dd54d855d1f79041451 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 31 Dec 2015 12:27:26 +0100
Subject: [PATCH 199/249] haskell-semigroups: fix build with GHC 7.8.x and
 7.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 4716766226a..f89ffc4c7c1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -95,4 +95,7 @@ self: super: {
   # Needs void on pre 7.10.x compilers.
   conduit = addBuildDepend super.conduit self.void;
 
+  # Needs nats on pre 7.10.x compilers.
+  semigroups = addBuildDepend super.semigroups self.nats;
+
 }
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 99bac5ae5a0..a17e85d2343 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -137,4 +137,7 @@ self: super: {
   # Needs void on pre 7.10.x compilers.
   conduit = addBuildDepend super.conduit self.void;
 
+  # Needs nats on pre 7.10.x compilers.
+  semigroups = addBuildDepend super.semigroups self.nats;
+
 }

From d464c85fdf08c1c043904c46f884cb9c9d94257c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 31 Dec 2015 18:26:26 +0100
Subject: [PATCH 200/249] haskell-modules: remove obsolete re-build triggers

---
 .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 +----
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 00e12b01564..0c2685eee83 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -77,7 +77,7 @@ self: super: {
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
-  bytestring-builder = dontHaddock (triggerRebuild super.bytestring-builder 1);
+  bytestring-builder = dontHaddock super.bytestring-builder;
 
   # We have time 1.5
   aeson = disableCabalFlag super.aeson "old-locale";
@@ -208,7 +208,4 @@ self: super: {
   # https://github.com/DanielG/cabal-helper/issues/10
   cabal-helper = dontCheck super.cabal-helper;
 
-  # Re-build this package to fix broken binaries on Hydra.
-  math-functions = triggerRebuild super.math-functions 2;
-
 }
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 a17e85d2343..81c060a4c3e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -52,7 +52,7 @@ self: super: {
   haddock-api = super.haddock-api_2_15_0_2;
 
   # This is part of bytestring in our compiler.
-  bytestring-builder = triggerRebuild (dontHaddock super.bytestring-builder) 1;
+  bytestring-builder = dontHaddock super.bytestring-builder;
 
   # Won't compile against mtl 2.1.x.
   imports = super.imports.override { mtl = self.mtl_2_2_1; };

From 09956eab482e57face13e357fc8760fc82013fc0 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 28 Dec 2015 11:46:52 -0500
Subject: [PATCH 201/249] pointfree: now builds with haskell-src-exts-1.17.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 642757e66da..3e5b205893c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -941,8 +941,4 @@ 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; };
-
-  # The package doesn't yet compile with new HSE: https://github.com/bmillwood/pointfree/pull/13
-  pointfree = super.pointfree.override { haskell-src-exts = self.haskell-src-exts_1_16_0_1; };
-
 }

From 365ed9e37ff3e978ff872e781a5c8cda399bc361 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 30 Dec 2015 19:16:19 +0100
Subject: [PATCH 202/249] haskell-binary: prefer version 0.7.x over 0.8.x for
 GHC 7.0.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix    | 2 +-
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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 3173189c430..cc5d03f05f5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -35,7 +35,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_7_6_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-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c75d0916b23..c024d705dff 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -35,6 +35,7 @@ default-package-overrides:
 
 extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 6.12.3
+  - binary > 0.7 && < 0.8               # binary 0.8.x is the latest, but it's largely unsupported so far
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.20.*                     # required for cabal-install et al on old GHC versions
   - containers < 0.5                    # required to build alex with GHC 6.12.3

From 581e9f0b32d8aef9cc554c71900abda3b71d21e1 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 1 Jan 2016 03:57:55 +0000
Subject: [PATCH 203/249] tibia: 10.81 -> 10.90

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

diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index dc4a8ac3692..c1f533276d6 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 assert stdenv.isi686;
 stdenv.mkDerivation {
-  name = "tibia-10.81";
+  name = "tibia-10.90";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1081.tgz;
-    sha256 = "19p102fg31slrwg09q8dzhvz48qp8yrkpq69djn0jb9hrs7k7fpr";
+    url = http://static.tibia.com/download/tibia1090.tgz;
+    sha256 = "11mkh2dynmbpay51yfaxm5dmcys3rnpk579s9ypfkhblsrchbkhx";
   };
 
   shell = stdenv.shell;

From ab3277e68a2f256f29905d0851090e39909c590c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:08:00 +0300
Subject: [PATCH 204/249] nginxUnstable: 1.9.7 -> 1.9.9

---
 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 a80632cd1c9..ae8245d5714 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.7";
+  version = "1.9.9";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "1ma82wfg9akghx1cnzfmz4nplf0zjv1rk49x4v3f3z7xmwbx4jvr";
+    sha256 = "0wwd0q00pnkw4gjn3izjr63sndp7piyc5k5mbjm369f824mvnrny";
   };
 
 in

From 119de110a3c5db9d4a36eb00ac2f3395d15f68f0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:12:18 +0300
Subject: [PATCH 205/249] glusterfs: 3.7.3 -> 3.7.6

---
 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 062f27e286f..2563c4428a4 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.3";
+    version="3.7.6";
     name="${baseName}-${version}";
-    hash="0xdzxprsi0gybv6jdp0ycfpsxzijwfrm3217fk3fnixcs92frshv";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.3/glusterfs-3.7.3.tar.gz";
-    sha256="0xdzxprsi0gybv6jdp0ycfpsxzijwfrm3217fk3fnixcs92frshv";
+    hash="01fg132k4gvvx5p0bi88956yzd77pcnw3iyi88vrsncmpnvg10xv";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.6/glusterfs-3.7.6.tar.gz";
+    sha256="01fg132k4gvvx5p0bi88956yzd77pcnw3iyi88vrsncmpnvg10xv";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline

From 247c419427f493efe3d58f9a61e9f9e020b168d9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:14:13 +0300
Subject: [PATCH 206/249] ipmiutil: 2.9.6 -> 2.9.8

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

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index 4fd3cb0f4a4..e0f5a5e68a8 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "2.9.6";
+  version = "2.9.8";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "068mfxaay91m5qqs0lb4jwvsbxb665n2hgcp0g1k62zvicyiyk48";
+    sha256 = "066xfmzkrjbazddik2kx8k5adppkd3hm3pna6x8vri18sg7421w6";
   };
 
   buildInputs = [ openssl ];

From 51f8932c8ec6bfc9bfd036ccffb94544f427a76d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:15:04 +0100
Subject: [PATCH 207/249] pari (PARI/GP): 2.7.4 -> 2.7.5

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

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 5719ccb6909..be273bca0e2 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gmp, readline }:
 
 stdenv.mkDerivation rec {
-  version = "2.7.4";
+  version = "2.7.5";
   name = "pari-${version}";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
-    sha256 = "0k1qqagfl6zn7gvwmsqffj6g9yrzqvszwh2mblhmxpjlw1pigfh8";
+    sha256 = "0c8l83a0gjq73r9hndsrzkypwxvnnm4pxkkzbg6jm95m80nzwh11";
   };
 
   buildInputs = [gmp readline];

From a2ddd899327d945cfc1601c61be5fb5438de7397 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:19:41 +0100
Subject: [PATCH 208/249] baresip: 0.4.15 -> 0.4.16

---
 .../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 2b60b3a7a46..a2f9ebc8317 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.15";
+  version = "0.4.16";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "13712li6y3ikwzl17j46w25xyv3z98yqj7zpr3jifyvbna9ls5r3";
+    sha256 = "04a9d7il39b1kfqh7al0g0q8v32hphgjx8gkixrlp5qsqlzvk876";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good

From a102de361b7c9b8bc841898b5eee09f633a24b77 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:21:28 +0100
Subject: [PATCH 209/249] fpc: 2.6.4 -> 3.0.0

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

diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index b34b5e8a446..2f4cb10bd4d 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -3,12 +3,12 @@
 let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
 
 stdenv.mkDerivation rec {
-  version = "2.6.4";
+  version = "3.0.0";
   name = "fpc-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
-    sha256 = "1akdlp4n9ai1gnn4yq236i5rx03rs5sjfgk60myb7nb9lk7kp74d";
+    sha256 = "1v40bjp0kvsi8y0mndqvvhnsqjfssl2w6wpfww51j4rxblfkp4fm";
   };
 
   buildInputs = [ startFPC gawk ];

From a2f76a89bb1e961fce68897aac38be7d3cd5009c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:22:27 +0300
Subject: [PATCH 210/249] gajim: 0.16.4 -> 0.16.5

---
 .../networking/instant-messengers/gajim/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index b2325e87e0d..7312b45828c 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -20,11 +20,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gajim-${version}";
-  version = "0.16.4";
+  version = "0.16.5";
 
   src = fetchurl {
     url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2";
-    sha256 = "0zyfs7q1qg8iqszr8l1gb18gqla6zrrfsgpmbxblpi9maqxas5i1";
+    sha256 = "14fhcqnkqygh91132dnf1idayj4r3iqbwb44sd3mxv20n6ribh55";
   };
 
   patches = [

From df9efd4f1bba67f690098ab5468994d64b653f68 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:27:04 +0100
Subject: [PATCH 211/249] sysdig: 0.5.1 -> 0.6.0

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 5c15ba1a9ce..62e2a48adc9 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.5.1";
+    version = "0.6.0";
     name="${baseName}-${version}";
     url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "08wnk0593ljdq466hk0npsjc0gbm37nsjm1x2ilsf58n1xl8dmfs";
+    sha256 = "0729mjs9gpd7kb495q80zlp23zczm8ka3xcq4571c0sm732sa3g3";
   };
   buildInputs = [
     cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl

From f1eeed7a29fef790f4ff53fb972779a3b3634c46 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:28:50 +0100
Subject: [PATCH 212/249] ised: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix
index 7d0963c2bb0..64a71846c4b 100644
--- a/pkgs/tools/misc/ised/default.nix
+++ b/pkgs/tools/misc/ised/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "ised-${version}";
-  version = "2.6.0";
+  version = "2.7.0";
   src = fetchurl {
     url = "mirror://sourceforge/project/ised/${name}.tar.bz2";
-    sha256 = "0rf9brqkrad8f3czpfc1bxq9ybv3nxci9276wdxas033c82cqkjs";
+    sha256 = "08wzgmyvlhfaxa0m2b6pw2mn03k1a87pzbzxm0x9z84gci9w2g4h";
   };
 
   meta = {

From 5db11e97e7f091535c1f2ed508fd84432b3d2517 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:30:16 +0100
Subject: [PATCH 213/249] conspy: 1.10 -> 1.13

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

diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix
index 78d403a3afc..3c209c6253d 100644
--- a/pkgs/os-specific/linux/conspy/default.nix
+++ b/pkgs/os-specific/linux/conspy/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="conspy";
-    version="1.10";
+    version="1.13";
     name="${baseName}-${version}";
-    hash="1vnph4xa1qp4sr52jc9zldmbdpkr6z5j7hk2vgyhfn7m1vc5g0qw";
-    url="mirror://sourceforge/project/conspy/conspy-1.10-1/conspy-1.10.tar.gz";
-    sha256="1vnph4xa1qp4sr52jc9zldmbdpkr6z5j7hk2vgyhfn7m1vc5g0qw";
+    hash="059sag372n09y1ddb1i0sx013kzkbr8a9pjqk03kyijn8h1z5hl2";
+    url="mirror://sourceforge/project/conspy/conspy-1.13-1/conspy-1.13.tar.gz";
+    sha256="059sag372n09y1ddb1i0sx013kzkbr8a9pjqk03kyijn8h1z5hl2";
   };
   buildInputs = [
     autoconf automake ncurses

From 0f9a3610649c5cdb4136da6bdef9864459f015ec Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:31:07 +0100
Subject: [PATCH 214/249] firejail: 0.9.26 -> 0.9.36

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

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index af08d404b82..4d0a066d2c3 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.26";
+    version="0.9.36";
     name="${baseName}-${version}";
-    hash="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq";
-    url="mirror://sourceforge/firejail/firejail/firejail-0.9.26-rc2.tar.bz2";
-    sha256="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq";
+    hash="1mxgkfn2hbacarcp51qwgi7jxxzv69wb4lz78m71zysy3kkqn23k";
+    url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.36-rc1.tar.bz2";
+    sha256="1mxgkfn2hbacarcp51qwgi7jxxzv69wb4lz78m71zysy3kkqn23k";
   };
   buildInputs = [
   ];

From 9201598227d23aae66bb43789fe8a1596ad8e8bb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:31:51 +0300
Subject: [PATCH 215/249] compiz: 0.9.12.1 -> 0.9.12.2

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

diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index 977409d0ef1..39eb0586f7b 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -15,11 +15,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="compiz";
-    version="0.9.12.1";
+    version="0.9.12.2";
     name="${baseName}-${version}";
-    hash="0kl5im3zq0rjlxbgz5cyk38qzssahrljc67z1n16pjc1qmr6m7cb";
-    url="https://launchpad.net/compiz/0.9.12/0.9.12.1/+download/compiz-0.9.12.1.tar.bz2";
-    sha256="0kl5im3zq0rjlxbgz5cyk38qzssahrljc67z1n16pjc1qmr6m7cb";
+    hash="107cv8jm7nl0lbkj2y7878lmv1pd6blra68fg10cgb7xdngaq5w9";
+    url="https://launchpad.net/compiz/0.9.12/0.9.12.2/+download/compiz-0.9.12.2.tar.bz2";
+    sha256="107cv8jm7nl0lbkj2y7878lmv1pd6blra68fg10cgb7xdngaq5w9";
   };
   buildInputs = [cmake pkgconfig
     libXrender renderproto gtk libwnck pango cairo

From 5446554002d7c6fb4e5473357a714a2e8579037f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:32:50 +0100
Subject: [PATCH 216/249] lazarus: 1.2.6 -> 1.4.4

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

diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 06c4f6bbe2b..c579ba5612a 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.2.6";
+    version = "1.4.4";
     versionSuffix = "-0";
     url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz";
-    sha256 = "1sjyc2l46hyd5ic5hr6vscy4qr9kazyhiyddy7bfs9vgf54fdiy0";
+    sha256 = "12w3xwqif96a65b0ygi4riqrp0122wsp0ykb1j7k8hjfyk91x91a";
     name = "lazarus-${version}";
   };
   buildInputs = [

From f638adb107ac82c048d400e23cc3b52b9bd0aac8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:37:20 +0300
Subject: [PATCH 217/249] apache-jena: 3.0.0 -> 3.0.1

---
 pkgs/servers/nosql/apache-jena/binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index 9b4e19b3270..22c9fc06972 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="apache-jena";
-    version = "3.0.0";
+    version = "3.0.1";
     name="${baseName}-${version}";
     url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
-    sha256 = "1pqg27m295v7v456pidb0fq5120blkc466pdzksqxqcjrwivq4kb";
+    sha256 = "0qim7jnq9gzwpfw6a41s3ngz2sjmxzlaiqjf0lrzycxy9mig2xc1";
   };
   buildInputs = [
     makeWrapper

From 8431b84d9a11afec5ae16fc87c16a8a56f73a68c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:38:46 +0100
Subject: [PATCH 218/249] tcpflow: 1.4.4 -> 1.4.5

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

diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix
index 9c5f6f44ae0..935251ba057 100644
--- a/pkgs/tools/networking/tcpflow/default.nix
+++ b/pkgs/tools/networking/tcpflow/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="tcpflow";
-    version="1.4.4";
+    version="1.4.5";
     name="${baseName}-${version}";
-    hash="0k2lxlvn1x8avkrijc22scrj4p2g5agfskbgfc2d0w9zgrg61xdn";
-    url="http://www.digitalcorpora.org/downloads/tcpflow/tcpflow-1.4.4.tar.gz";
-    sha256="0k2lxlvn1x8avkrijc22scrj4p2g5agfskbgfc2d0w9zgrg61xdn";
+    hash="0whcyykq710s84jyiaqp6rsr19prd0pr1g1pg74mif0ig51yv7zk";
+    url="http://www.digitalcorpora.org/downloads/tcpflow/tcpflow-1.4.5.tar.gz";
+    sha256="0whcyykq710s84jyiaqp6rsr19prd0pr1g1pg74mif0ig51yv7zk";
   };
   buildInputs = [
     openssl zlib libpcap boost cairo

From 761340140c8b4d41c746c32fea0ea50808f03f8e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:40:39 +0100
Subject: [PATCH 219/249] luarocks: 2.2.2 -> 2.3.0

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

diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 2296bc3a989..017b5fdc08d 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="luarocks";
-    version="2.2.2";
+    version="2.3.0";
     name="${baseName}-${version}";
-    hash="08phl5syc7q6bh0rs9558s74g8xq05hgn7gbia4hvwvkd1q2f12g";
-    url="http://luarocks.org/releases/luarocks-2.2.2.tar.gz";
-    sha256="08phl5syc7q6bh0rs9558s74g8xq05hgn7gbia4hvwvkd1q2f12g";
+    hash="15zdchj3wkjdbypj68kwqswxhkhrfnw72nlks6df4lk0nvp8zqv8";
+    url="http://luarocks.org/releases/luarocks-2.3.0-rc2.tar.gz";
+    sha256="15zdchj3wkjdbypj68kwqswxhkhrfnw72nlks6df4lk0nvp8zqv8";
   };
   buildInputs = [
     lua curl makeWrapper which

From 94494640243042b221b6d1a4d589e9b0986d5879 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:42:46 +0300
Subject: [PATCH 220/249] libgphoto2: 2.5.8 -> 2.5.9

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

diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 2fdf3d5e69b..e25cdb61d86 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "1di7iv2r5ghzrylfbpvp694gpqbwjj3ngrmg4kvl7big6hp2c6h3";
+    sha256 = "0chz57rhzdz1cbdjw1q5rs439s879kk06jrci4jyn5rlm7iyic6d";
   };
 
   nativeBuildInputs = [ pkgconfig gettext ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       MTP, and other vendor specific protocols for controlling and transferring data
       from digital cameras.
     '';
-    version = "2.5.8";
+    version = "2.5.9";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = with stdenv.lib.platforms; unix;

From 4251a1aacb9cf9e842aac9b3cfbc7400aebd26eb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:43:17 +0300
Subject: [PATCH 221/249] asdf: 3.1.5 -> 3.1.6

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

diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 6b7b88469b1..dbf429d8daf 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asdf";
-    version="3.1.5";
+    version="3.1.6";
     name="${baseName}-${version}";
-    hash="1barrkj549d24pyh86gdc8v3vvsv4w7k0kkfg0zzrvhg8x8al19h";
-    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.5.tar.gz";
-    sha256="1barrkj549d24pyh86gdc8v3vvsv4w7k0kkfg0zzrvhg8x8al19h";
+    hash="0535pf1828w5q6ydhmawf5f33xh6bc2czw76llgpikla0gdzh58w";
+    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.6.tar.gz";
+    sha256="0535pf1828w5q6ydhmawf5f33xh6bc2czw76llgpikla0gdzh58w";
   };
   buildInputs = [
     texinfo texLive perl

From 1406e8e6936af1bde991e93289d88ca478f38bc2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:46:05 +0100
Subject: [PATCH 222/249] angelscript: 2.30.1 -> 2.30.2

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

diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index a6e6cce9a8e..f5ff0315bee 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="angelscript";
-    version = "2.30.1";
+    version = "2.30.2";
     name="${baseName}-${version}";
     url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "10ym7185h26gzmw5v6wz8zlycw8gzygv0aw87dmgjcyy7qfk74m4";
+    sha256 = "1myp691m0nzv51pyfq6qmjyi0asbkx2v8slrnhj32s6aq55pf24c";
   };
   buildInputs = [
     unzip

From 81aa158838e2dc96b5773033c3ea06858b5519d4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:48:48 +0100
Subject: [PATCH 223/249] botanUnstable: 1.11.19 -> 1.11.25

---
 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 5685d261829..172c18480ad 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 = "19";
-  sha256 = "0a1hgd3w2pyn6yx89bal61bkxxazv0p8x8x4kri73p1b4vj3n3sb";
+  revision = "25";
+  sha256 = "1spjryza9yznbsa26i1kg3hz4ifjdi6cjhfd2h2lqg07xyf2a66c";
   openssl = null;
 })

From 1dba4b4e6af2c427d2e21986e253fff45df485ec Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:53:01 +0100
Subject: [PATCH 224/249] scons: 2.3.6 -> 2.4.1

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

diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index a2b79d77e22..37035b8c44d 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -2,7 +2,7 @@
 
 let
   name = "scons";
-  version = "2.3.6";
+  version = "2.4.1";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
-    sha256 = "1pq44h0ndclbrwvx901zih63jnzqsyyr865zlml40klg3lssmbcq";
+    sha256 = "19skywi4sb8riivvrylkjrjhnw1cdxj4ps8v7srwp6y650lz9i4g";
   };
 
   buildInputs = [python makeWrapper];

From 8d81c0ada284da64cc6d31bbd48957c9bf659ec9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:54:26 +0100
Subject: [PATCH 225/249] =?UTF-8?q?cdk:=20a=20new=20release=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
index f998f464457..94edc46fc4c 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   inherit buildInputs;
   src = fetchurl {
     url = "http://invisible-island.net/datafiles/release/cdk.tar.gz";
-    sha256 = "00s87kq5x10x22azr6q17b663syk169y3dk3kaj8z6dlk2b8vknp";
+    sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
   };
   meta = {
     description = ''Curses development kit'';

From b2ac241e958c767c4d817e65c37802014499d7a4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:54:56 +0100
Subject: [PATCH 226/249] iptables: 1.4.21 -> 1.6.0

---
 pkgs/os-specific/linux/iptables/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index 2221250d57c..8c815029661 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -1,14 +1,22 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, bison, flex, libnetfilter_conntrack, libnftnl, libmnl}:
 
 stdenv.mkDerivation rec {
   name = "iptables-${version}";
-  version = "1.4.21";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
-    sha256 = "1q6kg7sf0pgpq0qhab6sywl23cngxxfzc9zdzscsba8x09l4q02j";
+    sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb";
   };
 
+  nativeBuildInputs = [bison flex];
+
+  buildInputs = [libnetfilter_conntrack libnftnl libmnl];
+
+  preConfigure = ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
+  '';
+
   configureFlags = ''
     --enable-devel
     --enable-shared

From c8b975388235823322a0962f88f05594229435e3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:55:28 +0300
Subject: [PATCH 227/249] eigen: 3.2.5 -> 3.3-alpha1

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

diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 0e43b9fb602..150b72cf2f5 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  version = "3.2.5";
+  version = "3.3-alpha1";
 in
 stdenv.mkDerivation {
   name = "eigen-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
-    sha256 = "1vjixip19lwfia2bjpjwm09j7l20ry75493i6mjsk9djszj61agi";
+    sha256 = "00vmxz3da76ml3j7s8w8447sdpszx71i3xhnmwivxhpc4smpvz2q";
   };
   
   nativeBuildInputs = [ cmake ];

From e00cdaa6a2f43029ce5c43b64a127a7fa3554c12 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:25:53 +0300
Subject: [PATCH 228/249] librevenge: 0.0.2 -> 0.0.3

---
 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 fa90c76b24a..dc7634c958c 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.2";
+    version="0.0.3";
     name="${baseName}-${version}";
-    hash="03ygxyb0vfjv8raif5q62sl33b54wkr5rzgadb8slijm6k281wpn";
-    url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.2/librevenge-0.0.2.tar.xz";
-    sha256="03ygxyb0vfjv8raif5q62sl33b54wkr5rzgadb8slijm6k281wpn";
+    hash="1r0n5q7rw32h5fhnxfl7f4pwvprn9agpf117nhn71jrjqx57irvw";
+    url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.3/librevenge-0.0.3.tar.xz";
+    sha256="1r0n5q7rw32h5fhnxfl7f4pwvprn9agpf117nhn71jrjqx57irvw";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib

From 1a085b0c54305d12892522e548db03ea002548b0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:26:14 +0300
Subject: [PATCH 229/249] libre: 0.4.13 -> 0.4.14

---
 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 f73ddfe340e..17226ef17c4 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.13";
+  version = "0.4.14";
   name = "libre-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
-    sha256 = "0496nfi7vi6ivnyici5bqs147pwkdqn48w2rajhr5k8jd07pq5qp";
+    sha256 = "0ylv7v77jsny0a5wfc8i6dxsp8bjlmlz2gcyyv7x49c76pk0gdcy";
   };
   buildInputs = [zlib openssl];
   makeFlags = [

From b02d4c5d276452a10d687e40740d7ea10108c8aa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:26:38 +0300
Subject: [PATCH 230/249] librem: 0.4.6 -> 0.4.7

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

diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 817e1c79bc7..730916bf9d3 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl, libre}:
 stdenv.mkDerivation rec {
-  version = "0.4.6";
+  version = "0.4.7";
   name = "librem-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/rem-${version}.tar.gz";
-    sha256 = "0rgqy9pqn730ijxvz1gk0virsf6jwjmq02s99jqqrfm3p0g6zs3w";
+    sha256 = "0klm6ls9w0cj66h1zxmx0ifsihlmq1bq75vbmf09d0vvw5g4y22x";
   };
   buildInputs = [zlib openssl libre];
   makeFlags = [

From 3279ab1de482c487ce3f15f1c1e66865700222d0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:27:02 +0300
Subject: [PATCH 231/249] libodfgen: 0.1.4 -> 0.1.6

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

diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix
index e8778ff413a..341ef372351 100644
--- a/pkgs/development/libraries/libodfgen/default.nix
+++ b/pkgs/development/libraries/libodfgen/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libodfgen";
-    version="0.1.4";
+    version="0.1.6";
     name="${baseName}-${version}";
-    hash="1qgilnsd57ayv9mqh4sg9mkknifr98dv70a35gizxh5cw7c5x6r4";
-    url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.4/libodfgen-0.1.4.tar.xz";
-    sha256="1qgilnsd57ayv9mqh4sg9mkknifr98dv70a35gizxh5cw7c5x6r4";
+    hash="1sdr42f0bigip14zhs51m0zdwwzzl1mwmk882l4khpph8jmi1ch3";
+    url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.6/libodfgen-0.1.6.tar.xz";
+    sha256="1sdr42f0bigip14zhs51m0zdwwzzl1mwmk882l4khpph8jmi1ch3";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib libwpg libwpd librevenge

From 8efa3745c7b4101b6981682d08e597b55ba0b6d5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:27:26 +0300
Subject: [PATCH 232/249] libmwaw: 0.3.5 -> 0.3.7

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

diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix
index 2ef10f41d9a..7354111e131 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/pkgs/development/libraries/libmwaw/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libmwaw";
-    version="0.3.5";
+    version="0.3.7";
     name="${baseName}-${version}";
-    hash="1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil";
-    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.5/libmwaw-0.3.5.tar.xz";
-    sha256="1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil";
+    hash="1yg8zvv71r6wsrj71as1ngavj07527d8vrzdrf7s4yf2f7l12xh5";
+    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.7/libmwaw-0.3.7.tar.xz";
+    sha256="1yg8zvv71r6wsrj71as1ngavj07527d8vrzdrf7s4yf2f7l12xh5";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib libwpg libwpd librevenge

From ff853a98fbe8bc02fd13a3339e767b45015d9f70 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:29:21 +0300
Subject: [PATCH 233/249] =?UTF-8?q?libreoffice:=20readd=20and=20fix=20the?=
 =?UTF-8?q?=20script=20to=20generate=20fetch=20list=20for=20LibreOffice.?=
 =?UTF-8?q?=20Migrating=20all=20of=20these=20to=20system=20packages=20woul?=
 =?UTF-8?q?d=20not=20work=20without=20patching=20the=20build=20system,=20I?=
 =?UTF-8?q?=20am=20afraid=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libreoffice/generate-libreoffice-srcs.sh  | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100755 pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh

diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
new file mode 100755
index 00000000000..d77b41a0480
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
@@ -0,0 +1,54 @@
+#!/run/current-system/sw/bin/bash
+
+# Take the list of files from the main package, ooo.lst.in
+
+cat <<EOF
+[
+EOF
+
+write_entry(){
+  echo '{'
+  echo "  name = \"${name}\";"
+  echo "  md5 = \"${md5}\";"
+  echo "  brief = ${brief};"
+  echo '}'
+}
+
+while read line; do
+  case "$line" in
+    \#*)
+      echo Skipping comment: "$line" >&2;
+      ;;
+    *_MD5SUM\ :=*)
+      read tbline;
+      line=${line##* };
+      if [ "${tbline#*VERSION_MICRO}" != "$tbline" ]; then
+         verline=${tbline##* };
+         read tbline;
+         tbline=${tbline##* };
+         md5=$line
+         name=$tbline;
+         name="${name/\$([A-Z]*_VERSION_MICRO)/$verline}"
+      else
+         tbline=${tbline##* };
+         md5=$line
+         name=$tbline;
+      fi
+      brief=true;
+      write_entry;
+      ;;
+    *_TARBALL\ :=*)
+      line=${line##* };
+      line="${line#,}"
+      md5=${line:0:32};
+      name=${line:33};
+      brief=false;
+      write_entry;
+      ;;
+    *)
+      echo Skipping: "$line" >&2;
+      ;;
+  esac
+done
+
+echo ']'

From a413b8fde1f82474133491b84321897de1e44cae Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:30:06 +0300
Subject: [PATCH 234/249] libreoffice: 5.0.2.2 -> 5.0.4.2

---
 .../office/libreoffice/default.nix            |   8 +-
 .../office/libreoffice/libreoffice-srcs.nix   | 168 +++++++++++++++---
 2 files changed, 152 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 55bdd8eceb0..da6749f2bf5 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -20,7 +20,7 @@ let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
   major = "5";
   minor = "0";
-  patch = "2";
+  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 = "06w1gz78136bs6fbwslxz5zsg538yqfarkq1am7zn8rzczz2qplh";
+      sha256 = "1kdrs49agqhb2b687hqh6sq7328z2sf04dmhb3xv5zy4rjvv5pha";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "157hypz093vhqbysygx5q4fbb81785m2b7slccfkp8x87dcsahj3";
+      sha256 = "005jwny8xmsnvvh0xkk9csnqv2jkaslr2n9xm82bqalcg81j0g2x";
     };
 
   };
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0xn1pg72vfdajmhak6chajvd51h74jqvq2565xv3j823143niw01";
+    sha256 = "1j3dmk5xifcgmd6dgqqifzh8wmc7daqfbkvk6cxa94611yvl0x34";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 22cf1857ae4..0e7525782c6 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -1,15 +1,14 @@
-# DEPRECATED: these dependencies sould be system libraries
 [
+{
+  name = "libabw-0.1.1.tar.bz2";
+  md5 = "7a3815b506d064313ba309617b6f5a0b";
+  brief = true;
+}
 {
   name = "commons-codec-1.6-src.tar.gz";
   md5 = "2e482c7567908d334785ce7d69ddfff7";
   brief = false;
 }
-{
-  name = "commons-codec-1.9-src.zip";
-  md5 = "048751f3271906db5126ab76870444c4";
-  brief = false;
-}
 {
   name = "commons-httpclient-3.1-src.tar.gz";
   md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
@@ -20,11 +19,6 @@
   md5 = "625ff5f2f968dd908bca43c9469d6e6b";
   brief = false;
 }
-{
-  name = "commons-lang3-3.3.1-src.tar.gz";
-  md5 = "8ab049135b2d15313da5d9f0656894a1";
-  brief = false;
-}
 {
   name = "commons-logging-1.2-src.tar.gz";
   md5 = "ce977548f1cbf46918e93cd38ac35163";
@@ -40,21 +34,61 @@
   md5 = "71a11d037240b292f824ba1eb537b4e3";
   brief = true;
 }
+{
+  name = "boost_1_55_0.tar.bz2";
+  md5 = "d6eef4b4cacb2183f2bf265a5a03a354";
+  brief = false;
+}
+{
+  name = "bsh-2.0b5-src.zip";
+  md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
+  brief = false;
+}
+{
+  name = "cairo-1.10.2.tar.gz";
+  md5 = "f101a9e88b783337b20b2e26dfd26d5f";
+  brief = false;
+}
+{
+  name = "libcdr-0.1.1.tar.bz2";
+  md5 = "b33fd0be3befdd1b37777e08ce058bd9";
+  brief = true;
+}
 {
   name = "clucene-core-2.3.3.4.tar.gz";
   md5 = "48d647fbd8ef8889e5a7f422c1bfda94";
   brief = false;
 }
+{
+  name = "libcmis-0.5.0.tar.gz";
+  md5 = "5821b806a98e6c38370970e682ce76e8";
+  brief = false;
+}
+{
+  name = "CoinMP-1.7.6.tgz";
+  md5 = "1cce53bf4b40ae29790d2c5c9f8b1129";
+  brief = true;
+}
 {
   name = "collada2gltf-master-cb1d97788a.tar.bz2";
   md5 = "4b87018f7fff1d054939d19920b751a0";
   brief = false;
 }
 {
-  name = "ConvertTextToNumber-1.3.2.oxt";
-  md5 = "451ccf439a36a568653b024534669971";
+  name = "cppunit-1.13.2.tar.gz";
+  md5 = "d1c6bdd5a76c66d2c38331e2d287bc01";
+  brief = true;
+}
+{
+  name = "converttexttonumber-1-5-0.oxt";
+  md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a";
   brief = false;
 }
+{
+  name = "curl-7.43.0.tar.bz2";
+  md5 = "11bddbb452a8b766b932f859aaeeed39";
+  brief = true;
+}
 {
   name = "libe-book-0.1.2.tar.bz2";
   md5 = "6b48eda57914e6343efebc9381027b78";
@@ -75,6 +109,16 @@
   md5 = "dd7dab7a5fea97d2a6a43f511449b7cd";
   brief = false;
 }
+{
+  name = "Firebird-2.5.2.26540-0.tar.bz2";
+  md5 = "21154d2004e025c8a3666625b0357bb5";
+  brief = true;
+}
+{
+  name = "fontconfig-2.8.0.tar.gz";
+  md5 = "77e15a92006ddc2adbb06f840d591c0e";
+  brief = false;
+}
 {
   name = "crosextrafonts-20130214.tar.gz";
   md5 = "368f114c078f94214a308a74c7e991bc";
@@ -140,6 +184,16 @@
   md5 = "dbf2caca1d3afd410a29217a9809d397";
   brief = false;
 }
+{
+  name = "glew-1.10.0.zip";
+  md5 = "594eb47b4b1210e25438d51825404d5a";
+  brief = false;
+}
+{
+  name = "glm-0.9.4.6-libreoffice.zip";
+  md5 = "bae83fa5dc7f081768daace6e199adc3";
+  brief = false;
+}
 {
   name = "graphite2-1.2.4.tgz";
   md5 = "2ef839348fe28e3b923bf8cced440227";
@@ -226,8 +280,18 @@
   brief = false;
 }
 {
-  name = "language-subtag-registry-2015-06-08.tar.bz2";
-  md5 = "d431bd8a70455be1fa8523fa633c005b";
+  name = "jpegsrc.v9a.tar.gz";
+  md5 = "3353992aecaee1805ef4109aadd433e7";
+  brief = true;
+}
+{
+  name = "libjpeg-turbo-1.3.1.tar.gz";
+  md5 = "2c3a68129dac443a72815ff5bb374b05";
+  brief = true;
+}
+{
+  name = "language-subtag-registry-2015-08-04.tar.bz2";
+  md5 = "bf5986dbfa1c9a0f26cf1b00ed369484";
   brief = true;
 }
 {
@@ -259,7 +323,6 @@
   name = "libgltf-0.0.2.tar.bz2";
   md5 = "d63a9f47ab048f5009d90693d6aa6424";
   brief = true;
-  subDir = "libgltf/";
 }
 {
   name = "liblangtag-0.5.1.tar.bz2";
@@ -271,11 +334,26 @@
   md5 = "1f24ab1d39f4a51faf22244c94a6203f";
   brief = false;
 }
+{
+  name = "libxml2-2.9.3.tar.gz";
+  md5 = "daece17e045f1c107610e137ab50c179";
+  brief = false;
+}
+{
+  name = "libxslt-1.1.28.tar.gz";
+  md5 = "9667bf6f9310b957254fdcf6596600b7";
+  brief = false;
+}
 {
   name = "lp_solve_5.5.tar.gz";
   md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
   brief = false;
 }
+{
+  name = "mariadb_client-2.0.0-src.tar.gz";
+  md5 = "a233181e03d3c307668b4c722d881661";
+  brief = false;
+}
 {
   name = "mdds_0.12.1.tar.bz2";
   md5 = "ef2560ed5416652a7fe195305b14cebe";
@@ -307,8 +385,8 @@
   brief = false;
 }
 {
-  name = "nss-3.19.2-with-nspr-4.10.8.tar.gz";
-  md5 = "2100bc5a7ea9685928ff68cda2e60569";
+  name = "nss-3.19.4-with-nspr-4.10.10.tar.gz";
+  md5 = "478e0e90ebc4a90159549e77021021fd";
   brief = false;
 }
 {
@@ -321,6 +399,16 @@
   md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6";
   brief = true;
 }
+{
+  name = "openldap-2.4.31.tgz";
+  md5 = "804c6cb5698db30b75ad0ff1c25baefd";
+  brief = false;
+}
+{
+  name = "openssl-1.0.2a.tar.gz";
+  md5 = "a06c547dac9044161a477211049f60ef";
+  brief = true;
+}
 {
   name = "liborcus-0.7.0.tar.bz2";
   md5 = "7681383be6ce489d84c1c74f4e7f9643";
@@ -337,8 +425,8 @@
   brief = false;
 }
 {
-  name = "libpng-1.5.18.tar.gz";
-  md5 = "5266905cef49d1224437465ad4d67fd9";
+  name = "libpng-1.5.24.tar.gz";
+  md5 = "6652e428d1d3fc3c6cb1362159b1cf3b";
   brief = true;
 }
 {
@@ -346,6 +434,16 @@
   md5 = "35c0660065d023365e9854c13e289d12";
   brief = true;
 }
+{
+  name = "postgresql-9.2.1.tar.bz2";
+  md5 = "c0b4799ea9850eae3ead14f0a60e9418";
+  brief = false;
+}
+{
+  name = "Python-3.3.5.tgz";
+  md5 = "803a75927f8f241ca78633890c798021";
+  brief = true;
+}
 {
   name = "raptor2-2.0.9.tar.gz";
   md5 = "4ceb9316488b0ea01acf011023cf7fff";
@@ -386,9 +484,39 @@
   md5 = "0168229624cfac409e766913506961a8";
   brief = false;
 }
+{
+  name = "vigra1.6.0.tar.gz";
+  md5 = "d62650a6f908e85643e557a236ea989c";
+  brief = false;
+}
+{
+  name = "libvisio-0.1.1.tar.bz2";
+  md5 = "726c1f5be65eb7d649e0d48b63d920e7";
+  brief = true;
+}
+{
+  name = "libwpd-0.10.0.tar.bz2";
+  md5 = "0773d79a1f240ef9f4f20242b13c5bb7";
+  brief = true;
+}
+{
+  name = "libwpg-0.3.0.tar.bz2";
+  md5 = "17da9770cb8b317b7633f9807b32b71a";
+  brief = true;
+}
+{
+  name = "libwps-0.4.0.tar.bz2";
+  md5 = "e9162d2566421d9d71b3ad2377a68fd5";
+  brief = true;
+}
 {
   name = "xsltml_2.1.2.zip";
   md5 = "a7983f859eafb2677d7ff386a023bc40";
   brief = false;
 }
+{
+  name = "zlib-1.2.8.tar.gz";
+  md5 = "44d667c142d7cda120332623eab69f40";
+  brief = true;
+}
 ]

From 3bd03f31419f4f2fb02990df600db253173f1e3f Mon Sep 17 00:00:00 2001
From: leenaars <michiel.ml@nlnet.nl>
Date: Fri, 1 Jan 2016 14:16:32 +0100
Subject: [PATCH 235/249] xf86-input-wacom: 0.31.0 -> 0.32.0

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

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

From a1ade02cdc75a11013c49ad12c7bb4feeec0d080 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Tue, 24 Nov 2015 10:59:39 +0000
Subject: [PATCH 236/249] FreeBSD support

---
 pkgs/applications/altcoins/bitcoin.nix        |  5 +++--
 pkgs/development/compilers/sbcl/bootstrap.nix |  6 ++++-
 pkgs/development/libraries/db/clang-4.8.patch | 22 +++++++++++++++++++
 .../db/{osx.patch => clang-5.3.patch}         |  0
 pkgs/development/libraries/db/db-4.8.nix      |  1 +
 pkgs/development/libraries/db/db-5.3.nix      |  2 +-
 pkgs/development/libraries/glib/default.nix   |  2 +-
 .../libraries/libiconv/default.nix            |  3 ++-
 pkgs/tools/compression/bzip2/default.nix      |  5 +++--
 pkgs/tools/networking/miniupnpc/default.nix   |  2 +-
 10 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/libraries/db/clang-4.8.patch
 rename pkgs/development/libraries/db/{osx.patch => clang-5.3.patch} (100%)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index bdd0335fe3b..fb2827c4bd3 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode
+, zlib, miniupnpc, qt4, protobuf, qrencode
 , withGui }:
 
 with stdenv.lib;
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec{
   };
 
   buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
-                  miniupnpc utillinux protobuf ]
+                  miniupnpc protobuf ]
+                  ++ optionals stdenv.isLinux [ utillinux ]
                   ++ optionals withGui [ qt4 qrencode ];
 
   configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 0114f014a51..4152bb8b2a3 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -23,7 +23,11 @@ let
       sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5";
     };
     armv6l-linux = armv7l-linux;
-    x86_64-solaris = x86_64-linux;
+    x86_64-freebsd = rec {
+      version = "1.2.7";
+      system = "x86-64-freebsd";
+      sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6";
+    };
   };
   cfg = options.${stdenv.system};
 in
diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch
new file mode 100644
index 00000000000..c53160a8297
--- /dev/null
+++ b/pkgs/development/libraries/db/clang-4.8.patch
@@ -0,0 +1,22 @@
+diff --git a/dbinc/atomic.h b/dbinc/atomic.h
+index 0034dcc..fa7ba93 100644
+--- a/dbinc/atomic.h
++++ b/dbinc/atomic.h
+@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
+ #define	atomic_inc(env, p)	__atomic_inc(p)
+ #define	atomic_dec(env, p)	__atomic_dec(p)
+ #define	atomic_compare_exchange(env, p, o, n)	\
+-	__atomic_compare_exchange((p), (o), (n))
++	__db_atomic_compare_exchange((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ 	int	temp;
+@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
+  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+  * which configure could be changed to use.
+  */
+-static inline int __atomic_compare_exchange(
++static inline int __db_atomic_compare_exchange(
+ 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ 	atomic_value_t was;
diff --git a/pkgs/development/libraries/db/osx.patch b/pkgs/development/libraries/db/clang-5.3.patch
similarity index 100%
rename from pkgs/development/libraries/db/osx.patch
rename to pkgs/development/libraries/db/clang-5.3.patch
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix
index 9b5e8cb39bd..6a161b0b72d 100644
--- a/pkgs/development/libraries/db/db-4.8.nix
+++ b/pkgs/development/libraries/db/db-4.8.nix
@@ -2,6 +2,7 @@
 
 import ./generic.nix (args // rec {
   version = "4.8.30";
+  extraPatches = [ ./clang-4.8.patch ];
   sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
   branch = "4.8";
 })
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
index b5e62ee686f..98002c24461 100644
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -3,6 +3,6 @@
 import ./generic.nix (args // rec {
   version = "5.3.28";
   sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
-  extraPatches = [ ./osx.patch ];
+  extraPatches = [ ./clang-5.3.patch ];
   branch = "5.3";
 })
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index e53775464e0..07e1f1243ec 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 
-assert !stdenv.isDarwin -> stdenv.cc.isGNU;
+assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU;
 
 # TODO:
 # * Add gio-module-fam
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 70b0574a7b4..24a0376f0f9 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
   # (Windows' linker would need to be used somehow to produce an actual
   # DLL.)  Thus, build the static library too, and this is what Gettext
   # will actually use.
-  configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else null;
+  configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else
+                   if stdenv.isFreeBSD then [ "--with-pic" ] else null;
 
   crossAttrs = {
     # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW).
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 3e835c30e3d..bb04049d8a6 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -58,8 +58,9 @@ in stdenv.mkDerivation {
     ln -s bzip2 $out/bin/bzcat
   '';
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang'
+  patchPhase = ''
+    substituteInPlace Makefile --replace CC=gcc CC=cc
+    substituteInPlace Makefile-libbz2_so --replace CC=gcc CC=cc
   '';
 
   preConfigure = ''
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index a0ae90da446..ba0f6c25521 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     inherit version;
     homepage = http://miniupnp.free.fr/;
     description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd;
   };
 }

From 3cb831d2bcb6d534325178c6928bc893a14534f8 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Tue, 24 Nov 2015 11:37:39 +0000
Subject: [PATCH 237/249] FreeBSD patches for miniupnpc, boost, bitcoin

---
 pkgs/applications/altcoins/bitcoin.nix       |  2 +-
 pkgs/development/libraries/boost/generic.nix |  2 +-
 pkgs/tools/networking/miniupnpc/default.nix  | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index fb2827c4bd3..91432f2f5a8 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, protobuf, qrencode
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode
 , withGui }:
 
 with stdenv.lib;
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 2a83d7c4142..5b497aa76b8 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.isDarwin || stdenv.isFreeBSD then "clang" else null
 , enableRelease ? true
 , enableDebug ? false
 , enableSingleThreaded ? false
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index ba0f6c25521..ac68b55ad17 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
-let version = "1.9.20150430"; in
+let version = "24d54ba13af4e53aba19c23898a373feecb41bd0"; in
 stdenv.mkDerivation rec {
   name = "miniupnpc-${version}";
 
-  src = fetchurl {
-    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
-    name = "${name}.tar.gz";
+  src = fetchFromGitHub {
+    owner = "miniupnp";
+    repo = "miniupnp";
+    sha256 = "0j78dvlfh1a3a27zhvv001cb1d7vcgyv33bd1zr36drg64b6hrgw";
+    rev = version;
   };
 
   doCheck = true;

From c01dbc4932955a8c1fa2f28a135aafaa4111ef81 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Tue, 24 Nov 2015 12:00:19 +0000
Subject: [PATCH 238/249] FreeBSD patches for GNU m4, stdenv, miniupnpc

---
 pkgs/development/tools/misc/gnum4/default.nix |  3 +-
 pkgs/stdenv/native/default.nix                | 94 +++++++++++++++++++
 pkgs/tools/networking/miniupnpc/default.nix   | 17 ++--
 pkgs/tools/networking/miniupnpc/freebsd.patch | 11 +++
 4 files changed, 116 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/tools/networking/miniupnpc/freebsd.patch

diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 7174f4b41c3..7216e1e169d 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin
     && !stdenv.isCygwin                    # XXX: `test-dup2' fails on Cygwin
-    && !stdenv.isSunOS;                    # XXX: `test-setlocale2.sh' fails
+    && !stdenv.isSunOS                     # XXX: `test-setlocale2.sh' fails
+    && !stdenv.isFreeBSD;                  # XXX: test 084 fails
 
   configureFlags = "--with-syscmd-shell=${stdenv.shell}";
 
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index bd90d580d3f..93d1c7e971c 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -24,6 +24,100 @@ rec {
     alias make=gmake
     alias tar=gtar
     alias sed=gsed
+
+    alias patch=gpatch # pcre relied on this for patching binary files
+
+    # we need GNU cp for --reflink, need to alias all of coreutils
+    alias basename=gbasename
+    alias cat=gcat
+    alias chgrp=gchgrp
+    alias chmod=gchmod
+    alias chown=gchown
+    alias chroot=gchroot
+    alias cksum=gcksum
+    alias comm=gcomm
+    alias cp=gcp
+    alias csplit=gcsplit
+    alias cut=gcut
+    alias date=gdate
+    alias dd=gdd
+    alias df=gdf
+    alias dir=gdir
+    alias dircolors=gdircolors
+    alias dirname=gdirname
+    alias du=gdu
+    alias echo=gecho
+    alias env=genv
+    alias expand=gexpand
+    alias expr=gexpr
+    alias factor=gfactor
+    alias false=gfalse
+    alias fmt=gfmt
+    alias fold=gfold
+    alias groups=ggroups
+    alias head=ghead
+    alias hostid=ghostid
+    alias hostname=ghostname
+    alias id=gid
+    alias install=ginstall
+    alias join=gjoin
+    alias kill=gkill
+    alias link=glink
+    alias ln=gln
+    alias logname=glogname
+    alias ls=gls
+    alias md5sum=gmd5sum
+    alias mkdir=gmkdir
+    alias mkfifo=gmkfifo
+    alias mknod=gmknod
+    alias mv=gmv
+    alias nice=gnice
+    alias nl=gnl
+    alias nohup=gnohup
+    alias od=god
+    alias paste=gpaste
+    alias pathchk=gpathchk
+    alias pinky=gpinky
+    alias pr=gpr
+    alias printenv=gprintenv
+    alias printf=gprintf
+    alias ptx=gptx
+    alias pwd=gpwd
+    alias readlink=greadlink
+    alias rm=grm
+    alias rmdir=grmdir
+    alias seq=gseq
+    alias sha1sum=gsha1sum
+    alias shred=gshred
+    alias sleep=gsleep
+    alias sort=gsort
+    alias split=gsplit
+    alias stat=gstat
+    alias stty=gstty
+    alias su=gsu
+    alias sum=gsum
+    alias sync=gsync
+    alias tac=gtac
+    #alias tail=gtail # this breaks xz XXX
+    alias tee=gtee
+    alias test=gtest
+    alias touch=gtouch
+    alias tr=gtr
+    alias true=gtrue
+    alias tsort=gtsort
+    alias tty=gtty
+    alias uname=guname
+    alias unexpand=gunexpand
+    alias uniq=guniq
+    alias unlink=gunlink
+    alias uptime=guptime
+    alias users=gusers
+    alias vdir=gvdir
+    alias wc=gwc
+    alias who=gwho
+    alias whoami=gwhoami
+    alias yes=gyes
+
     export MAKE=gmake
     shopt -s expand_aliases
   '';
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index ac68b55ad17..644045800d4 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchurl }:
 
-let version = "24d54ba13af4e53aba19c23898a373feecb41bd0"; in
+let version = "1.9.20150430"; in
 stdenv.mkDerivation rec {
   name = "miniupnpc-${version}";
 
-  src = fetchFromGitHub {
-    owner = "miniupnp";
-    repo = "miniupnp";
-    sha256 = "0j78dvlfh1a3a27zhvv001cb1d7vcgyv33bd1zr36drg64b6hrgw";
-    rev = version;
+  src = fetchurl {
+    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+    sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
+    name = "${name}.tar.gz";
   };
 
-  doCheck = true;
+  patches = stdenv.lib.optional stdenv.isFreeBSD [ ./freebsd.patch ];
+
+  doCheck = !stdenv.isFreeBSD;
 
   installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
 
diff --git a/pkgs/tools/networking/miniupnpc/freebsd.patch b/pkgs/tools/networking/miniupnpc/freebsd.patch
new file mode 100644
index 00000000000..42ae85a8e6b
--- /dev/null
+++ b/pkgs/tools/networking/miniupnpc/freebsd.patch
@@ -0,0 +1,11 @@
+diff --git a/minihttptestserver.c b/minihttptestserver.c
+index bbfdac3..a43999d 100644
+--- a/minihttptestserver.c
++++ b/minihttptestserver.c
+@@ -1,3 +1,6 @@
++#ifndef INADDR_LOOPBACK
++#define INADDR_LOOPBACK         0x7f000001
++#endif
+ /* $Id: minihttptestserver.c,v 1.17 2015/02/06 10:31:19 nanard Exp $ */
+  /* Project : miniUPnP
+    * Author : Thomas Bernard

From 2d00f27230764ed8be9ddff575d64e773ea84d62 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Tue, 24 Nov 2015 12:51:09 +0000
Subject: [PATCH 239/249] FreeBSD: use clang37

---
 pkgs/stdenv/native/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 93d1c7e971c..2a1acba41bb 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -27,6 +27,8 @@ rec {
 
     alias patch=gpatch # pcre relied on this for patching binary files
 
+    alias cc=clang37
+
     # we need GNU cp for --reflink, need to alias all of coreutils
     alias basename=gbasename
     alias cat=gcat

From f351aaaf85c6b6323660db6ce638f057947a333f Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Thu, 26 Nov 2015 02:35:12 +0000
Subject: [PATCH 240/249] FreeBSD: use own stdenv, do not run libtiff tests,
 use PIC for zlib

---
 .../compilers/llvm/3.7/libc++abi.nix          |   2 +-
 .../development/libraries/libtiff/default.nix |   2 +-
 pkgs/development/libraries/zlib/default.nix   |   2 +-
 pkgs/stdenv/default.nix                       |   3 +
 pkgs/stdenv/freebsd/default.nix               | 131 +++++++++++++
 pkgs/stdenv/freebsd/trivial-bootstrap.sh      | 183 ++++++++++++++++++
 pkgs/stdenv/native/default.nix                |   2 -
 7 files changed, 320 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/stdenv/freebsd/default.nix
 create mode 100644 pkgs/stdenv/freebsd/trivial-bootstrap.sh

diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
index 97f182a9af8..a495e1860ad 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   src = fetch "libcxxabi" "1swvnhrf9g67579c5picg0l869f8l2bwi4xqpbcb4n296gyp9c28";
 
-  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind;
+  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
   postUnpack = ''
     unpackFile ${libcxx.src}
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 2c559d221ab..7e9c11d700a 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  doCheck = !stdenv.isFreeBSD;
 
   meta = with stdenv.lib; {
     description = "Library and utilities for working with the TIFF image file format";
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 93474d14344..99be5162010 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (rec {
 
   # As zlib takes part in the stdenv building, we don't want references
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc " + stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
 
   crossAttrs = {
     dontStrip = static;
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index da93229ce94..37e90faf6d0 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -33,6 +33,8 @@ rec {
     pkgs = stdenvNativePkgs;
   };
 
+  stdenvFreeBSD = (import ./freebsd { inherit system allPackages platform config; }).stdenvFreeBSD;
+
   # Linux standard environment.
   stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux;
 
@@ -58,5 +60,6 @@ rec {
     if system == "x86_64-solaris" then stdenvNix else
     if system == "i686-cygwin" then stdenvNative else
     if system == "x86_64-cygwin" then stdenvNative else
+    if system == "x86_64-freebsd" then stdenvFreeBSD else
     stdenvNative;
 }
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
new file mode 100644
index 00000000000..de39e79102f
--- /dev/null
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -0,0 +1,131 @@
+{ system      ? builtins.currentSystem
+, allPackages ? import ../../top-level/all-packages.nix
+, platform    ? null
+, config      ? {}
+}:
+
+rec {
+  allPackages = import ../../top-level/all-packages.nix;
+
+  bootstrapTools = derivation {
+    inherit system;
+
+    name    = "trivial-bootstrap-tools";
+    builder = "/bin/sh";
+    args    = [ ./trivial-bootstrap.sh ];
+
+    mkdir   = "/bin/mkdir";
+    ln      = "/bin/ln";
+  };
+
+  stage0 = rec {
+    fetchurl = import ../../build-support/fetchurl {
+      inherit stdenv;
+      curl = bootstrapTools;
+    };
+
+    stdenv = import ../generic {
+      inherit system config;
+      name         = "stdenv-freebsd-boot-0";
+      shell        = "/usr/local/bin/bash";
+      initialPath  = [ bootstrapTools ];
+      fetchurlBoot = fetchurl;
+      cc           = null;
+    };
+  };
+
+  buildTools = { #import ../../os-specific/freebsd/command-line-tools
+    inherit (stage0) stdenv fetchurl;
+    xar  = bootstrapTools;
+    gzip = bootstrapTools;
+    cpio = bootstrapTools;
+  };
+
+  preHook = ''
+    export NIX_IGNORE_LD_THROUGH_GCC=1
+    export NIX_DONT_SET_RPATH=1
+    export NIX_NO_SELF_RPATH=1
+    dontFixLibtool=1
+    stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
+    xargsFlags=" "
+  '';
+
+  stage1 = rec {
+    nativePrefix = "/usr";
+
+    stdenv = import ../generic {
+      name = "stdenv-freebsd-boot-1";
+
+      inherit system config;
+      inherit (stage0.stdenv) shell fetchurlBoot;
+
+      initialPath = stage0.stdenv.initialPath ++ [ nativePrefix ];
+
+      preHook = preHook + "\n" + ''
+        export NIX_LDFLAGS_AFTER+=" -L/usr/lib"
+        export NIX_ENFORCE_PURITY=
+        export NIX_CFLAGS_COMPILE+=" -isystem ${nativePrefix}/include/c++/v1"
+        export NIX_CFLAGS_LINK+=" -Wl,-rpath,${nativePrefix}/lib"
+      '';
+
+      cc = import ../../build-support/cc-wrapper {
+        nativeTools  = true;
+        nativePrefix = nativePrefix;
+        nativeLibc   = true;
+        stdenv       = stage0.stdenv;
+        shell        = "/usr/local/bin/bash";
+        cc           = {
+          name    = "clang-9.9.9";
+          cc      = "/usr";
+          outPath = nativePrefix;
+        };
+        isClang      = true;
+      };
+    };
+    pkgs = allPackages {
+      inherit system platform;
+      bootStdenv = stdenv;
+    };
+  };
+
+  stage2 = rec {
+    stdenv = import ../generic {
+      name = "stdenv-freebsd-boot-2";
+
+      inherit system config;
+      inherit (stage1.stdenv) shell fetchurlBoot preHook cc;
+
+      initialPath = [ "/usr/local/bin" ] ++ stage1.stdenv.initialPath;
+    };
+    pkgs = allPackages {
+      inherit system platform;
+      bootStdenv = stdenv;
+    };
+  };
+
+  stage3 = with stage2; import ../generic {
+    name = "stdenv-freebsd-boot-3";
+
+    inherit system config;
+    inherit (stdenv) fetchurlBoot;
+
+    initialPath = [ bootstrapTools ];
+
+    preHook = preHook + "\n" + ''
+      export NIX_ENFORCE_PURITY=1
+    '';
+
+    cc = import ../../build-support/cc-wrapper {
+      inherit stdenv;
+      nativeTools   = true;
+      nativePrefix  = "/usr/local/bin";
+      nativeLibc    = true;
+      cc            = stage2.stdenv.cc; #pkgs.llvmPackages.clang-unwrapped; 
+      isClang       = true;
+    };
+
+    shell = "/usr/local/bin/bash";
+  };
+
+  stdenvFreeBSD = stage3;
+}
diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
new file mode 100644
index 00000000000..f0b861d1a18
--- /dev/null
+++ b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
@@ -0,0 +1,183 @@
+
+# Building bootstrap tools
+echo Building the trivial bootstrap environment...
+
+# needed FreeBSD packages:
+# findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2
+
+$mkdir -p $out/bin
+
+$ln -s $ln $out/bin/ln
+
+PATH=$out/bin/
+
+cd $out/bin
+
+ln -s $mkdir
+
+ln -s /usr/local/bin/bash
+ln -s /bin/sh
+
+ln -s /usr/local/bin/gmake make
+
+ln -s /usr/local/bin/lbzip2
+
+ln -s /usr/bin/bzip2
+ln -s /usr/bin/bunzip2
+ln -s /usr/bin/bzcat
+ln -s /usr/bin/bzip2recover
+
+ln -s /usr/bin/xz
+ln -s /usr/bin/unxz
+ln -s /usr/bin/xzcat
+ln -s /usr/bin/lzma
+ln -s /usr/bin/unlzma
+ln -s /usr/bin/lzcat
+
+ln -s /usr/local/bin/gcp cp
+ln -s /usr/local/bin/gdd dd
+ln -s /usr/local/bin/gmv mv
+ln -s /usr/local/bin/grm rm
+ln -s /usr/local/bin/gls ls
+ln -s /bin/ps ps
+ln -s /usr/local/bin/gcat cat
+ln -s /usr/local/bin/gecho echo
+ln -s /usr/local/bin/gexpr expr
+ln -s /usr/local/bin/gtest test
+ln -s /usr/local/bin/gdate date
+ln -s /usr/local/bin/gchmod chmod
+ln -s /usr/local/bin/grmdir rmdir
+ln -s /usr/local/bin/gsleep sleep
+ln -s /bin/hostname hostname
+
+ln -s /usr/local/bin/gid id
+ln -s /usr/local/bin/god od
+ln -s /usr/local/bin/gtr tr
+ln -s /usr/local/bin/gwc wc
+ln -s /usr/local/bin/gcut cut
+ln -s /usr/bin/cmp cmp
+ln -s /usr/local/bin/gsed sed
+ln -s /usr/local/bin/gtar tar
+ln -s /usr/local/bin/xar xar
+ln -s /usr/local/bin/gawk awk
+ln -s /usr/local/bin/genv env
+ln -s /usr/local/bin/gtee tee
+ln -s /usr/local/bin/gcomm comm
+ln -s /usr/local/bin/gcpio cpio
+ln -s /usr/local/bin/curl curl
+ln -s /usr/local/bin/gfind find
+ln -s /usr/local/bin/grep grep #other grep is in /usr/bin
+ln -s /usr/bin/gzip
+ln -s /usr/bin/gunzip
+ln -s /usr/bin/zcat
+ln -s /usr/local/bin/ghead head
+ln -s /usr/bin/tail tail
+ln -s /usr/local/bin/guniq uniq
+ln -s /usr/bin/less less
+ln -s /usr/local/bin/gtrue true
+ln -s /usr/bin/diff diff
+ln -s /usr/local/bin/egrep egrep
+ln -s /usr/local/bin/fgrep fgrep
+ln -s /usr/local/bin/gpatch patch
+ln -s /usr/local/bin/guname uname
+ln -s /usr/local/bin/gtouch touch
+ln -s /usr/local/bin/gsplit split
+ln -s /usr/local/bin/gxargs xargs
+ln -s /usr/bin/which which
+ln -s /usr/local/bin/ginstall install
+ln -s /usr/local/bin/gbasename basename
+ln -s /usr/local/bin/gdirname dirname
+ln -s /usr/local/bin/greadlink readlink
+
+ln -fs /usr/local/bin/gln ln
+ln -s /usr/local/bin/gyes yes
+ln -s /usr/local/bin/gwhoami whoami
+ln -s /usr/local/bin/gvdir vdir
+ln -s /usr/local/bin/gusers users
+ln -s /usr/local/bin/guptime uptime
+ln -s /usr/local/bin/gunlink unlink
+ln -s /usr/local/bin/gtty tty
+ln -s /usr/local/bin/gunexpand unexpand
+ln -s /usr/local/bin/gtsort tsort
+ln -s /usr/local/bin/gtruncate truncate
+ln -s /usr/local/bin/gtimeout timeout
+ln -s /usr/local/bin/gtac tac
+ln -s /usr/local/bin/gsync sync
+ln -s /usr/local/bin/gsum sum
+ln -s /usr/local/bin/gstty stty
+ln -s /usr/local/bin/gstdbuf stdbuf
+ln -s /usr/local/bin/gsort sort
+ln -s /usr/local/bin/gruncon runcon
+ln -s /usr/local/bin/gseq seq
+ln -s /usr/local/bin/gsha1sum sha1sum
+ln -s /usr/local/bin/gsha224sum sha224sum
+ln -s /usr/local/bin/gsha256sum sha256sum
+ln -s /usr/local/bin/gsha384sum sha384sum
+ln -s /usr/local/bin/gsha512sum sha512sum
+ln -s /usr/local/bin/gshred shred
+ln -s /usr/local/bin/gshuf shuf
+ln -s /usr/local/bin/grealpath realpath
+ln -s "/usr/local/bin/g[" "["
+ln -s /usr/local/bin/gbase64 base64
+ln -s /usr/local/bin/gchcon chcon
+ln -s /usr/local/bin/gchgrp chgrp
+ln -s /usr/local/bin/gchown chown
+ln -s /usr/local/bin/gchroot chroot
+ln -s /usr/local/bin/gcksum cksum
+ln -s /usr/local/bin/gcsplit csplit
+ln -s /usr/local/bin/gdf df
+ln -s /usr/local/bin/gdircolors dircolors
+ln -s /usr/local/bin/gdu du
+ln -s /usr/local/bin/gexpand expand
+ln -s /usr/local/bin/gfactor factor
+ln -s /usr/local/bin/gfalse false
+ln -s /usr/local/bin/gfmt fmt
+ln -s /usr/local/bin/gfold fold
+ln -s /usr/local/bin/ggroups groups
+ln -s /usr/local/bin/ghostid hostid
+ln -s /usr/local/bin/gjoin join
+ln -s /usr/local/bin/gkill kill
+ln -s /usr/local/bin/glink link
+ln -s /usr/local/bin/glogname logname
+ln -s /usr/local/bin/gmd5sum md5sum
+ln -s /usr/local/bin/gmkdir mkdir
+ln -s /usr/local/bin/gmkfifo mkfifo
+ln -s /usr/local/bin/gmknod mknod
+ln -s /usr/local/bin/gmktemp mktemp
+ln -s /usr/local/bin/gnice nice
+ln -s /usr/local/bin/gnl nl
+ln -s /usr/local/bin/gnohup nohup
+ln -s /usr/local/bin/gnproc nproc
+ln -s /usr/local/bin/gnumfmt numfmt
+ln -s /usr/local/bin/gnustat nustat
+ln -s /usr/local/bin/gpaste paste
+ln -s /usr/local/bin/gpathchk pathchk
+ln -s /usr/local/bin/gpinky pinky
+ln -s /usr/local/bin/gpr pr
+ln -s /usr/local/bin/gprintenv printenv
+ln -s /usr/local/bin/gprintf printf
+ln -s /usr/local/bin/gptx ptx
+ln -s /usr/local/bin/gpwd pwd
+
+# binutils
+# pkg info -l binutils | grep usr/local/bin
+ln -s /usr/local/bin/addr2line
+ln -s /usr/local/bin/ar
+ln -s /usr/local/bin/as
+ln -s /usr/local/bin/c++filt
+ln -s /usr/local/bin/dwp
+ln -s /usr/local/bin/elfedit
+ln -s /usr/local/bin/gprof
+ln -s /usr/local/bin/ld
+ln -s /usr/local/bin/ld.bfd
+ln -s /usr/local/bin/ld.gold
+ln -s /usr/local/bin/nm
+ln -s /usr/local/bin/objcopy
+ln -s /usr/local/bin/objdump
+ln -s /usr/local/bin/ranlib
+ln -s /usr/local/bin/readelf
+ln -s /usr/local/bin/size
+ln -s /usr/local/bin/strings
+ln -s /usr/local/bin/strip
+
+#pkg info -l llvm37 | grep usr/local/bin
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 2a1acba41bb..93d1c7e971c 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -27,8 +27,6 @@ rec {
 
     alias patch=gpatch # pcre relied on this for patching binary files
 
-    alias cc=clang37
-
     # we need GNU cp for --reflink, need to alias all of coreutils
     alias basename=gbasename
     alias cat=gcat

From 9897b356612c4bb06a9c9d688da52134dfe8fb95 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Thu, 26 Nov 2015 17:33:58 +0000
Subject: [PATCH 241/249] FreeBSD: patch expat, kerberos, libedit, ossp-uuid,
 lz4, sharutils, add libelf-freebsd

---
 pkgs/development/libraries/expat/default.nix  |  3 ++
 pkgs/development/libraries/kerberos/krb5.nix  | 10 ++--
 .../development/libraries/libedit/default.nix |  2 +-
 .../libraries/libedit/freebsd-wchar.patch     | 13 +++++
 .../libraries/libelf-freebsd/default.nix      | 28 ++++++++++
 .../libraries/libossp-uuid/default.nix        |  2 +
 pkgs/stdenv/freebsd/default.nix               |  4 +-
 pkgs/tools/archivers/sharutils/default.nix    |  2 +-
 pkgs/tools/compression/lz4/default.nix        |  2 +
 .../compression/lz4/install-on-freebsd.patch  | 54 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 pkgs/top-level/perl-packages.nix              |  4 +-
 12 files changed, 117 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/libraries/libedit/freebsd-wchar.patch
 create mode 100644 pkgs/development/libraries/libelf-freebsd/default.nix
 create mode 100644 pkgs/tools/compression/lz4/install-on-freebsd.patch

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 05cfeaee423..78e2da3ffdb 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./CVE-2015-1283.patch ];
 
+  configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic";
+  # NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
+
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;
     description = "A stream-oriented XML parser library written in C";
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 2e5e48891b8..b263a4ef06c 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -11,13 +11,15 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "${type}krb5-${version}";
-  version = "1.13.2";
+  version = "1.14";
 
   src = fetchurl {
-    url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar";
-    sha256 = "1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75";
+    url = "${meta.homepage}dist/krb5/1.14/krb5-${version}.tar.gz";
+    sha256 = "1sgr61cnkgc5xazijaww6wpn5fnxl9vyj9ixk3r3y7ikv3x0gnyf";
   };
 
+  configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD ''WARN_CFLAGS=""'';
+
   nativeBuildInputs = [ pkgconfig perl yacc ]
     # Provides the mig command used by the build scripts
     ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds;
@@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
 
   unpackPhase = ''
     tar -xf $src
-    tar -xzf krb5-${version}.tar.gz
+    #tar -xzf krb5-${version}.tar.gz
     cd krb5-${version}/src
   '';
 
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index dc8ecf7e95d..5234c16e135 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = if stdenv.isCygwin then [
     ./01-cygwin.patch
-  ] else null;
+  ] else [ ] ++ [ ./freebsd-wchar.patch ];
 
   postInstall = ''
     find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \
diff --git a/pkgs/development/libraries/libedit/freebsd-wchar.patch b/pkgs/development/libraries/libedit/freebsd-wchar.patch
new file mode 100644
index 00000000000..6bf7fb0ef69
--- /dev/null
+++ b/pkgs/development/libraries/libedit/freebsd-wchar.patch
@@ -0,0 +1,13 @@
+diff --git a/src/chartype.h b/src/chartype.h
+index 0beee17..4ac86f3 100644
+--- a/src/chartype.h
++++ b/src/chartype.h
+@@ -44,7 +44,7 @@
+  * supports non-BMP code points without requiring UTF-16, but nothing
+  * seems to actually advertise this properly, despite Unicode 3.1 having
+  * been around since 2001... */
+-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__)
+ #ifndef __STDC_ISO_10646__
+ /* In many places it is assumed that the first 127 code points are ASCII
+  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix
new file mode 100644
index 00000000000..ee0b6d50408
--- /dev/null
+++ b/pkgs/development/libraries/libelf-freebsd/default.nix
@@ -0,0 +1,28 @@
+{ fetchsvn, stdenv }:
+
+stdenv.mkDerivation (rec {
+  version = "3258";
+  name = "libelf-freebsd-${version}";
+
+  #src = fetchurl {
+  #  url = "http://sourceforge.net/code-snapshots/svn/e/el/elftoolchain/code/elftoolchain-code-${version}-trunk.zip";
+  #  sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr";
+  #};
+  src = fetchsvn {
+    url = svn://svn.code.sf.net/p/elftoolchain/code/trunk ;
+    rev = 3258;
+  };
+
+  doCheck = true;
+  
+  meta = {
+    description = "Essential compilation tools and libraries for building and analyzing ELF based program images";
+
+    homepage = https://sourceforge.net/p/elftoolchain/wiki/Home/;
+
+    license = stdenv.lib.licenses.bsd2;
+
+    platforms = stdenv.lib.platforms.freebsd;
+    maintainers = [ ];
+  };
+})
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix
index 119f4111666..ddfc2a5132c 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/pkgs/development/libraries/libossp-uuid/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
     sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0";
   };
 
+  configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+
   meta = with stdenv.lib; {
     homepage = http://www.ossp.org/pkg/lib/uuid/;
     description = "OSSP uuid ISO-C and C++ shared library";
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index de39e79102f..fcc3a14d487 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -43,7 +43,7 @@ rec {
 
   preHook = ''
     export NIX_IGNORE_LD_THROUGH_GCC=1
-    export NIX_DONT_SET_RPATH=1
+    # export NIX_DONT_SET_RPATH=1
     export NIX_NO_SELF_RPATH=1
     dontFixLibtool=1
     stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
@@ -118,7 +118,7 @@ rec {
     cc = import ../../build-support/cc-wrapper {
       inherit stdenv;
       nativeTools   = true;
-      nativePrefix  = "/usr/local/bin";
+      nativePrefix  = "/usr/local";
       nativeLibc    = true;
       cc            = stage2.stdenv.cc; #pkgs.llvmPackages.clang-unwrapped; 
       isClang       = true;
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index a7135346d2f..e806a962eab 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
      # Fix for building on Glibc 2.16.  Won't be needed once the
      # gnulib in sharutils is updated.
-     sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
+     sed -i ${stdenv.lib.optionalString (stdenv.isOpenBSD && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
   '';
 
   # GNU Gettext is needed on non-GNU platforms.
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 6c5d28d6bcc..13236da5ab4 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -20,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; {
     inherit version;
     description = "Extremely fast compression algorithm";
diff --git a/pkgs/tools/compression/lz4/install-on-freebsd.patch b/pkgs/tools/compression/lz4/install-on-freebsd.patch
new file mode 100644
index 00000000000..12a2bf72f4e
--- /dev/null
+++ b/pkgs/tools/compression/lz4/install-on-freebsd.patch
@@ -0,0 +1,54 @@
+diff --git a/Makefile b/Makefile
+index d1b0d0c..f8d6a2d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,8 +80,6 @@ clean:
+ 
+ 
+ #------------------------------------------------------------------------
+-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
+ 
+ install:
+ 	@cd $(LZ4DIR); $(MAKE) -e install
+@@ -129,4 +127,3 @@ examples:
+ prg-travis:
+ 	@cd $(PRGDIR); $(MAKE) -e test-travis
+ 
+-endif
+diff --git a/lib/Makefile b/lib/Makefile
+index 02ddd3b..26ed18f 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -80,8 +80,6 @@ clean:
+ 
+ 
+ #------------------------------------------------------------------------
+-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
+ 
+ liblz4.pc: liblz4.pc.in Makefile
+ 	@echo creating pkgconfig
+@@ -114,4 +112,3 @@ uninstall:
+ 	@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
+ 	@echo lz4 libraries successfully uninstalled
+ 
+-endif
+diff --git a/programs/Makefile b/programs/Makefile
+index f422902..6943363 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -113,8 +113,6 @@ clean:
+ 
+ 
+ #------------------------------------------------------------------------
+-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
+ 
+ install: lz4 lz4c
+ 	@echo Installing binaries
+@@ -307,4 +305,3 @@ test-mem: lz4 datagen fuzzer frametest fullbench
+ test-mem32: lz4c32 datagen
+ # unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system...
+ 
+-endif
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99271970460..fe9d9eccaee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7109,7 +7109,9 @@ let
 
   libedit = callPackage ../development/libraries/libedit { };
 
-  libelf = callPackage ../development/libraries/libelf { };
+  libelf = if stdenv.isFreeBSD
+  then callPackage ../development/libraries/libelf-freebsd { }
+  else callPackage ../development/libraries/libelf { };
 
   libetpan = callPackage ../development/libraries/libetpan { };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1d9211fae2f..e03634c7203 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6338,8 +6338,8 @@ let self = _self // overrides; _self = with self; {
 
   LocaleGettext = buildPerlPackage {
     name = "LocaleGettext-1.05";
-    buildInputs = stdenv.lib.optional (stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext;
-    NIX_CFLAGS_LINK = if (stdenv.isDarwin || stdenv.isCygwin) then "-lintl" else null;
+    buildInputs = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext;
+    NIX_CFLAGS_LINK = if (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) then "-lintl" else null;
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz;
       sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7";

From a472d836f674fe388018aaee75983e3400a77db4 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Sat, 28 Nov 2015 00:46:00 +0000
Subject: [PATCH 242/249] FreeBSD: apr-util, cyrus-sasl, berkeley db, glib,
 gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk,
 gnugrep

---
 .../git-and-tools/git/default.nix             |  3 +-
 .../libraries/apr-util/default.nix            | 10 +++++--
 .../include-static-dependencies.patch         | 12 ++++++++
 .../libraries/cyrus-sasl/default.nix          | 15 +++++++---
 .../libraries/cyrus-sasl/missing-size_t.patch |  4 +--
 pkgs/development/libraries/db/generic.nix     |  1 +
 pkgs/development/libraries/glib/default.nix   |  4 +++
 pkgs/development/libraries/gnutls/generic.nix |  2 +-
 .../libraries/kerberos/heimdal.nix            |  9 +++---
 .../libraries/libelf-freebsd/default.nix      | 26 +++++++++++------
 .../libraries/openldap/default.nix            | 14 +++++++--
 pkgs/development/libraries/serf/default.nix   |  2 +-
 .../tools/guile/g-wrap/default.nix            |  2 +-
 pkgs/development/tools/misc/tet/default.nix   | 29 +++++++++++++++++++
 pkgs/servers/shishi/default.nix               |  2 +-
 pkgs/servers/shishi/freebsd-unistd.patch      | 12 ++++++++
 pkgs/stdenv/freebsd/trivial-bootstrap.sh      |  8 ++++-
 pkgs/tools/text/gawk/default.nix              |  1 +
 pkgs/tools/text/gnugrep/default.nix           |  3 +-
 pkgs/top-level/all-packages.nix               | 13 +++++++--
 pkgs/top-level/perl-packages.nix              |  2 +-
 21 files changed, 141 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/development/libraries/apr-util/include-static-dependencies.patch
 create mode 100644 pkgs/development/tools/misc/tet/default.nix
 create mode 100644 pkgs/servers/shishi/freebsd-unistd.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 84b033f981f..089b605563f 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optionals guiSupport [tcl tk];
 
   # required to support pthread_cancel()
-  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
+              + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr";
 
   # without this, git fails when trying to check for /etc/gitconfig existence
   propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc";
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index c35520f22fd..e0b2832f6e4 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -3,6 +3,7 @@
 , bdbSupport ? false, db
 , ldapSupport ? !stdenv.isCygwin, openldap
 , libiconv
+, cyrus_sasl, autoreconfHook
 }:
 
 assert sslSupport -> openssl != null;
@@ -19,19 +20,24 @@ stdenv.mkDerivation rec {
     sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
   };
 
+  patches = stdenv.lib.optionals stdenv.isFreeBSD [ ./include-static-dependencies.patch ];
+
+  buildInputs = stdenv.lib.optionals stdenv.isFreeBSD [ autoreconfHook ];
+
   configureFlags = ''
     --with-apr=${apr} --with-expat=${expat}
     ${optionalString (!stdenv.isCygwin) "--with-crypto"}
     ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"}
     ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
-    ${stdenv.lib.optionalString ldapSupport "--with-ldap"}${
+    ${stdenv.lib.optionalString ldapSupport "--with-ldap=ldap"}${
       optionalString stdenv.isCygwin "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
   '';
 
   propagatedBuildInputs = [ makeWrapper apr expat libiconv ]
     ++ optional sslSupport openssl
     ++ optional bdbSupport db
-    ++ optional ldapSupport openldap;
+    ++ optional ldapSupport openldap
+    ++ optional stdenv.isFreeBSD cyrus_sasl;
 
   # Give apr1 access to sed for runtime invocations
   postInstall = ''
diff --git a/pkgs/development/libraries/apr-util/include-static-dependencies.patch b/pkgs/development/libraries/apr-util/include-static-dependencies.patch
new file mode 100644
index 00000000000..1813c721781
--- /dev/null
+++ b/pkgs/development/libraries/apr-util/include-static-dependencies.patch
@@ -0,0 +1,12 @@
+diff --git a/build/apu-conf.m4 b/build/apu-conf.m4
+index 8943f10..aa44305 100644
+--- a/build/apu-conf.m4
++++ b/build/apu-conf.m4
+@@ -279,6 +279,7 @@ AC_ARG_WITH(ldap,[  --with-ldap=library     ldap library to use],
+         APU_FIND_LDAPLIB("ldap", "-llber -lresolv -lsocket -lnsl")
+         APU_FIND_LDAPLIB("ldap", "-ldl -lpthread")
+       else
++        APU_FIND_LDAPLIB($LIBLDAP, "-llber -lcrypto -lssl -lsasl2")
+         APU_FIND_LDAPLIB($LIBLDAP)
+         APU_FIND_LDAPLIB($LIBLDAP, "-lresolv")
+         APU_FIND_LDAPLIB($LIBLDAP, "-lresolv -lsocket -lnsl")
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 2be98f3d5e8..71cfc626bac 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, openssl, kerberos, db, gettext, pam, fixDarwinDylibNames }:
+{ lib, stdenv, fetchurl, openssl, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -10,12 +10,19 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ openssl db gettext kerberos ]
+    [ openssl db gettext kerberos autoreconfHook ]
     ++ lib.optional stdenv.isLinux pam
     ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
-  patches = [ ./missing-size_t.patch ]; # https://bugzilla.redhat.com/show_bug.cgi?id=906519
-  patchFlags = "-p0";
+  patches = [
+    ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
+    (
+      fetchurl {
+        url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch";
+        sha256 = "1vh4pc2rxxm6yvykx0b7kg09jbcwcxwv5rs6yq2ag3y8p6a9x86w";
+      }
+    )
+  ];
 
   configureFlags = [
     "--with-openssl=${openssl}"
diff --git a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch b/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
index 42f20fb8096..da96818ca26 100644
--- a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
+++ b/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
@@ -1,6 +1,6 @@
 Gentoo bug #458790
---- include/sasl.h	2012-10-12 17:05:48.000000000 +0300
-+++ include/sasl.h	2013-02-23 16:56:44.648786268 +0200
+--- a/include/sasl.h	2012-10-12 17:05:48.000000000 +0300
++++ b/include/sasl.h	2013-02-23 16:56:44.648786268 +0200
 @@ -121,6 +121,9 @@
  #ifndef SASL_H
  #define SASL_H 1
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index 077bd4e03a3..f5ee4e440ff 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     (if cxxSupport then "--enable-cxx" else "--disable-cxx")
     (if compat185 then "--enable-compat185" else "--disable-compat185")
     "--enable-dbm"
+    (stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic")
   ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 07e1f1243ec..538a40615f1 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -63,8 +63,12 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ pcre zlib libffi libiconv ]
     ++ libintlOrEmpty;
 
+  LIBELF_CFLAGS = optional stdenv.isFreeBSD "-I${libelf}";
+  LIBELF_LIBS = optional stdenv.isFreeBSD "-L${libelf} -lelf";
+
   configureFlags =
     optional stdenv.isDarwin "--disable-compile-warnings"
+    ++ optional stdenv.isFreeBSD "--with-libiconv=gnu"
     ++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"];
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index f1eb62e0083..ebaef47ca14 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = !guileBindings;
 
   buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ]
-    ++ lib.optional (stdenv.isDarwin) libiconv
+    ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
     ++ [ unbound ]
     ++ lib.optional guileBindings guile;
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 0569c0bf5b3..3f8ed7c9de4 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex ]
     ++ (with perlPackages; [ JSON ])
     ++ optional (!libOnly) texinfo;
-  buildInputs = [ libcap_ng sqlite openssl db libedit ]
+  buildInputs = (if (!stdenv.isFreeBSD) then [ libcap_ng db ] else []) ++ [ sqlite openssl libedit ]
     ++ optionals (!libOnly) [ openldap pam ];
 
   ## ugly, X should be made an option
@@ -31,14 +31,15 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--enable-hdb-openldap-module"
-    "--with-capng"
     "--with-sqlite3=${sqlite}"
-    "--with-berkeley-db=${db}"
     "--with-libedit=${libedit}"
     "--with-openssl=${openssl}"
     "--without-x"
   ] ++ optionals (!libOnly) [
     "--with-openldap=${openldap}"
+  ] ++ optionals (!stdenv.isFreeBSD) [
+    "--with-berkeley-db=${db}"
+    "--with-capng"
   ];
 
   buildPhase = optionalString libOnly ''
@@ -83,7 +84,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An implementation of Kerberos 5 (and some more stuff)";
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.freebsd;
     maintainers = with maintainers; [ wkennington ];
   };
 
diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix
index ee0b6d50408..3e09d4c6cd4 100644
--- a/pkgs/development/libraries/libelf-freebsd/default.nix
+++ b/pkgs/development/libraries/libelf-freebsd/default.nix
@@ -1,20 +1,28 @@
-{ fetchsvn, stdenv }:
+{ fetchsvn, stdenv, gnum4, tet }:
 
 stdenv.mkDerivation (rec {
   version = "3258";
   name = "libelf-freebsd-${version}";
 
-  #src = fetchurl {
-  #  url = "http://sourceforge.net/code-snapshots/svn/e/el/elftoolchain/code/elftoolchain-code-${version}-trunk.zip";
-  #  sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr";
-  #};
   src = fetchsvn {
-    url = svn://svn.code.sf.net/p/elftoolchain/code/trunk ;
-    rev = 3258;
+    url = svn://svn.code.sf.net/p/elftoolchain/code/trunk;
+    rev = (stdenv.lib.strings.toInt version);
   };
 
-  doCheck = true;
-  
+  buildInputs = [ gnum4 tet ];
+
+  buildPhase = ''
+    PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:$PATH # use BSD install(1) instead of coreutils and make(1) instead of GNU Make
+    cp -vr ${tet} test/tet/tet3.8
+    chmod -R a+w test/tet/tet3.8
+    make libelf
+  '';
+
+  installPhase = ''
+    cp -vr libelf $out
+    cp -vr common/. $out/
+  '';
+
   meta = {
     description = "Essential compilation tools and libraries for building and analyzing ELF based program images";
 
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 253f74ecc6a..7d836cd5a0d 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -9,7 +9,16 @@ stdenv.mkDerivation rec {
   };
 
   # Should be removed with >=2.4.43
-  patches = [ ./CVE-2015-6908.patch ];
+  patches = [
+    ./CVE-2015-6908.patch
+    (
+      fetchurl {
+        sha256 = "5bcb3f9fb7186b380efa0a1c2d31ad755e190134b5c4dac07c65bbf7c0b6b3b3";
+        url = "https://github.com/LMDB/lmdb/commit/3360cbad668f678fb23c064ca4efcc5c9ae95d10.patch";
+        name = "openldap-clang-compilation.patch";
+      }
+    )
+  ];
 
   outputs = [ "out" "man" ];
 
@@ -19,7 +28,8 @@ stdenv.mkDerivation rec {
     [ "--enable-overlays"
       "--disable-dependency-tracking"   # speeds up one-time build
     ] ++ stdenv.lib.optional (openssl == null) "--without-tls"
-      ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl";
+      ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
+      ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
   dontPatchELF = 1; # !!!
 
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 580460d5fc0..20ce1dabf9a 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr}"/bin/*-config)" \
         APU="$(echo "${aprutil}"/bin/*-config)" CC="${
-          if stdenv.isDarwin then "clang" else "${stdenv.cc}/bin/gcc"
+          if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc"
         }" ${
           if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\""
         }
diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index ed492a0b82d..14777b95b85 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ libffi ];
 
-  doCheck = true;
+  doCheck = !stdenv.isFreeBSD; # XXX: 00-socket.test hangs
 
   meta = {
     description = "G-Wrap, a wrapper generator for Guile";
diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix
new file mode 100644
index 00000000000..77b362c712c
--- /dev/null
+++ b/pkgs/development/tools/misc/tet/default.nix
@@ -0,0 +1,29 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation (rec {
+  version = "3.8";
+  name = "tet-${version}";
+
+  src = fetchurl {
+    url = http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz ;
+    sha256 = "1j57hv56df38w249l595b8rsgmsyvjkbysai03a9724gax5jl9av" ;
+  };
+
+  buildInputs = [ ];
+
+  patchPhase = ''chmod +x configure'';
+
+  configurePhase = ''./configure -t lite'';
+
+  buildPhase = ''cd src; make; cd -'';
+
+  installPhase = ''cd src; make install; cd -; cp -vr $PWD $out'';
+
+  meta = {
+    description = "The Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program";
+    homepage = http://tetworks.opengroup.org/Products/tet.htm ;
+    license = stdenv.lib.licenses.artistic1;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ ];
+  };
+})
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index a97e6847a45..e26fd6ca749 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   };
 
   # Fixes support for gcrypt 1.6+
-  patches = [ ./gcrypt-fix.patch ];
+  patches = [ ./gcrypt-fix.patch ./freebsd-unistd.patch ];
 
   buildInputs = [ libgcrypt libgpgerror libtasn1 optPam optLibidn optGnutls ];
 
diff --git a/pkgs/servers/shishi/freebsd-unistd.patch b/pkgs/servers/shishi/freebsd-unistd.patch
new file mode 100644
index 00000000000..9399e20205b
--- /dev/null
+++ b/pkgs/servers/shishi/freebsd-unistd.patch
@@ -0,0 +1,12 @@
+diff --git a/gl/unistd.in.h b/gl/unistd.in.h
+index 2ea9af4..ed58960 100644
+--- a/gl/unistd.in.h
++++ b/gl/unistd.in.h
+@@ -116,6 +116,7 @@
+ # include <getopt.h>
+ #endif
+ 
++#include "config.h"
+ _GL_INLINE_HEADER_BEGIN
+ #ifndef _GL_UNISTD_INLINE
+ # define _GL_UNISTD_INLINE _GL_INLINE
diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
index f0b861d1a18..1d7478e158a 100644
--- a/pkgs/stdenv/freebsd/trivial-bootstrap.sh
+++ b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
@@ -3,7 +3,7 @@
 echo Building the trivial bootstrap environment...
 
 # needed FreeBSD packages:
-# findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2
+# findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils
 
 $mkdir -p $out/bin
 
@@ -22,6 +22,12 @@ ln -s /usr/local/bin/gmake make
 
 ln -s /usr/local/bin/lbzip2
 
+ln -s /usr/local/bin/gdiff diff
+
+ln -s /usr/bin/locale
+
+ln -s /usr/bin/more
+
 ln -s /usr/bin/bzip2
 ln -s /usr/bin/bunzip2
 ln -s /usr/bin/bzcat
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index f865b69cfed..e2856b7acaa 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
        stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
     || stdenv.isDarwin # XXX: `locale' segfaults
     || stdenv.isSunOS  # XXX: `_backsmalls1' fails, locale stuff?
+    || stdenv.isFreeBSD
   );
 
   buildInputs = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 242ce36780d..cad3ccefe1a 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation {
   buildInputs = [ pcre libiconv ];
 
   # cygwin: FAIL: multibyte-white-space
-  doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin;
+  # freebsd: FAIL mb-non-UTF8-performance
+  doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin && !stdenv.isFreeBSD;
 
   # On Mac OS X, force use of mkdir -p, since Grep's fallback
   # (./install-sh) is broken.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe9d9eccaee..e1b48ea8569 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6099,6 +6099,9 @@ let
 
   aprutil = callPackage ../development/libraries/apr-util {
     bdbSupport = true;
+    db = if stdenv.isFreeBSD then db44 else db;
+    # XXX: only the db_158 interface was available through
+    #      apr with db58 on freebsd (nov 2015), for unknown reasons
   };
 
   assimp = callPackage ../development/libraries/assimp { };
@@ -6277,7 +6280,9 @@ let
 
   cwiid = callPackage ../development/libraries/cwiid { };
 
-  cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };
+  cyrus_sasl = callPackage ../development/libraries/cyrus-sasl {
+    kerberos = if stdenv.isFreeBSD then libheimdal else kerberos;
+  };
 
   # Make bdb5 the default as it is the last release under the custom
   # bsd-like license
@@ -8526,6 +8531,8 @@ let
     python = python2;
   };
 
+  tet = callPackage ../development/tools/misc/tet { };
+
   thrift = callPackage ../development/libraries/thrift { };
 
   tidyp = callPackage ../development/libraries/tidyp { };
@@ -9552,7 +9559,9 @@ let
     ruby = ruby_2_1;
   };
 
-  shishi = callPackage ../servers/shishi { };
+  shishi = if stdenv.isFreeBSD
+  then callPackage ../servers/shishi { pam = null; }
+  else callPackage ../servers/shishi { };
 
   sipcmd = callPackage ../applications/networking/sipcmd { };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e03634c7203..41dcdcddcbf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6555,7 +6555,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "The World-Wide Web library for Perl";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.illumos;
+      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.illumos ++ stdenv.lib.platforms.freebsd;
     };
   };
 

From 55aa9163cca34107b3e3ce7ce8d7bb76fa5717a0 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Sat, 28 Nov 2015 15:06:15 +0000
Subject: [PATCH 243/249] FreeBSD: minor fixes, add notes and make stdenv more
 robust

---
 pkgs/development/libraries/boost/generic.nix  |   2 +-
 pkgs/development/libraries/expat/default.nix  |   1 -
 pkgs/development/libraries/icu/default.nix    |   2 +-
 .../libraries/kerberos/heimdal.nix            |   2 +-
 .../libraries/libelf-freebsd/default.nix      |   1 +
 .../libraries/libossp-uuid/default.nix        |   2 +-
 .../development/libraries/libtiff/default.nix |   2 +-
 .../libraries/qt-4.x/4.8/default.nix          |  11 +-
 pkgs/development/libraries/zlib/default.nix   |   3 +-
 pkgs/stdenv/freebsd/default.nix               | 122 ++-----
 pkgs/stdenv/freebsd/trivial-bootstrap.sh      | 340 +++++++++---------
 pkgs/top-level/all-packages.nix               |  14 +-
 12 files changed, 223 insertions(+), 279 deletions(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 5b497aa76b8..90e60d59da0 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 || stdenv.isFreeBSD then "clang" else null
+, toolset ? if stdenv.cc.isClang then "clang" else null
 , enableRelease ? true
 , enableDebug ? false
 , enableSingleThreaded ? false
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 78e2da3ffdb..766ef6c11c5 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
   patches = [ ./CVE-2015-1283.patch ];
 
   configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic";
-  # NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
 
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index a2196d26524..148e4f02a94 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   '';
 
   configureFlags = "--disable-debug" +
-    stdenv.lib.optionalString stdenv.isDarwin " --enable-rpath";
+    stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath";
 
   # remove dependency on bootstrap-tools in early stdenv build
   postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 3f8ed7c9de4..402087b2ded 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   ] ++ optionals (!libOnly) [
     "--with-openldap=${openldap}"
   ] ++ optionals (!stdenv.isFreeBSD) [
-    "--with-berkeley-db=${db}"
+    "--with-berkeley-db=${db}" # XXX: this should of course work, but does not, as of nov 2015 (db==db58)
     "--with-capng"
   ];
 
diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix
index 3e09d4c6cd4..26fe2d90963 100644
--- a/pkgs/development/libraries/libelf-freebsd/default.nix
+++ b/pkgs/development/libraries/libelf-freebsd/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation (rec {
   src = fetchsvn {
     url = svn://svn.code.sf.net/p/elftoolchain/code/trunk;
     rev = (stdenv.lib.strings.toInt version);
+    name = "elftoolchain-${version}";
   };
 
   buildInputs = [ gnum4 tet ];
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix
index ddfc2a5132c..72fa1a29992 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/pkgs/development/libraries/libossp-uuid/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0";
   };
 
-  configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+  configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic";
 
   meta = with stdenv.lib; {
     homepage = http://www.ossp.org/pkg/lib/uuid/;
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 7e9c11d700a..2c559d221ab 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = !stdenv.isFreeBSD;
+  doCheck = true;
 
   meta = with stdenv.lib; {
     description = "Library and utilities for working with the TIFF image file format";
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 25b547bf1cf..17e0485b29f 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
       -datadir $out/share/${name}
       -translationdir $out/share/${name}/translations
     "
-  '' + optionalString stdenv.isDarwin ''
+  '' + optionalString stdenv.cc.isClang ''
     sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf
     sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf
   '';
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
     ''
       -v -no-separate-debug-info -release -no-fast -confirm-license -opensource
 
-      -opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
+      -${if stdenv.isFreeBSD then "no-" else ""}opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
       -qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked -openssl-linked
 
       ${if mysql != null then "-plugin" else "-no"}-sql-mysql -system-sqlite
@@ -122,17 +122,18 @@ stdenv.mkDerivation rec {
   # The following libraries are only used in plugins
   buildInputs =
     [ cups # Qt dlopen's libcups instead of linking to it
-      mysql.lib postgresql sqlite libjpeg libmng libtiff icu ]
+      postgresql sqlite libjpeg libmng libtiff icu ]
+    ++ optionals (mysql != null) [ mysql.lib ]
     ++ optionals gtkStyle [ gtk gdk_pixbuf ];
 
   nativeBuildInputs = [ perl pkgconfig which ];
 
   enableParallelBuilding = false;
 
-  NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin
+  NIX_CFLAGS_COMPILE = optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
     "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
 
-  NIX_LDFLAGS = optionalString stdenv.isDarwin
+  NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
     "-lglib-2.0";
 
   preBuild = optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 99be5162010..7a6f480215c 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation (rec {
 
   # As zlib takes part in the stdenv building, we don't want references
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc " + stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc "
+                     + stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
 
   crossAttrs = {
     dontStrip = static;
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index fcc3a14d487..5455c3d8fb9 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -18,114 +18,48 @@ rec {
     ln      = "/bin/ln";
   };
 
-  stage0 = rec {
-    fetchurl = import ../../build-support/fetchurl {
-      inherit stdenv;
-      curl = bootstrapTools;
-    };
-
-    stdenv = import ../generic {
-      inherit system config;
-      name         = "stdenv-freebsd-boot-0";
-      shell        = "/usr/local/bin/bash";
-      initialPath  = [ bootstrapTools ];
-      fetchurlBoot = fetchurl;
-      cc           = null;
-    };
-  };
-
-  buildTools = { #import ../../os-specific/freebsd/command-line-tools
-    inherit (stage0) stdenv fetchurl;
-    xar  = bootstrapTools;
-    gzip = bootstrapTools;
-    cpio = bootstrapTools;
-  };
-
-  preHook = ''
-    export NIX_IGNORE_LD_THROUGH_GCC=1
-    # export NIX_DONT_SET_RPATH=1
-    export NIX_NO_SELF_RPATH=1
-    dontFixLibtool=1
-    stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
-    xargsFlags=" "
-  '';
-
-  stage1 = rec {
-    nativePrefix = "/usr";
-
+  fetchurl = import ../../build-support/fetchurl {
     stdenv = import ../generic {
       name = "stdenv-freebsd-boot-1";
-
       inherit system config;
-      inherit (stage0.stdenv) shell fetchurlBoot;
 
-      initialPath = stage0.stdenv.initialPath ++ [ nativePrefix ];
-
-      preHook = preHook + "\n" + ''
-        export NIX_LDFLAGS_AFTER+=" -L/usr/lib"
-        export NIX_ENFORCE_PURITY=
-        export NIX_CFLAGS_COMPILE+=" -isystem ${nativePrefix}/include/c++/v1"
-        export NIX_CFLAGS_LINK+=" -Wl,-rpath,${nativePrefix}/lib"
-      '';
-
-      cc = import ../../build-support/cc-wrapper {
-        nativeTools  = true;
-        nativePrefix = nativePrefix;
-        nativeLibc   = true;
-        stdenv       = stage0.stdenv;
-        shell        = "/usr/local/bin/bash";
-        cc           = {
-          name    = "clang-9.9.9";
-          cc      = "/usr";
-          outPath = nativePrefix;
-        };
-        isClang      = true;
-      };
-    };
-    pkgs = allPackages {
-      inherit system platform;
-      bootStdenv = stdenv;
+      initialPath  = null;
+      shell        = "foo";
+      fetchurlBoot = null;
+      cc = null;
     };
+    curl = bootstrapTools;
   };
 
-  stage2 = rec {
-    stdenv = import ../generic {
-      name = "stdenv-freebsd-boot-2";
-
-      inherit system config;
-      inherit (stage1.stdenv) shell fetchurlBoot preHook cc;
-
-      initialPath = [ "/usr/local/bin" ] ++ stage1.stdenv.initialPath;
-    };
-    pkgs = allPackages {
-      inherit system platform;
-      bootStdenv = stdenv;
-    };
-  };
-
-  stage3 = with stage2; import ../generic {
+  stdenvFreeBSD = import ../generic {
     name = "stdenv-freebsd-boot-3";
 
     inherit system config;
-    inherit (stdenv) fetchurlBoot;
 
-    initialPath = [ bootstrapTools ];
-
-    preHook = preHook + "\n" + ''
-      export NIX_ENFORCE_PURITY=1
-    '';
+    initialPath  = [ bootstrapTools ];
+    shell        = "${bootstrapTools}/bin/bash";
+    fetchurlBoot = fetchurl;
 
     cc = import ../../build-support/cc-wrapper {
-      inherit stdenv;
-      nativeTools   = true;
-      nativePrefix  = "/usr/local";
-      nativeLibc    = true;
-      cc            = stage2.stdenv.cc; #pkgs.llvmPackages.clang-unwrapped; 
-      isClang       = true;
+      nativeTools  = true;
+      nativePrefix = "/usr";
+      nativeLibc   = true;
+      stdenv = import ../generic {
+        inherit system config;
+        name         = "stdenv-freebsd-boot-0";
+        initialPath  = [ bootstrapTools ];
+        shell = stdenvFreeBSD.shell;
+        fetchurlBoot = fetchurl;
+        cc           = null;
+      };
+      cc           = {
+        name    = "clang-9.9.9";
+        cc      = "/usr";
+        outPath = "/usr";
+      };
+      isClang      = true;
     };
 
-    shell = "/usr/local/bin/bash";
+    preHook = ''export NIX_NO_SELF_RPATH=1'';
   };
-
-  stdenvFreeBSD = stage3;
 }
diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
index 1d7478e158a..1dc59ea7dbc 100644
--- a/pkgs/stdenv/freebsd/trivial-bootstrap.sh
+++ b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
@@ -1,189 +1,193 @@
-
-# Building bootstrap tools
 echo Building the trivial bootstrap environment...
-
-# needed FreeBSD packages:
-# findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils
+echo
+echo Needed FreeBSD packages:
+echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils
 
 $mkdir -p $out/bin
 
-$ln -s $ln $out/bin/ln
+ln () {
+  if test "x$2" != x -a -f "$out/bin/$2"; then
+    echo "$2 exists"
+    exit 1;
+  fi;
+  if test ! -f "$1"; then
+    echo Target "$2" does not exist
+    exit 1;
+  fi
+  $ln -s "$1" "$out/bin/$2"
+}
 
-PATH=$out/bin/
+ln /usr/local/bin/bash
+ln /bin/sh
 
-cd $out/bin
+ln /usr/local/bin/gmake make
 
-ln -s $mkdir
+ln /usr/local/bin/lbzip2
 
-ln -s /usr/local/bin/bash
-ln -s /bin/sh
+ln /usr/local/bin/gdiff diff
 
-ln -s /usr/local/bin/gmake make
+ln /usr/bin/locale
 
-ln -s /usr/local/bin/lbzip2
+ln /usr/bin/more
 
-ln -s /usr/local/bin/gdiff diff
+ln /usr/bin/hexdump # for bitcoin
 
-ln -s /usr/bin/locale
+ln /usr/bin/bzip2
+ln /usr/bin/bunzip2
+ln /usr/bin/bzcat
+ln /usr/bin/bzip2recover
 
-ln -s /usr/bin/more
+ln /usr/bin/xz
+ln /usr/bin/unxz
+ln /usr/bin/xzcat
+ln /usr/bin/lzma
+ln /usr/bin/unlzma
+ln /usr/bin/lzcat
 
-ln -s /usr/bin/bzip2
-ln -s /usr/bin/bunzip2
-ln -s /usr/bin/bzcat
-ln -s /usr/bin/bzip2recover
+ln /usr/local/bin/gcp cp
+ln /usr/local/bin/gdd dd
+ln /usr/local/bin/gmv mv
+ln /usr/local/bin/grm rm
+ln /usr/local/bin/gls ls
+ln /bin/ps ps
+ln /usr/local/bin/gcat cat
+ln /usr/local/bin/gecho echo
+ln /usr/local/bin/gexpr expr
+ln /usr/local/bin/gtest test
+ln /usr/local/bin/gdate date
+ln /usr/local/bin/gchmod chmod
+ln /usr/local/bin/grmdir rmdir
+ln /usr/local/bin/gsleep sleep
+ln /bin/hostname hostname
 
-ln -s /usr/bin/xz
-ln -s /usr/bin/unxz
-ln -s /usr/bin/xzcat
-ln -s /usr/bin/lzma
-ln -s /usr/bin/unlzma
-ln -s /usr/bin/lzcat
+ln /usr/local/bin/gid id
+ln /usr/local/bin/god od
+ln /usr/local/bin/gtr tr
+ln /usr/local/bin/gwc wc
+ln /usr/local/bin/gcut cut
+ln /usr/bin/cmp cmp
+ln /usr/local/bin/gsed sed
+ln /usr/local/bin/gtar tar
+ln /usr/local/bin/xar xar
+ln /usr/local/bin/gawk awk
+ln /usr/local/bin/genv env
+ln /usr/local/bin/gtee tee
+ln /usr/local/bin/gcomm comm
+ln /usr/local/bin/gcpio cpio
+ln /usr/local/bin/curl curl
+ln /usr/local/bin/gfind find
+ln /usr/local/bin/grep grep #other grep is in /usr/bin
+ln /usr/bin/gzip
+ln /usr/bin/gunzip
+ln /usr/bin/zcat
+ln /usr/local/bin/ghead head
+ln /usr/bin/tail tail
+ln /usr/local/bin/guniq uniq
+ln /usr/bin/less less
+ln /usr/local/bin/gtrue true
+# ln /usr/bin/diff diff
+ln /usr/local/bin/egrep egrep
+ln /usr/local/bin/fgrep fgrep
+ln /usr/local/bin/gpatch patch
+ln /usr/local/bin/guname uname
+ln /usr/local/bin/gtouch touch
+ln /usr/local/bin/gsplit split
+ln /usr/local/bin/gxargs xargs
+ln /usr/bin/which which
+ln /usr/local/bin/ginstall install
+ln /usr/local/bin/gbasename basename
+ln /usr/local/bin/gdirname dirname
+ln /usr/local/bin/greadlink readlink
 
-ln -s /usr/local/bin/gcp cp
-ln -s /usr/local/bin/gdd dd
-ln -s /usr/local/bin/gmv mv
-ln -s /usr/local/bin/grm rm
-ln -s /usr/local/bin/gls ls
-ln -s /bin/ps ps
-ln -s /usr/local/bin/gcat cat
-ln -s /usr/local/bin/gecho echo
-ln -s /usr/local/bin/gexpr expr
-ln -s /usr/local/bin/gtest test
-ln -s /usr/local/bin/gdate date
-ln -s /usr/local/bin/gchmod chmod
-ln -s /usr/local/bin/grmdir rmdir
-ln -s /usr/local/bin/gsleep sleep
-ln -s /bin/hostname hostname
-
-ln -s /usr/local/bin/gid id
-ln -s /usr/local/bin/god od
-ln -s /usr/local/bin/gtr tr
-ln -s /usr/local/bin/gwc wc
-ln -s /usr/local/bin/gcut cut
-ln -s /usr/bin/cmp cmp
-ln -s /usr/local/bin/gsed sed
-ln -s /usr/local/bin/gtar tar
-ln -s /usr/local/bin/xar xar
-ln -s /usr/local/bin/gawk awk
-ln -s /usr/local/bin/genv env
-ln -s /usr/local/bin/gtee tee
-ln -s /usr/local/bin/gcomm comm
-ln -s /usr/local/bin/gcpio cpio
-ln -s /usr/local/bin/curl curl
-ln -s /usr/local/bin/gfind find
-ln -s /usr/local/bin/grep grep #other grep is in /usr/bin
-ln -s /usr/bin/gzip
-ln -s /usr/bin/gunzip
-ln -s /usr/bin/zcat
-ln -s /usr/local/bin/ghead head
-ln -s /usr/bin/tail tail
-ln -s /usr/local/bin/guniq uniq
-ln -s /usr/bin/less less
-ln -s /usr/local/bin/gtrue true
-ln -s /usr/bin/diff diff
-ln -s /usr/local/bin/egrep egrep
-ln -s /usr/local/bin/fgrep fgrep
-ln -s /usr/local/bin/gpatch patch
-ln -s /usr/local/bin/guname uname
-ln -s /usr/local/bin/gtouch touch
-ln -s /usr/local/bin/gsplit split
-ln -s /usr/local/bin/gxargs xargs
-ln -s /usr/bin/which which
-ln -s /usr/local/bin/ginstall install
-ln -s /usr/local/bin/gbasename basename
-ln -s /usr/local/bin/gdirname dirname
-ln -s /usr/local/bin/greadlink readlink
-
-ln -fs /usr/local/bin/gln ln
-ln -s /usr/local/bin/gyes yes
-ln -s /usr/local/bin/gwhoami whoami
-ln -s /usr/local/bin/gvdir vdir
-ln -s /usr/local/bin/gusers users
-ln -s /usr/local/bin/guptime uptime
-ln -s /usr/local/bin/gunlink unlink
-ln -s /usr/local/bin/gtty tty
-ln -s /usr/local/bin/gunexpand unexpand
-ln -s /usr/local/bin/gtsort tsort
-ln -s /usr/local/bin/gtruncate truncate
-ln -s /usr/local/bin/gtimeout timeout
-ln -s /usr/local/bin/gtac tac
-ln -s /usr/local/bin/gsync sync
-ln -s /usr/local/bin/gsum sum
-ln -s /usr/local/bin/gstty stty
-ln -s /usr/local/bin/gstdbuf stdbuf
-ln -s /usr/local/bin/gsort sort
-ln -s /usr/local/bin/gruncon runcon
-ln -s /usr/local/bin/gseq seq
-ln -s /usr/local/bin/gsha1sum sha1sum
-ln -s /usr/local/bin/gsha224sum sha224sum
-ln -s /usr/local/bin/gsha256sum sha256sum
-ln -s /usr/local/bin/gsha384sum sha384sum
-ln -s /usr/local/bin/gsha512sum sha512sum
-ln -s /usr/local/bin/gshred shred
-ln -s /usr/local/bin/gshuf shuf
-ln -s /usr/local/bin/grealpath realpath
-ln -s "/usr/local/bin/g[" "["
-ln -s /usr/local/bin/gbase64 base64
-ln -s /usr/local/bin/gchcon chcon
-ln -s /usr/local/bin/gchgrp chgrp
-ln -s /usr/local/bin/gchown chown
-ln -s /usr/local/bin/gchroot chroot
-ln -s /usr/local/bin/gcksum cksum
-ln -s /usr/local/bin/gcsplit csplit
-ln -s /usr/local/bin/gdf df
-ln -s /usr/local/bin/gdircolors dircolors
-ln -s /usr/local/bin/gdu du
-ln -s /usr/local/bin/gexpand expand
-ln -s /usr/local/bin/gfactor factor
-ln -s /usr/local/bin/gfalse false
-ln -s /usr/local/bin/gfmt fmt
-ln -s /usr/local/bin/gfold fold
-ln -s /usr/local/bin/ggroups groups
-ln -s /usr/local/bin/ghostid hostid
-ln -s /usr/local/bin/gjoin join
-ln -s /usr/local/bin/gkill kill
-ln -s /usr/local/bin/glink link
-ln -s /usr/local/bin/glogname logname
-ln -s /usr/local/bin/gmd5sum md5sum
-ln -s /usr/local/bin/gmkdir mkdir
-ln -s /usr/local/bin/gmkfifo mkfifo
-ln -s /usr/local/bin/gmknod mknod
-ln -s /usr/local/bin/gmktemp mktemp
-ln -s /usr/local/bin/gnice nice
-ln -s /usr/local/bin/gnl nl
-ln -s /usr/local/bin/gnohup nohup
-ln -s /usr/local/bin/gnproc nproc
-ln -s /usr/local/bin/gnumfmt numfmt
-ln -s /usr/local/bin/gnustat nustat
-ln -s /usr/local/bin/gpaste paste
-ln -s /usr/local/bin/gpathchk pathchk
-ln -s /usr/local/bin/gpinky pinky
-ln -s /usr/local/bin/gpr pr
-ln -s /usr/local/bin/gprintenv printenv
-ln -s /usr/local/bin/gprintf printf
-ln -s /usr/local/bin/gptx ptx
-ln -s /usr/local/bin/gpwd pwd
+ln /usr/local/bin/gln ln
+ln /usr/local/bin/gyes yes
+ln /usr/local/bin/gwhoami whoami
+ln /usr/local/bin/gvdir vdir
+ln /usr/local/bin/gusers users
+ln /usr/local/bin/guptime uptime
+ln /usr/local/bin/gunlink unlink
+ln /usr/local/bin/gtty tty
+ln /usr/local/bin/gunexpand unexpand
+ln /usr/local/bin/gtsort tsort
+ln /usr/local/bin/gtruncate truncate
+ln /usr/local/bin/gtimeout timeout
+ln /usr/local/bin/gtac tac
+ln /usr/local/bin/gsync sync
+ln /usr/local/bin/gsum sum
+ln /usr/local/bin/gstty stty
+ln /usr/local/bin/gstdbuf stdbuf
+ln /usr/local/bin/gsort sort
+ln /usr/local/bin/gruncon runcon
+ln /usr/local/bin/gseq seq
+ln /usr/local/bin/gsha1sum sha1sum
+ln /usr/local/bin/gsha224sum sha224sum
+ln /usr/local/bin/gsha256sum sha256sum
+ln /usr/local/bin/gsha384sum sha384sum
+ln /usr/local/bin/gsha512sum sha512sum
+ln /usr/local/bin/gshred shred
+ln /usr/local/bin/gshuf shuf
+ln /usr/local/bin/grealpath realpath
+ln "/usr/local/bin/g[" "["
+ln /usr/local/bin/gbase64 base64
+ln /usr/local/bin/gchcon chcon
+ln /usr/local/bin/gchgrp chgrp
+ln /usr/local/bin/gchown chown
+ln /usr/local/bin/gchroot chroot
+ln /usr/local/bin/gcksum cksum
+ln /usr/local/bin/gcsplit csplit
+ln /usr/local/bin/gdf df
+ln /usr/local/bin/gdircolors dircolors
+ln /usr/local/bin/gdu du
+ln /usr/local/bin/gexpand expand
+ln /usr/local/bin/gfactor factor
+ln /usr/local/bin/gfalse false
+ln /usr/local/bin/gfmt fmt
+ln /usr/local/bin/gfold fold
+ln /usr/local/bin/ggroups groups
+ln /usr/local/bin/ghostid hostid
+ln /usr/local/bin/gjoin join
+ln /usr/local/bin/gkill kill
+ln /usr/local/bin/glink link
+ln /usr/local/bin/glogname logname
+ln /usr/local/bin/gmd5sum md5sum
+ln /usr/local/bin/gmkdir mkdir
+ln /usr/local/bin/gmkfifo mkfifo
+ln /usr/local/bin/gmknod mknod
+ln /usr/local/bin/gmktemp mktemp
+ln /usr/local/bin/gnice nice
+ln /usr/local/bin/gnl nl
+ln /usr/local/bin/gnohup nohup
+ln /usr/local/bin/gnproc nproc
+ln /usr/local/bin/gnumfmt numfmt
+ln /usr/local/bin/gnustat nustat
+ln /usr/local/bin/gpaste paste
+ln /usr/local/bin/gpathchk pathchk
+ln /usr/local/bin/gpinky pinky
+ln /usr/local/bin/gpr pr
+ln /usr/local/bin/gprintenv printenv
+ln /usr/local/bin/gprintf printf
+ln /usr/local/bin/gptx ptx
+ln /usr/local/bin/gpwd pwd
 
 # binutils
 # pkg info -l binutils | grep usr/local/bin
-ln -s /usr/local/bin/addr2line
-ln -s /usr/local/bin/ar
-ln -s /usr/local/bin/as
-ln -s /usr/local/bin/c++filt
-ln -s /usr/local/bin/dwp
-ln -s /usr/local/bin/elfedit
-ln -s /usr/local/bin/gprof
-ln -s /usr/local/bin/ld
-ln -s /usr/local/bin/ld.bfd
-ln -s /usr/local/bin/ld.gold
-ln -s /usr/local/bin/nm
-ln -s /usr/local/bin/objcopy
-ln -s /usr/local/bin/objdump
-ln -s /usr/local/bin/ranlib
-ln -s /usr/local/bin/readelf
-ln -s /usr/local/bin/size
-ln -s /usr/local/bin/strings
-ln -s /usr/local/bin/strip
+ln /usr/local/bin/addr2line
+ln /usr/local/bin/ar
+ln /usr/local/bin/as
+ln /usr/local/bin/c++filt
+ln /usr/local/bin/dwp
+ln /usr/local/bin/elfedit
+ln /usr/local/bin/gprof
+ln /usr/local/bin/ld
+ln /usr/local/bin/ld.bfd
+ln /usr/local/bin/ld.gold
+ln /usr/local/bin/nm
+ln /usr/local/bin/objcopy
+ln /usr/local/bin/objdump
+ln /usr/local/bin/ranlib
+ln /usr/local/bin/readelf
+ln /usr/local/bin/size
+ln /usr/local/bin/strings
+ln /usr/local/bin/strip
 
 #pkg info -l llvm37 | grep usr/local/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1b48ea8569..0e8e030a18a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6099,8 +6099,8 @@ let
 
   aprutil = callPackage ../development/libraries/apr-util {
     bdbSupport = true;
-    db = if stdenv.isFreeBSD then db44 else db;
-    # XXX: only the db_158 interface was available through
+    db = if stdenv.isFreeBSD then db47 else db;
+    # XXX: only the db_185 interface was available through
     #      apr with db58 on freebsd (nov 2015), for unknown reasons
   };
 
@@ -8163,6 +8163,9 @@ let
     mesa = mesa_noglu;
     inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
     cups = if stdenv.isLinux then cups else null;
+
+    # XXX: mariadb doesn't built on fbsd as of nov 2015
+    mysql = if (!stdenv.isFreeBSD) then mysql else null;
   };
 
   qt48Full = appendToName "full" (qt48.override {
@@ -9559,9 +9562,10 @@ let
     ruby = ruby_2_1;
   };
 
-  shishi = if stdenv.isFreeBSD
-  then callPackage ../servers/shishi { pam = null; }
-  else callPackage ../servers/shishi { };
+  shishi = callPackage ../servers/shishi {
+      pam = if stdenv.isLinux then pam else null;
+      # see also openssl, which has/had this same trick
+  };
 
   sipcmd = callPackage ../applications/networking/sipcmd { };
 

From cbcab5521b6247845a54ab36279fb1fee95b36d3 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Wed, 23 Dec 2015 13:51:11 +0000
Subject: [PATCH 244/249] FreeBSD: re-add heimdal

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

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 402087b2ded..e17d0c19e03 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -35,10 +35,10 @@ stdenv.mkDerivation rec {
     "--with-libedit=${libedit}"
     "--with-openssl=${openssl}"
     "--without-x"
+    "--with-berkeley-db=${db}"
   ] ++ optionals (!libOnly) [
     "--with-openldap=${openldap}"
   ] ++ optionals (!stdenv.isFreeBSD) [
-    "--with-berkeley-db=${db}" # XXX: this should of course work, but does not, as of nov 2015 (db==db58)
     "--with-capng"
   ];
 

From 3c8f0a92d35a4c9fffb4c6bfb1fcfe75dbefa0d1 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Thu, 24 Dec 2015 02:04:18 +0000
Subject: [PATCH 245/249] FreeBSD: improve bootstrapping, re-enable bdb for
 heimdal

---
 pkgs/stdenv/freebsd/default.nix          |  6 ++---
 pkgs/stdenv/freebsd/trivial-bootstrap.sh | 29 ++++++++++++++++--------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 5455c3d8fb9..3c4e2bb9766 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -11,7 +11,7 @@ rec {
     inherit system;
 
     name    = "trivial-bootstrap-tools";
-    builder = "/bin/sh";
+    builder = "/usr/local/bin/bash";
     args    = [ ./trivial-bootstrap.sh ];
 
     mkdir   = "/bin/mkdir";
@@ -23,8 +23,8 @@ rec {
       name = "stdenv-freebsd-boot-1";
       inherit system config;
 
-      initialPath  = null;
-      shell        = "foo";
+      initialPath  = [ "/" "/usr" ];
+      shell        = "${bootstrapTools}/bin/bash";
       fetchurlBoot = null;
       cc = null;
     };
diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
index 1dc59ea7dbc..fbff4575e5a 100644
--- a/pkgs/stdenv/freebsd/trivial-bootstrap.sh
+++ b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
@@ -1,3 +1,7 @@
+set -e
+set -o nounset
+set -o pipefail
+
 echo Building the trivial bootstrap environment...
 echo
 echo Needed FreeBSD packages:
@@ -6,15 +10,22 @@ echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gp
 $mkdir -p $out/bin
 
 ln () {
-  if test "x$2" != x -a -f "$out/bin/$2"; then
-    echo "$2 exists"
-    exit 1;
-  fi;
+  if [ ! -z "${2:-}" ]; then
+    if [ -f "$out/bin/$2" ]; then
+      echo "$2 exists"
+      exit 1
+    fi
+  fi
   if test ! -f "$1"; then
     echo Target "$2" does not exist
-    exit 1;
+    exit 1
+  fi
+  # TODO: check that destination directory exists
+  if [ ! -z "${2:-}" ]; then
+    $ln -s "$1" "$out/bin/$2"
+  else
+    $ln -s "$1" "$out/bin/"
   fi
-  $ln -s "$1" "$out/bin/$2"
 }
 
 ln /usr/local/bin/bash
@@ -76,16 +87,16 @@ ln /usr/local/bin/gcomm comm
 ln /usr/local/bin/gcpio cpio
 ln /usr/local/bin/curl curl
 ln /usr/local/bin/gfind find
-ln /usr/local/bin/grep grep #other grep is in /usr/bin
+ln /usr/local/bin/grep grep # other grep is in /usr/bin
 ln /usr/bin/gzip
 ln /usr/bin/gunzip
 ln /usr/bin/zcat
 ln /usr/local/bin/ghead head
-ln /usr/bin/tail tail
+ln /usr/bin/tail tail # note that we are not using gtail!!!
 ln /usr/local/bin/guniq uniq
 ln /usr/bin/less less
 ln /usr/local/bin/gtrue true
-# ln /usr/bin/diff diff
+# ln /usr/bin/diff diff # we are using gdiff (see above)
 ln /usr/local/bin/egrep egrep
 ln /usr/local/bin/fgrep fgrep
 ln /usr/local/bin/gpatch patch

From 072da541de9a00837fc4e21c2bf4a967b4d63713 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Fri, 1 Jan 2016 16:59:35 +0000
Subject: [PATCH 246/249] FreeBSD: undo removal of Solaris and remove changes
 to native stdenv now that FreeBSD has its own

---
 pkgs/development/compilers/sbcl/bootstrap.nix |  1 +
 pkgs/stdenv/native/default.nix                | 94 -------------------
 2 files changed, 1 insertion(+), 94 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 4152bb8b2a3..f8352f0a362 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -23,6 +23,7 @@ let
       sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5";
     };
     armv6l-linux = armv7l-linux;
+    x86_64-solaris = x86_64-linux;
     x86_64-freebsd = rec {
       version = "1.2.7";
       system = "x86-64-freebsd";
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 93d1c7e971c..bd90d580d3f 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -24,100 +24,6 @@ rec {
     alias make=gmake
     alias tar=gtar
     alias sed=gsed
-
-    alias patch=gpatch # pcre relied on this for patching binary files
-
-    # we need GNU cp for --reflink, need to alias all of coreutils
-    alias basename=gbasename
-    alias cat=gcat
-    alias chgrp=gchgrp
-    alias chmod=gchmod
-    alias chown=gchown
-    alias chroot=gchroot
-    alias cksum=gcksum
-    alias comm=gcomm
-    alias cp=gcp
-    alias csplit=gcsplit
-    alias cut=gcut
-    alias date=gdate
-    alias dd=gdd
-    alias df=gdf
-    alias dir=gdir
-    alias dircolors=gdircolors
-    alias dirname=gdirname
-    alias du=gdu
-    alias echo=gecho
-    alias env=genv
-    alias expand=gexpand
-    alias expr=gexpr
-    alias factor=gfactor
-    alias false=gfalse
-    alias fmt=gfmt
-    alias fold=gfold
-    alias groups=ggroups
-    alias head=ghead
-    alias hostid=ghostid
-    alias hostname=ghostname
-    alias id=gid
-    alias install=ginstall
-    alias join=gjoin
-    alias kill=gkill
-    alias link=glink
-    alias ln=gln
-    alias logname=glogname
-    alias ls=gls
-    alias md5sum=gmd5sum
-    alias mkdir=gmkdir
-    alias mkfifo=gmkfifo
-    alias mknod=gmknod
-    alias mv=gmv
-    alias nice=gnice
-    alias nl=gnl
-    alias nohup=gnohup
-    alias od=god
-    alias paste=gpaste
-    alias pathchk=gpathchk
-    alias pinky=gpinky
-    alias pr=gpr
-    alias printenv=gprintenv
-    alias printf=gprintf
-    alias ptx=gptx
-    alias pwd=gpwd
-    alias readlink=greadlink
-    alias rm=grm
-    alias rmdir=grmdir
-    alias seq=gseq
-    alias sha1sum=gsha1sum
-    alias shred=gshred
-    alias sleep=gsleep
-    alias sort=gsort
-    alias split=gsplit
-    alias stat=gstat
-    alias stty=gstty
-    alias su=gsu
-    alias sum=gsum
-    alias sync=gsync
-    alias tac=gtac
-    #alias tail=gtail # this breaks xz XXX
-    alias tee=gtee
-    alias test=gtest
-    alias touch=gtouch
-    alias tr=gtr
-    alias true=gtrue
-    alias tsort=gtsort
-    alias tty=gtty
-    alias uname=guname
-    alias unexpand=gunexpand
-    alias uniq=guniq
-    alias unlink=gunlink
-    alias uptime=guptime
-    alias users=gusers
-    alias vdir=gvdir
-    alias wc=gwc
-    alias who=gwho
-    alias whoami=gwhoami
-    alias yes=gyes
-
     export MAKE=gmake
     shopt -s expand_aliases
   '';

From 1878ac9335e86631a92320ca0c3894f56b278a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 09:54:36 +0100
Subject: [PATCH 247/249] tree-wide: various cleanups

It's mainly refactoring and mass-rebuild simplifications without any
real impact (besides better readability).
---
 pkgs/development/libraries/expat/default.nix      |  2 +-
 pkgs/development/libraries/kerberos/heimdal.nix   |  3 ++-
 pkgs/development/libraries/kerberos/krb5.nix      |  4 ++--
 pkgs/development/libraries/libedit/default.nix    | 14 ++++++--------
 pkgs/development/libraries/libiconv/default.nix   | 15 ++++++++-------
 .../libraries/libossp-uuid/default.nix            |  2 +-
 pkgs/tools/networking/miniupnpc/default.nix       |  4 ++--
 pkgs/top-level/perl-packages.nix                  |  8 ++++----
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 766ef6c11c5..96d46649d91 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./CVE-2015-1283.patch ];
 
-  configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic";
+  configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index e17d0c19e03..175d0c7bc3b 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex ]
     ++ (with perlPackages; [ JSON ])
     ++ optional (!libOnly) texinfo;
-  buildInputs = (if (!stdenv.isFreeBSD) then [ libcap_ng db ] else []) ++ [ sqlite openssl libedit ]
+  buildInputs = optionals (!stdenv.isFreeBSD) [ libcap_ng db ]
+    ++ [ sqlite openssl libedit ]
     ++ optionals (!libOnly) [ openldap pam ];
 
   ## ugly, X should be made an option
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index b263a4ef06c..e735285231e 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
     sha256 = "1sgr61cnkgc5xazijaww6wpn5fnxl9vyj9ixk3r3y7ikv3x0gnyf";
   };
 
-  configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD ''WARN_CFLAGS=""'';
+  configureFlags = optional stdenv.isFreeBSD ''WARN_CFLAGS=""'';
 
   nativeBuildInputs = [ pkgconfig perl yacc ]
     # Provides the mig command used by the build scripts
-    ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds;
+    ++ optional stdenv.isDarwin bootstrap_cmds;
   buildInputs = [ openssl ]
     ++ optionals (!libOnly) [ openldap libedit ];
 
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 5234c16e135..6e8d85cb88d 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -11,23 +11,21 @@ stdenv.mkDerivation rec {
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
   NROFF = "${groff}/bin/nroff";
 
-  patches = if stdenv.isCygwin then [
-    ./01-cygwin.patch
-  ] else [ ] ++ [ ./freebsd-wchar.patch ];
+  patches = [ ./01-cygwin.patch ./freebsd-wchar.patch ];
+
+  propagatedBuildInputs = [ ncurses ];
+
+  configureFlags = [ "--enable-widec" ];
 
   postInstall = ''
     find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \
       -e 's,-lncurses[a-z]*,-L${ncurses}/lib -lncursesw,g'
   '';
 
-  configureFlags = [ "--enable-widec" ];
-
-  propagatedBuildInputs = [ ncurses ];
-
   meta = with stdenv.lib; {
     homepage = "http://www.thrysoee.dk/editline/";
     description = "A port of the NetBSD Editline library (libedit)";
-    license = licenses.bsd3; 
+    license = licenses.bsd3;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 24a0376f0f9..f5818c3bf4c 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, lib }:
 
 assert (!stdenv.isLinux);
 
@@ -10,17 +10,18 @@ stdenv.mkDerivation rec {
     sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj";
   };
 
-  patches = if stdenv.isCygwin then [
+  patches = lib.optionals stdenv.isCygwin [
     ./libiconv-1.14-reloc.patch
     ./libiconv-1.14-wchar.patch
-  ] else null;
+  ];
 
+  configureFlags =
   # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL
   # (Windows' linker would need to be used somehow to produce an actual
   # DLL.)  Thus, build the static library too, and this is what Gettext
   # will actually use.
-  configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else
-                   if stdenv.isFreeBSD then [ "--with-pic" ] else null;
+    lib.optional stdenv.isCygwin "--enable-static"
+    ++ lib.optional stdenv.isFreeBSD "--with-pic";
 
   crossAttrs = {
     # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW).
@@ -42,11 +43,11 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = http://www.gnu.org/software/libiconv/;
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
 
     # This library is not needed on GNU platforms.
-    hydraPlatforms = stdenv.lib.platforms.cygwin ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.freebsd;
+    hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd;
   };
 }
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix
index 72fa1a29992..ddfc2a5132c 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/pkgs/development/libraries/libossp-uuid/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0";
   };
 
-  configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic";
+  configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
   meta = with stdenv.lib; {
     homepage = http://www.ossp.org/pkg/lib/uuid/;
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 644045800d4..e5b6ea396fe 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     name = "${name}.tar.gz";
   };
 
-  patches = stdenv.lib.optional stdenv.isFreeBSD [ ./freebsd.patch ];
+  patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch;
 
   doCheck = !stdenv.isFreeBSD;
 
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     inherit version;
     homepage = http://miniupnp.free.fr/;
     description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd;
+    platforms = with stdenv.lib.platforms; linux ++ freebsd;
   };
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 41dcdcddcbf..97b2740f6c7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6339,7 +6339,7 @@ let self = _self // overrides; _self = with self; {
   LocaleGettext = buildPerlPackage {
     name = "LocaleGettext-1.05";
     buildInputs = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext;
-    NIX_CFLAGS_LINK = if (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) then "-lintl" else null;
+    NIX_CFLAGS_LINK = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) "-lintl";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz;
       sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7";
@@ -6552,10 +6552,10 @@ let self = _self // overrides; _self = with self; {
     };
     patches = [ ../development/perl-modules/lwp-test-with-localhost.patch ];
     propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP URI WWWRobotRules ];
-    meta = {
+    meta = with stdenv.lib; {
       description = "The World-Wide Web library for Perl";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.illumos ++ stdenv.lib.platforms.freebsd;
+      license = with licenses; [ artistic1 gpl1Plus ];
+      platforms = platforms.unix;
     };
   };
 

From 9b091e8a0c6dcb5892e2a9e704e952d8ea333525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Jan 2016 11:44:38 +0100
Subject: [PATCH 248/249] krb5: simplify unpacking

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

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index e735285231e..5b2b0954203 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -26,11 +26,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl ]
     ++ optionals (!libOnly) [ openldap libedit ];
 
-  unpackPhase = ''
-    tar -xf $src
-    #tar -xzf krb5-${version}.tar.gz
-    cd krb5-${version}/src
-  '';
+  preConfigure = "cd ./src";
 
   buildPhase = optionalString libOnly ''
     (cd util; make -j $NIX_BUILD_CORES)

From aa4562596f4cc5a53eae70fdf75a8995cc001c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 5 Jan 2016 09:42:56 +0100
Subject: [PATCH 249/249] apr-util: refactor options

---
 .../libraries/apr-util/default.nix            | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index e0b2832f6e4..c123740f5c1 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -20,18 +20,19 @@ stdenv.mkDerivation rec {
     sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
   };
 
-  patches = stdenv.lib.optionals stdenv.isFreeBSD [ ./include-static-dependencies.patch ];
+  patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch;
 
-  buildInputs = stdenv.lib.optionals stdenv.isFreeBSD [ autoreconfHook ];
+  buildInputs = optional stdenv.isFreeBSD autoreconfHook;
 
-  configureFlags = ''
-    --with-apr=${apr} --with-expat=${expat}
-    ${optionalString (!stdenv.isCygwin) "--with-crypto"}
-    ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"}
-    ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
-    ${stdenv.lib.optionalString ldapSupport "--with-ldap=ldap"}${
-      optionalString stdenv.isCygwin "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
-  '';
+  configureFlags = [ "--with-apr=${apr}" "--with-expat=${expat}" ]
+    ++ optional (!stdenv.isCygwin) "--with-crypto"
+    ++ optional sslSupport "--with-openssl=${openssl}"
+    ++ optional bdbSupport "--with-berkeley-db=${db}"
+    ++ optional ldapSupport "--with-ldap=ldap"
+    ++ optionals stdenv.isCygwin
+      [ "--without-pgsql" "--without-sqlite2" "--without-sqlite3"
+        "--without-freetds" "--without-berkeley-db" "--without-crypto" ]
+    ;
 
   propagatedBuildInputs = [ makeWrapper apr expat libiconv ]
     ++ optional sslSupport openssl