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

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

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

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

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

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

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

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

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

From c420de6b05710cccee5b0d9e5573ae36c3e31c5e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 22 Jan 2016 18:49:33 +0100
Subject: [PATCH 004/338] gobject-introspection: Fix patching shared objects

The gi-r-scanner is generating a list of shared libraries that are
referenced in the shared-library attribute of the <namespace/> element
of the GIR file. However, this attribute only contains the names of the
libraries and not the full store paths, like for example while preparing
to package libblockdev, the following items were included in the
shared-library attribute:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  libm.so.6
  libdmraid.so.1.0.0.rc16
  libbd_utils.so.0

Unfortunately, loading such a library without setting LD_LIBRARY_PATH is
going to fail finding libm.so.6 and libdmraid.so.1.0.0.rc16.

Now the first attempt at solving this was to put absolute paths of all
the libraries referenced in the shared-library attribute, but this also
led up to including paths of build-time shared objects into that
attribute:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  /nix/store/...-glibc-2.21/lib/libm.so.6
  /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16
  /tmp/nix-build-libblockdev-1.3.drv-0/.../utils/.libs/libbd_utils.so.0

This of course is not what we want, so the final solution is to only
use the absolute path whenever it is a Nix path and leave the library
name as-is if the path doesn't reside within the store, like this:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  /nix/store/...-glibc-2.21/lib/libm.so.6
  /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16
  libbd_utils.so.0

The downside of this approach is that if not even the output path of the
library is in LD_LIBRARY_PATH, even loading of libbd_utils.so.0 could
fail, so we need to patch the loader as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../absolute_shlib_path.patch                 | 40 +++++++++++++++++--
 .../gobject-introspection/default.nix         |  9 ++++-
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 04bcc42a032..2803d767dc7 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -1,6 +1,40 @@
---- ./giscanner/utils.py.orig	2014-08-14 22:05:05.055334080 +0200
-+++ ./giscanner/utils.py	2014-08-14 22:05:24.687497334 +0200
-@@ -110,17 +110,11 @@
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index 838d343..9dbdc0f 100644
+--- a/giscanner/shlibs.py
++++ b/giscanner/shlibs.py
+@@ -53,10 +53,24 @@ def _resolve_libtool(options, binary, libraries):
+ # Match absolute paths on OS X to conform to how libraries are usually
+ # referenced on OS X systems.
+ def _ldd_library_pattern(library_name):
++    nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/'))
+     pattern = "(?<![A-Za-z0-9_-])(lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
+-    if platform.system() == 'Darwin':
+-        pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
+-    return re.compile(pattern % re.escape(library_name))
++    pattern = r'''
++        (
++          (?:
++            # First match Nix store paths because they need to be absolute.
++            (?:%s(?:/[^/]*)+)
++            # Everything else not a store path remains relative, because we
++            # would end up having absolute build paths in the resulting GIR
++            # file.
++            | (?<=/)
++          )
++          # And finally the library itself:
++          (?:lib%s[^A-Za-z0-9_-][^\s\(\)]*)
++        )
++    '''
++    return re.compile(pattern % (nix_store_dir, re.escape(library_name)),
++                      re.VERBOSE)
+ 
+ 
+ # This is a what we do for non-la files. We assume that we are on an
+diff --git a/giscanner/utils.py b/giscanner/utils.py
+index 660081e..c9c767a 100644
+--- a/giscanner/utils.py
++++ b/giscanner/utils.py
+@@ -109,17 +109,11 @@ def extract_libtool_shlib(la_file):
      if dlname is None:
          return None
  
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index f429e1dc6c3..c2f60d460d7 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
-, libintlOrEmpty, autoconf, automake, otool }:
+, libintlOrEmpty, autoconf, automake, otool
+, substituteAll, nixStoreDir ? "/nix/store"
+}:
 # now that gobjectIntrospection creates large .gir files (eg gtk3 case)
 # it may be worth thinking about using multiple derivation outputs
 # In that case its about 6MB which could be separated
@@ -33,7 +35,10 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  patches = [ ./absolute_shlib_path.patch ];
+  patches = stdenv.lib.singleton (substituteAll {
+    src = ./absolute_shlib_path.patch;
+    inherit nixStoreDir;
+  });
 
   meta = with stdenv.lib; {
     description = "A middleware layer between C libraries and language bindings";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8f01dda21f..b04d2c1457b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6639,7 +6639,9 @@ let
   #GMP ex-satellite, so better keep it near gmp
   mpfr = callPackage ../development/libraries/mpfr/default.nix { };
 
-  gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { };
+  gobjectIntrospection = callPackage ../development/libraries/gobject-introspection {
+    nixStoreDir = config.nix.storeDir or "/nix/store";
+  };
 
   goocanvas = callPackage ../development/libraries/goocanvas { };
 

From c83e697aa0c3a1e3125db703f97e1048b92d0be1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 22 Jan 2016 22:37:00 +0100
Subject: [PATCH 005/338] gobject-introspection: Add fallback for libraries

After patching up the shared libraries in c420de6 to use absolute paths,
there are still some libraries left which do not get an absolute paths
assigned.

Those libraries are the ones which have an absolute path outside of the
Nix store, so we assume that they're build products of the current build
and make them absolute by prepending "$out/lib" or "$lib/lib" (depending
on whether it's a multiple output derivation or not) to its basename.

So for my test case, the resulting library paths now look like this:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  /nix/store/...-glibc-2.21/lib/libm.so.6
  /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16
  /nix/store/...-libblockdev-1.3/lib/libbd_utils.so.0

Which is perfectly fine and everything gets resolved correctly after
importing the library using GI.

However, I didn't test it against other libraries and programs, so this
still needs testing, especially for Darwin.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../absolute_shlib_path.patch                 | 65 ++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 2803d767dc7..84f303b42a0 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -1,5 +1,55 @@
+diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
+index 89ec193..8ee92c3 100755
+--- a/giscanner/scannermain.py
++++ b/giscanner/scannermain.py
+@@ -94,6 +94,34 @@ def get_windows_option_group(parser):
+     return group
+ 
+ 
++def _get_default_fallback_libpath():
++    outputs = os.environ.get("outputs", "out").split()
++    if "lib" in outputs:
++        # For multiple output derivations let's try whether there is a $lib
++        # environment variable and use that as the base store path.
++        store_path = os.environ.get("lib")
++    elif "out" in outputs:
++        # Otherwise we have a single output derivation, so the libraries most
++        # certainly will end up in "$out/lib".
++        store_path = os.environ.get("out")
++
++    if store_path is not None:
++        # Even if we have a $lib as output, there still should be a $lib/lib
++        # directory.
++        return os.path.join(store_path, 'lib')
++    else:
++        # If we haven't found a possible scenario, let's return an empty string
++        # so that the shared library won't be prepended with a path.
++        #
++        # Note that this doesn't mean that all hope is lost, because after all
++        # we can still use --fallback-library-path to set one.
++        #
++        # Also, we're not returning None, because that would make it very
++        # difficult to disable adding fallback paths altogether using something
++        # like: --fallback-library-path=""
++        return ""
++
++
+ def _get_option_parser():
+     parser = optparse.OptionParser('%prog [options] sources')
+     parser.add_option('', "--quiet",
+@@ -200,6 +228,10 @@ match the namespace prefix.""")
+     parser.add_option("", "--filelist",
+                       action="store", dest="filelist", default=[],
+                       help="file containing headers and sources to be scanned")
++    parser.add_option("", "--fallback-library-path",
++                      action="store", dest="fallback_libpath",
++                      default=_get_default_fallback_libpath(),
++                      help="Path to prepend to unknown shared libraries")
+ 
+     group = get_preprocessor_option_group(parser)
+     parser.add_option_group(group)
 diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 838d343..9dbdc0f 100644
+index 838d343..35b6dab 100644
 --- a/giscanner/shlibs.py
 +++ b/giscanner/shlibs.py
 @@ -53,10 +53,24 @@ def _resolve_libtool(options, binary, libraries):
@@ -30,6 +80,19 @@ index 838d343..9dbdc0f 100644
  
  
  # This is a what we do for non-la files. We assume that we are on an
+@@ -115,7 +129,11 @@ def _resolve_non_libtool(options, binary, libraries):
+                 m = pattern.search(line)
+                 if m:
+                     del patterns[library]
+-                    shlibs.append(m.group(1))
++                    match = m.group(1)
++                    if not match.startswith('/') \
++                       and len(options.fallback_libpath) > 0:
++                        match = os.path.join(options.fallback_libpath, match)
++                    shlibs.append(match)
+                     break
+ 
+         if len(patterns) > 0:
 diff --git a/giscanner/utils.py b/giscanner/utils.py
 index 660081e..c9c767a 100644
 --- a/giscanner/utils.py

From 723f7f8f4fc44f0621227e1feaf61901fca12db9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 22 Jan 2016 23:55:31 +0100
Subject: [PATCH 006/338] gobject-introspection: Don't hardcode /nix/store

If no config.nix.storeDir has been set, don't fall back to "/nix/store"
but use builtins.storeDir instead so we always should end up with the
correct store path no matter whether config.nix.storeDir has been set.

Thanks to @lethalman for pointing this out.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/gobject-introspection/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index c2f60d460d7..2567975aa66 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
 , libintlOrEmpty, autoconf, automake, otool
-, substituteAll, nixStoreDir ? "/nix/store"
+, substituteAll, nixStoreDir ? builtins.storeDir
 }:
 # now that gobjectIntrospection creates large .gir files (eg gtk3 case)
 # it may be worth thinking about using multiple derivation outputs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b04d2c1457b..8d270ce7f86 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6640,7 +6640,7 @@ let
   mpfr = callPackage ../development/libraries/mpfr/default.nix { };
 
   gobjectIntrospection = callPackage ../development/libraries/gobject-introspection {
-    nixStoreDir = config.nix.storeDir or "/nix/store";
+    nixStoreDir = config.nix.storeDir or builtins.storeDir;
   };
 
   goocanvas = callPackage ../development/libraries/goocanvas { };

From b3b444a79e53d4362a5995d01401b732f0b67eef Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 23 Jan 2016 00:14:53 +0100
Subject: [PATCH 007/338] gobject-introspection: Improve comment in patch

As the comment needed explanation, that it's about temporary build
files, this should do better.

Thanks again to @lethalman for pointing that out.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../gobject-introspection/absolute_shlib_path.patch         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 84f303b42a0..1cec9c1e1a5 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -49,7 +49,7 @@ index 89ec193..8ee92c3 100755
      group = get_preprocessor_option_group(parser)
      parser.add_option_group(group)
 diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 838d343..35b6dab 100644
+index 838d343..ca7fc0d 100644
 --- a/giscanner/shlibs.py
 +++ b/giscanner/shlibs.py
 @@ -53,10 +53,24 @@ def _resolve_libtool(options, binary, libraries):
@@ -67,8 +67,8 @@ index 838d343..35b6dab 100644
 +            # First match Nix store paths because they need to be absolute.
 +            (?:%s(?:/[^/]*)+)
 +            # Everything else not a store path remains relative, because we
-+            # would end up having absolute build paths in the resulting GIR
-+            # file.
++            # would end up with temporary paths that are only valid during
++            # build time in the resulting GIR file.
 +            | (?<=/)
 +          )
 +          # And finally the library itself:

From 740b30b937ee42a3ae3596e6c9ba0a08742db5d9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 23 Jan 2016 16:24:03 +0100
Subject: [PATCH 008/338] gobject-introspection: Deal with $outputLib

Once #7701 gets merged, we have another environment variable called
$outputLib, which then points to another environment variable which is
the final library output.

This was brought up in discussion with @lethalman and @vcunat in:

https://github.com/NixOS/nixpkgs/pull/12558#discussion_r50599813

The closure-size branch is not yet merged into master, so this is only
a preparation and we're still falling back to $out and $lib whenever
$outputLib isn't available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../absolute_shlib_path.patch                 | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 1cec9c1e1a5..49e059befdb 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -1,21 +1,26 @@
 diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
-index 89ec193..8ee92c3 100755
+index 89ec193..54f1d2e 100755
 --- a/giscanner/scannermain.py
 +++ b/giscanner/scannermain.py
-@@ -94,6 +94,34 @@ def get_windows_option_group(parser):
+@@ -94,6 +94,39 @@ def get_windows_option_group(parser):
      return group
  
  
 +def _get_default_fallback_libpath():
-+    outputs = os.environ.get("outputs", "out").split()
-+    if "lib" in outputs:
-+        # For multiple output derivations let's try whether there is a $lib
-+        # environment variable and use that as the base store path.
-+        store_path = os.environ.get("lib")
-+    elif "out" in outputs:
-+        # Otherwise we have a single output derivation, so the libraries most
-+        # certainly will end up in "$out/lib".
-+        store_path = os.environ.get("out")
++    # Newer multiple-output-optimized stdenv has an environment variable
++    # $outputLib which in turn specifies another variable which then is used as
++    # the destination for the library contents (${!outputLib}/lib).
++    store_path = os.environ.get(os.environ.get("outputLib"))
++    if store_path is None:
++        outputs = os.environ.get("outputs", "out").split()
++        if "lib" in outputs:
++            # For multiple output derivations let's try whether there is a $lib
++            # environment variable and use that as the base store path.
++            store_path = os.environ.get("lib")
++        elif "out" in outputs:
++            # Otherwise we have a single output derivation, so the libraries
++            # most certainly will end up in "$out/lib".
++            store_path = os.environ.get("out")
 +
 +    if store_path is not None:
 +        # Even if we have a $lib as output, there still should be a $lib/lib
@@ -37,7 +42,7 @@ index 89ec193..8ee92c3 100755
  def _get_option_parser():
      parser = optparse.OptionParser('%prog [options] sources')
      parser.add_option('', "--quiet",
-@@ -200,6 +228,10 @@ match the namespace prefix.""")
+@@ -200,6 +233,10 @@ match the namespace prefix.""")
      parser.add_option("", "--filelist",
                        action="store", dest="filelist", default=[],
                        help="file containing headers and sources to be scanned")

From a4d977e01fe50c804013cc29dbd18f5f2f4efcfc Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Tue, 15 Dec 2015 15:07:40 +0300
Subject: [PATCH 009/338] syncthing: support SOCKS5 proxying for relays

---
 .../modules/services/networking/syncthing.nix | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index f5d5e1d2556..67b90516b99 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -33,6 +33,17 @@ in
         '';
       };
 
+      all_proxy = mkOption {
+        type = types.string;
+        default = "";
+        example = "socks5://address.com:1234";
+        description = ''
+          Overwrites all_proxy environment variable for the syncthing process to
+          the given value. This is normaly used to let relay client connect
+          through SOCKS5 proxy server.
+        '';
+      };
+
       dataDir = mkOption {
         default = "/var/lib/syncthing";
         description = ''
@@ -51,7 +62,6 @@ in
       };
 
 
-
     };
 
   };
@@ -66,8 +76,13 @@ in
         description = "Syncthing service";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        environment.STNORESTART = "yes";  # do not self-restart
-        environment.STNOUPGRADE = "yes";
+        environment = {
+          STNORESTART = "yes";  # do not self-restart
+          STNOUPGRADE = "yes";
+        } //
+        (config.networking.proxy.envVars) //
+        (if cfg.all_proxy != "" then { all_proxy = cfg.all_proxy; } else {});
+
         serviceConfig = {
           User = "${cfg.user}";
           PermissionsStartOnly = true;

From b34b05b3b8ca274da28184371382d683100a806c Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Mon, 1 Feb 2016 18:44:20 +0100
Subject: [PATCH 010/338] Hunspell: add wrapper to include dictionaries

use like this:
(hunspellWithDicts (with hunspellDicts; [en-us en-gb-ise]))
---
 pkgs/development/libraries/hunspell/wrapper.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/hunspell/wrapper.nix

diff --git a/pkgs/development/libraries/hunspell/wrapper.nix b/pkgs/development/libraries/hunspell/wrapper.nix
new file mode 100644
index 00000000000..88f18e6283d
--- /dev/null
+++ b/pkgs/development/libraries/hunspell/wrapper.nix
@@ -0,0 +1,13 @@
+{ stdenv, lib, hunspell, makeWrapper, dicts ? [] }:
+with lib;
+let
+  searchPath = makeSearchPath "share/hunspell" dicts;
+in
+stdenv.mkDerivation {
+  name = (appendToName "with-dicts" hunspell).name;
+  buildInputs = [ makeWrapper ];
+  buildCommand = ''
+    makeWrapper ${hunspell}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath}
+  '';
+  inherit (hunspell) meta;
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92fd1d49a66..962283f7132 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6856,6 +6856,8 @@ let
 
   hunspellDicts = recurseIntoAttrs (callPackages ../development/libraries/hunspell/dictionaries.nix {});
 
+  hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; };
+
   hwloc = callPackage ../development/libraries/hwloc {};
 
   hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };

From a1ac6733e3dacbcbdb13877f36e897a592926f6b Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 14 Feb 2016 18:22:49 +0000
Subject: [PATCH 011/338] clutter: add gtk3 as a build input

This fixes #12106.
---
 pkgs/development/libraries/clutter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 37b2c73fe44..f101e3c1880 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
 , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
-gobjectIntrospection 
+gobjectIntrospection, gtk3
 }:
 
 let
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs =
     [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib gobjectIntrospection
+      atk json_glib gobjectIntrospection gtk3
     ];
 
   configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK

From a0661f84f0b2861ca5051aceefa3635b4482eec1 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 16 Feb 2016 21:04:18 +0100
Subject: [PATCH 012/338] dropbox: 3.12.6 -> 3.14.5

Also updates qt5 dependency to qt55, as per release notes: https://www.dropboxforum.com/hc/en-us/community/posts/205672126-Release-Candidate-3-14-5
---
 pkgs/applications/networking/dropbox/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 8030ab313a8..edaa5ed077f 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -20,11 +20,11 @@
 
 let
   # NOTE: When updating, please also update in current stable, as older versions stop working
-  version = "3.12.6";
+  version = "3.14.5";
   sha256 =
     {
-      "x86_64-linux" = "16d0g9bygvaixv4r42p72z6a6wqhkf5qzb058lijih93zjr8zjlj";
-      "i686-linux" = "1pgqz6axzzyaahql01g0l80an39hd9j4dnq0vfavwvb2qkb27dph";
+      "x86_64-linux" = "02yjc910j3m61yd19akfv5yxh0a06cqwx2rxb2xhdbf1cb6c2wdg";
+      "i686-linux" = "0aqni6gsnbmshczxwn10qbp43qqnprxr18spx7dc9cz9cq27rgrv";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fae36c212c6..9ff55dca5b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13380,7 +13380,7 @@ let
 
   copy-com = callPackage ../applications/networking/copy-com { };
 
-  dropbox = qt5.callPackage ../applications/networking/dropbox { };
+  dropbox = qt55.callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
 

From bd3ca11e0d5f4652d4b8da094dc77094f5e05e39 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 26 Jan 2016 21:32:24 +0100
Subject: [PATCH 013/338] virtualbox: 5.0.12 -> 5.0.14

---
 pkgs/applications/virtualization/virtualbox/default.nix   | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

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

From e5e4e27e740c945f769f649166e2f445dc556248 Mon Sep 17 00:00:00 2001
From: Travis Athougies <travis@athougies.net>
Date: Mon, 15 Feb 2016 14:52:13 -0800
Subject: [PATCH 014/338] tints: 0.11 -> 0.12

---
 pkgs/applications/misc/tint2/default.nix | 27 +++++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 9eb3ed13af5..e8412ce1916 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -1,30 +1,41 @@
 { stdenv, fetchurl, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama
 , libXrender, libXcomposite, libXdamage, libX11, libXrandr, gtk, libpthreadstubs
-, libXdmcp
+, libXdmcp, librsvg, fetchgit
 }:
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "0.11";
+  version = "0.12";
 
-  src = fetchurl {
-    url = "http://tint2.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "07a74ag7lhc6706z34zvqj2ikyyl7wnzisfxpld67ljpc1m6w47y";
+  src = fetchgit {
+    url = "https://gitlab.com/o9000/tint2.git";
+    rev = version;
+    sha256 = "0pd84ydpqz2l6gkhj565nqi2xyiph8zfpn4xha60xshqpsg3pqjq";
   };
         
   buildInputs = [ pkgconfig cmake pango cairo glib imlib2 libXinerama
     libXrender libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs
-    libXdmcp
+    libXdmcp librsvg
   ];
 
-  preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
+  preConfigure =
+    ''
+      substituteInPlace CMakeLists.txt --replace /etc $out/etc
+    '';
+  prePatch =
+    ''
+      substituteInPlace ./src/tint2conf/properties.c --replace /usr/share/ /run/current-system/sw/share/
+      substituteInPlace ./src/launcher/apps-common.c --replace /usr/share/ /run/current-system/sw/share/
+      substituteInPlace ./src/launcher/icon-theme-common.c --replace /usr/share/ /run/current-system/sw/share/
+    '';
 
   cmakeFlags = [
     "-DENABLE_TINT2CONF=0"
+    "-DENABLE_SN=0"
   ];
 
   meta = {
-    homepage = http://code.google.com/p/tint2;
+    homepage = https://gitlab.com/o9000/tint2;
     license = stdenv.lib.licenses.gpl2;
     description = "A simple panel/taskbar unintrusive and light (memory / cpu / aestetic)";
     platforms = stdenv.lib.platforms.linux;

From ebe983824b4fe32dc224be1aefbece1af9a6dcc7 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 17 Feb 2016 16:24:06 +0100
Subject: [PATCH 015/338] dropbox: 3.14.5 -> 3.14.7

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index edaa5ed077f..a180e2a01ed 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -20,11 +20,11 @@
 
 let
   # NOTE: When updating, please also update in current stable, as older versions stop working
-  version = "3.14.5";
+  version = "3.14.7";
   sha256 =
     {
-      "x86_64-linux" = "02yjc910j3m61yd19akfv5yxh0a06cqwx2rxb2xhdbf1cb6c2wdg";
-      "i686-linux" = "0aqni6gsnbmshczxwn10qbp43qqnprxr18spx7dc9cz9cq27rgrv";
+      "x86_64-linux" = "1pwmghpr0kyca2biysyk90kk9k6ffv4i95vs5rq96vc0zbckws6n";
+      "i686-linux" = "08yqrxh09cfd80kbiq1f2sirx9s85acij4khpklvvwrnf2x1i1zm";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From 14f3b8e6cc92fea319e6d5fc72953e7bae518b38 Mon Sep 17 00:00:00 2001
From: "Bruno Bzeznik Bruno.Bzeznik@imag.fr" <Bruno.Bzeznik@imag.fr>
Date: Wed, 24 Feb 2016 10:34:22 +0100
Subject: [PATCH 016/338] gromacs: 4.6.5 -> 4.6.7 + MPI support

---
 .../molecular-dynamics/gromacs/default.nix     | 18 +++++++++++++-----
 pkgs/top-level/all-packages.nix                | 16 ++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index 43ef4337d57..5724db9f306 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -1,22 +1,30 @@
 
 { stdenv, fetchurl, cmake,
   singlePrec ? true,
-  fftw
+  mpiEnabled ? false,
+  fftw,
+  openmpi
 }:
 
 
 stdenv.mkDerivation {
-  name = "gromacs-4.6.5";
+  name = "gromacs-4.6.7";
 
   src = fetchurl {
-    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz";
-    sha256 = "02ggrplh8fppqib86y3rfk4qm08yddlrb1yjgzl138b3b4qjy957";
+    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.7.tar.gz";
+    sha256 = "6afb1837e363192043de34b188ca3cf83db6bd189601f2001a1fc5b0b2a214d9";
   };
 
-  buildInputs = [cmake fftw];
+  buildInputs = [cmake fftw]
+  ++ (stdenv.lib.optionals mpiEnabled [ openmpi ]);
 
   cmakeFlags = ''
     ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"}
+    ${if mpiEnabled then "-DGMX_MPI:BOOL=TRUE 
+                          -DGMX_CPU_ACCELERATION:STRING=SSE4.1 
+                          -DGMX_OPENMP:BOOL=TRUE
+                          -DGMX_THREAD_MPI:BOOL=FALSE"
+                     else "-DGMX_MPI:BOOL=FALSE" }
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df56303c774..cb03da1b65d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15085,12 +15085,28 @@ let
 
   gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {
     singlePrec = true;
+    mpiEnabled = false;
     fftw = fftwSinglePrec;
     cmake = cmakeCurses;
   };
 
+  gromacsMpi = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
+    singlePrec = true;
+    mpiEnabled = true;
+    fftw = fftwSinglePrec;
+    cmake = cmakeCurses;
+  });
+
   gromacsDouble = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
     singlePrec = false;
+    mpiEnabled = false;
+    fftw = fftw;
+    cmake = cmakeCurses;
+  });
+
+  gromacsDoubleMpi = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
+    singlePrec = false;
+    mpiEnabled = true;
     fftw = fftw;
     cmake = cmakeCurses;
   });

From 00d32bb99ffc3b0080d0c320653a6ceadb6750f4 Mon Sep 17 00:00:00 2001
From: Igor Sharonov <igor.sharonov@gmail.com>
Date: Wed, 24 Feb 2016 22:33:21 +0300
Subject: [PATCH 017/338] i3pystatus: 3.33 -> 3.34

---
 .../window-managers/i3/pystatus.nix           | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            | 35 ----------------
 3 files changed, 43 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/applications/window-managers/i3/pystatus.nix

diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix
new file mode 100644
index 00000000000..eac2d9ab9c9
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, libpulseaudio, python3Packages, extraLibs ? [] }:
+
+python3Packages.buildPythonApplication rec {
+  name = "${pname}-${version}";
+  version = "3.34";
+  pname = "i3pystatus";
+  disabled = !python3Packages.isPy3k;
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/i/${pname}/${name}.tar.gz";
+    sha256 = "1bpkkf9q4zqq7fh65zynbv26nq24rfznmw71jjvda7g8kjrwjdk5";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++
+    [ libpulseaudio ] ++ extraLibs;
+
+  ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudio}/lib\"";
+  makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually
+
+  postInstall = ''
+    makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      ${ldWrapperSuffix}
+  '';
+
+  # no tests in tarball
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/enkore/i3pystatus;
+    description = "A complete replacement for i3status";
+    longDescription = ''
+      i3pystatus is a growing collection of python scripts for status output compatible
+      to i3status / i3bar of the i3 window manager.
+    '';
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.igsha ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ed02f71e5c..6dec9ef47fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12467,6 +12467,8 @@ let
 
   i3minator = callPackage ../tools/misc/i3minator { };
 
+  i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { };
+
   i3status = callPackage ../applications/window-managers/i3/status.nix { };
 
   i810switch = callPackage ../os-specific/linux/i810switch { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1a35c493565..e4517f6c42f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5973,41 +5973,6 @@ in modules // {
     };
   };
 
-  i3pystatus = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    version = "3.33";
-    pname = "i3pystatus";
-    namePrefix = "";
-    disabled = !isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/${pname}/${name}.tar.gz";
-      sha256 = "1fs2nlzm9in8bwg8cm3567ayiha0v7k8pn793pm5fb7lywaalasy";
-    };
-
-    propagatedBuildInputs = with self; [ keyring colour netifaces praw psutil
-      basiciw pkgs.libpulseaudio ];
-    ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${pkgs.libpulseaudio}/lib\"";
-    makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually
-
-    postInstall = ''
-      makeWrapper ${python.interpreter} $out/bin/${pname}-python-interpreter \
-        --prefix PYTHONPATH : "$PYTHONPATH" \
-        ${ldWrapperSuffix}
-    '';
-
-    meta = {
-      homepage = https://github.com/enkore/i3pystatus;
-      description = "A complete replacement for i3status";
-      longDescription = ''
-        i3pystatus is a growing collection of python scripts for status output compatible
-        to i3status / i3bar of the i3 window manager.
-      '';
-      license = licenses.mit;
-      platforms = platforms.linux;
-    };
-  };
-
   jdcal = buildPythonPackage rec {
     version = "1.0";
     name = "jdcal-${version}";

From 13f0bb7a53d57f145118057fb28dbd38ebd7ce8e Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 26 Feb 2016 11:18:02 +0100
Subject: [PATCH 018/338] libretro-mame: init at git-2016-02-10

---
 pkgs/misc/emulators/retroarch/cores.nix | 17 +++++++++++++++--
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 07d66550379..332357e317e 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchgit, pkgconfig, makeWrapper, python27, retroarch
-, fluidsynth, mesa, SDL, ffmpeg, libpng, libjpeg, libvorbis, zlib }:
+, alsaLib, fluidsynth, mesa, portaudio, SDL, ffmpeg, libpng, libjpeg
+, libvorbis, zlib }:
 
 let
 
@@ -33,7 +34,7 @@ let
       inherit description;
       homepage = "http://www.libretro.com/";
       license = licenses.gpl3Plus;
-      maintainers = with maintainers; [ edwtjo MP2E ];
+      maintainers = with maintainers; [ edwtjo hrdinka MP2E ];
       platforms = platforms.linux;
     };
   } // a);
@@ -133,6 +134,18 @@ in
     description = "Enhanced Genesis Plus libretro port";
   };
 
+  mame = mkLibRetroCore {
+    core = "mame";
+    src = fetchRetro {
+      repo = "mame";
+      rev = "8da2303292bb8530f9f4ffad8bf1df95ee4cab74";
+      sha256 = "0rzy5klp8vf9vc8fylbdnp2qcvl1nkgw5a55ljqc5vich4as5alq";
+    };
+    description = "Port of MAME to libretro";
+
+    extraBuildInputs = [ alsaLib portaudio python27 ];
+  };
+
   mednafen-pce-fast = (mkLibRetroCore rec {
     core = "mednafen-pce-fast";
     src = fetchRetro {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ec1c1c0e78..3cd8770b584 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14013,6 +14013,7 @@ let
       ++ optional (cfg.enableFceumm or false) fceumm
       ++ optional (cfg.enableGambatte or false) gambatte
       ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx
+      ++ optional (cfg.enableMAME or false) mame
       ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast
       ++ optional (cfg.enableMupen64Plus or false) mupen64plus
       ++ optional (cfg.enableNestopia or false) nestopia

From 7e8faf022f343901301c912c5f0c7fa1d830a08d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 26 Feb 2016 00:22:12 +0000
Subject: [PATCH 019/338] rubygems: 2.4.8 -> 2.5.2

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

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

From 8104b8ff1d4d35b2a1b3aa747e9a39d4728aa7f4 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Sun, 3 Jan 2016 16:54:22 -0800
Subject: [PATCH 020/338] letsencrypt: 0.1.0 -> 0.4.0

Closes #12123
---
 pkgs/tools/admin/letsencrypt/default.nix | 28 ++++++++++++-----
 pkgs/top-level/python-packages.nix       | 39 +++++++++++++++++++++++-
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix
index 516fc20c5a7..be314a56731 100644
--- a/pkgs/tools/admin/letsencrypt/default.nix
+++ b/pkgs/tools/admin/letsencrypt/default.nix
@@ -1,22 +1,36 @@
-{ stdenv, pythonPackages, fetchurl, dialog }:
+{ stdenv, pythonPackages, fetchFromGitHub, dialog }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.1.0";
   name = "letsencrypt-${version}";
+  version = "0.4.0";
 
-  src = fetchurl {
-    url = "https://github.com/letsencrypt/letsencrypt/archive/v${version}.tar.gz";
-    sha256 = "056y5bsmpc4ya5xxals4ypzsm927j6n5kwby3bjc03sy3sscf6hw";
+  src = fetchFromGitHub {
+    owner = "letsencrypt";
+    repo = "letsencrypt";
+    rev = "v${version}";
+    sha256 = "0r2wis48w5nailzp2d5brkh2f40al6sbz816xx0akh3ll0rl1hbv";
   };
 
   propagatedBuildInputs = with pythonPackages; [
-    zope_interface zope_component six requests2 pytz pyopenssl psutil mock acme
-    cryptography configobj pyRFC3339 python2-pythondialog parsedatetime ConfigArgParse
+    ConfigArgParse
+    acme
+    configobj
+    cryptography
+    parsedatetime
+    psutil
+    pyRFC3339
+    pyopenssl
+    python2-pythondialog
+    pytz
+    six
+    zope_component
+    zope_interface
   ];
   buildInputs = with pythonPackages; [ nose dialog ];
 
   patchPhase = ''
     substituteInPlace letsencrypt/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail"
+    substituteInPlace letsencrypt/le_util.py --replace "sw_vers" "/usr/bin/sw_vers"
   '';
 
   postInstall = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25ba60f69bf..cb8df3afd36 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -260,7 +260,44 @@ in modules // {
 
     buildInputs = with self; [ nose ];
 
-    sourceRoot = "letsencrypt-${version}/acme";
+    sourceRoot = "letsencrypt-v${version}-src/acme";
+  };
+
+  acme-tiny = buildPythonPackage rec {
+    name = "acme-tiny-${version}";
+    version = "20151229";
+    rev = "f61f72c212cea27f388eb4a26ede0d65035bdb53";
+
+    src = pkgs.fetchgit {
+      inherit rev;
+      url = "https://github.com/diafygi/acme-tiny.git";
+      sha256 = "dde59354e483bdff3dfd06717c094889ae673efb568e40b150b4695b0c539649";
+    };
+
+    # source doesn't have any python "packaging" as such
+    configurePhase = " ";
+    buildPhase = " ";
+    # the tests are... complex
+    doCheck = false;
+
+    patchPhase = ''
+      substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl}/bin/openssl"
+      substituteInPlace letsencrypt/le_util.py --replace '"sw_vers"' '"/usr/bin/sw_vers"'
+    '';
+
+    installPhase = ''
+      mkdir -p $out/${python.sitePackages}/
+      cp acme_tiny.py $out/${python.sitePackages}/
+      mkdir -p $out/bin
+      ln -s $out/${python.sitePackages}/acme_tiny.py $out/bin/acme_tiny
+      chmod +x $out/bin/acme_tiny
+    '';
+
+    meta = {
+      description = "A tiny script to issue and renew TLS certs from Let's Encrypt";
+      homepage = https://github.com/diafygi/acme-tiny;
+      license = licenses.mit;
+    };
   };
 
   acme-tiny = buildPythonPackage rec {

From c267f5b71122453268d55ef665f20262be7f53d9 Mon Sep 17 00:00:00 2001
From: Adam Bell <agbell@gmail.com>
Date: Fri, 26 Feb 2016 19:37:57 -0500
Subject: [PATCH 021/338] Updating to postgis 2.2.1

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

diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index 7c247dd6c1d..5f41eb61c29 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -5,7 +5,7 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p
   ### NixOS - usage:
   ==================
 
-    services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ];
+    services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }).v_2_2_1 ];
 
 
   ### important Postgis implementation details:
@@ -84,9 +84,9 @@ let
 
 in rec {
 
-  v_2_1_4 = pgDerivationBaseNewer.merge ( fix : {
-    version = "2.1.4";
-    sha256 = "1z00n5654r7l38ydkn2grbwl5gg0mravjwxfdipp7j18hjiw4wyd";
+  v_2_2_1 = pgDerivationBaseNewer.merge ( fix : {
+    version = "2.2.1";
+    sha256 = "02gsi1cm63kf0r7881444lrkzdjqhhpz9a5zav3al0q24nq01r8g";
     sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"];
     builtInputs = [gdal json_c pkgconfig];
     dontDisableStatic = true;

From ac94a5d86c81d17669875564f3c3e957fbfe5313 Mon Sep 17 00:00:00 2001
From: Rhys <rimmington@gmail.com>
Date: Fri, 26 Feb 2016 13:44:41 +1100
Subject: [PATCH 022/338] collectd: allow mysql to be null

---
 pkgs/tools/system/collectd/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index ff64b54b985..a1d676d708d 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -19,7 +19,7 @@
 , libtool ? null
 , lm_sensors ? null
 , lvm2 ? null
-, mysql ? null
+, libmysql ? null
 , postgresql ? null
 , protobufc ? null
 , python ? null
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
     cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
-    lm_sensors libxml2 lvm2 mysql.lib postgresql protobufc rabbitmq-c rrdtool
+    lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool
     varnish yajl jdk libtool python udev
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 662905129e5..d91fa816f62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1130,6 +1130,7 @@ let
 
   collectd = callPackage ../tools/system/collectd {
     rabbitmq-c = rabbitmq-c_0_4;
+    libmysql = mysql.lib;
   };
 
   colormake = callPackage ../development/tools/build-managers/colormake { };

From 456cbb29d9ba0cd518e82d2c2dc68e665629595e Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sun, 13 Dec 2015 11:27:03 +1100
Subject: [PATCH 023/338] nix-prefetch-git: add --quiet flag and minor cleanup

---
 pkgs/build-support/fetchgit/nix-prefetch-git | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 97096aa2980..f81b896e33b 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -52,6 +52,7 @@ for arg; do
             --hash) argfun=set_hashType;;
             --branch-name) argfun=set_branchName;;
             --deepClone) deepClone=true;;
+            --quiet) QUIET=true;;
             --no-deepClone) deepClone=false;;
             --leave-dotGit) leaveDotGit=true;;
             --fetch-submodules) fetchSubmodules=true;;
@@ -281,9 +282,9 @@ clone_user_rev() {
     eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"
     if test -z "$leaveDotGit"; then
         echo "removing \`.git'..." >&2
-        find $dir -name .git\* | xargs rm -rf
+        find "$dir" -name .git\* -print0 | xargs -0 rm -rf
     else
-        find $dir -name .git | while read gitdir; do
+        find "$dir" -name .git | while read gitdir; do
             make_deterministic_repo "$(readlink -f "$gitdir/..")"
         done
     fi

From 21547a61ba99cc6a78ff9772a11073fc2e9e4f63 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sun, 13 Dec 2015 11:27:49 +1100
Subject: [PATCH 024/338] nix-prefetch-git: print out valid nix expression;
 make --quiet very quiet

---
 pkgs/build-support/fetchgit/nix-prefetch-git | 60 ++++++++++++++++----
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index f81b896e33b..22a241d5e0e 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -12,6 +12,11 @@ fetchSubmodules=
 builder=
 branchName=$NIX_PREFETCH_GIT_BRANCH_NAME
 
+# populated by clone_user_rev()
+fullRev=
+humanReadableRev=
+commitDate=
+
 if test -n "$deepClone"; then
     deepClone=true
 else
@@ -255,7 +260,7 @@ make_deterministic_repo(){
 }
 
 
-clone_user_rev() {
+_clone_user_rev() {
     local dir="$1"
     local url="$2"
     local rev="${3:-HEAD}"
@@ -273,10 +278,9 @@ clone_user_rev() {
             fi;;
     esac
 
-    local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/$branchName) | tail -n1)
-    echo "git revision is $full_revision"
-    echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))" >&2
-    echo "Commit date is $(cd $dir && git show --no-patch --pretty=%ci $full_revision)"
+    fullRev="$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/$branchName) | tail -n1)"
+    humanReadableRev="$(cd $dir && (git describe $fullRev 2> /dev/null || git describe --tags $fullRev 2> /dev/null || echo -- none --))"
+    commitDate="$(cd $dir && git show --no-patch --pretty=%ci $fullRev)"
 
     # Allow doing additional processing before .git removal
     eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"
@@ -290,6 +294,44 @@ clone_user_rev() {
     fi
 }
 
+clone_user_rev() {
+    if ! test -n "$QUIET"; then
+        _clone_user_rev "$@"
+    else
+        errfile="$(mktemp "${TMPDIR:-/tmp}/git-checkout-err-XXXXXXXX")"
+        trap "rm -rf \"$errfile\"" EXIT
+        _clone_user_rev "$@" 2> "$errfile" || (
+            status="$?"
+            cat "$errfile" >&2
+            exit "$status"
+        )
+    fi
+}
+
+
+print_results() {
+    hash="$1"
+    if ! test -n "$QUIET"; then
+        echo "" >&2
+        echo "git revision is $fullRev" >&2
+        if test -n "$finalPath"; then
+            echo "path is $finalPath" >&2
+        fi
+        echo "git human-readable version is $humanReadableRev" >&2
+        echo "Commit date is $commitDate" >&2
+        if test -n "$hash"; then
+            echo "hash is $hash" >&2
+        fi
+    fi
+    if test -n "$hash"; then
+        echo "{"
+        echo "  url = \"$url\";"
+        echo "  rev = \"$fullRev\";"
+        echo "  $hashType = \"$hash\";"
+        echo "}"
+    fi
+}
+
 if test -z "$branchName"; then
     branchName=fetchgit
 fi
@@ -328,20 +370,18 @@ else
 
         # Compute the hash.
         hash=$(nix-hash --type $hashType --base32 $tmpFile)
-        if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
 
         # Add the downloaded file to the Nix store.
         finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpFile")
 
         if test -n "$expHash" -a "$expHash" != "$hash"; then
-            echo "hash mismatch for URL \`$url'"
+            print_metadata
+            echo "hash mismatch for URL \`$url'" >&2
             exit 1
         fi
     fi
 
-    if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi
-
-    echo $hash
+    print_results "$hash"
 
     if test -n "$PRINT_PATH"; then
         echo $finalPath

From 0467a17858d9567967c37ec3fa97211e14a1069e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 25 Feb 2016 15:02:38 +0100
Subject: [PATCH 025/338] pythonPackages.sqlalchemy: follows upstream,
 sqlalchemy7 for lecagy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes pythonPackages.sqlalchemy the most up to date revision (it
was called sqlalchemy_1_0 before), and maintains the various “legacy”
versions available as pythonPackages.sqlalchemyX for X in {7,8,9}.

All derivations that required `sqlalchemy_1_0` now require `sqlalchemy`
while those that required `sqlalchemy` now require `sqlalchemy7`.

The derivations are not changed, only the attribute names they are
bound to.
---
 .../virtualization/openstack/glance.nix       |  2 +-
 .../virtualization/openstack/keystone.nix     |  2 +-
 .../virtualization/openstack/neutron.nix      |  2 +-
 .../virtualization/openstack/nova.nix         |  2 +-
 .../virtualization/virtinst/default.nix       |  2 +-
 .../tools/build-managers/buildbot/default.nix |  2 +-
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            | 83 +++++++++++++++----
 8 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix
index 0aacbeed055..3cfe8dc527c 100644
--- a/pkgs/applications/virtualization/openstack/glance.nix
+++ b/pkgs/applications/virtualization/openstack/glance.nix
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
 
   # https://github.com/openstack/glance/blob/stable/liberty/requirements.txt
   propagatedBuildInputs = with pythonPackages; [
-     pbr sqlalchemy_1_0 anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
+     pbr sqlalchemy anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
      httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste
      jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python
      WSME osprofiler glance_store castellan taskflow cryptography xattr pysendfile
diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix
index 956f3b28152..61a366f7ab0 100644
--- a/pkgs/applications/virtualization/openstack/keystone.nix
+++ b/pkgs/applications/virtualization/openstack/keystone.nix
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
   # https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt
   propagatedBuildInputs = with pythonPackages; [
     pbr webob eventlet greenlet PasteDeploy paste routes cryptography six
-    sqlalchemy_1_0 sqlalchemy_migrate stevedore passlib keystoneclient memcached
+    sqlalchemy sqlalchemy_migrate stevedore passlib keystoneclient memcached
     keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack
     xmlsec MySQL_python
 
diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix
index 0520fcfc027..3371eb428e6 100644
--- a/pkgs/applications/virtualization/openstack/neutron.nix
+++ b/pkgs/applications/virtualization/openstack/neutron.nix
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
   # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt
   propagatedBuildInputs = with pythonPackages; [
    pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2
-   jinja2 keystonemiddleware netaddr retrying sqlalchemy_1_0 webob alembic six
+   jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six
    stevedore pecan ryu networking-hyperv MySQL_python
 
    # clients
diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix
index 20e250bf05c..618eb766692 100644
--- a/pkgs/applications/virtualization/openstack/nova.nix
+++ b/pkgs/applications/virtualization/openstack/nova.nix
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
 
   # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt
   propagatedBuildInputs = with pythonPackages; [
-    pbr sqlalchemy_1_0 boto decorator eventlet jinja2 lxml routes cryptography
+    pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography
     webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr
     netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six
     stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 62b5bea47fa..c9a62ce5f92 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   pythonPath = with pythonPackages;
-    [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
+    [ setuptools eventlet greenlet gflags netaddr sqlalchemy7 carrot routes
       PasteDeploy m2crypto ipy twisted sqlalchemy_migrate
       distutils_extra simplejson readline glanceclient cheetah lockfile httplib2
       # !!! should libvirt be a build-time dependency?  Note that
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 99c1352b4fb..a246044d6f1 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonApplication, fetchurl, twisted, dateutil, jinja2
-, sqlalchemy , sqlalchemy_migrate_0_7
+, sqlalchemy_migrate_0_7
 , enableDebugClient ? false, pygobject ? null, pyGtkGlade ? null
 }:
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8390ee8fb5..7aa15facb7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5724,7 +5724,7 @@ let
   };
 
   buildbot = callPackage ../development/tools/build-managers/buildbot {
-    inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate_0_7;
+    inherit (pythonPackages) twisted jinja2 sqlalchemy_migrate_0_7;
     dateutil = pythonPackages.dateutil_1_5;
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ffcd6c4229d..44186bf0761 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -235,7 +235,7 @@ in modules // {
       sha256 = "1ywimbisgb5g7xl9nrfwcm7dv3j8fsrjfp7bxb3l58zbsrzj6z2s";
     };
 
-    propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy ];
+    propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy7 ];
 
     makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${pkgs.fuse}/lib/libfuse.so" ];
 
@@ -457,7 +457,7 @@ in modules // {
     };
 
     buildInputs = with self; [ pytest pytestcov mock coverage ];
-    propagatedBuildInputs = with self; [ Mako sqlalchemy_1_0 python-editor ];
+    propagatedBuildInputs = with self; [ Mako sqlalchemy python-editor ];
 
     meta = {
       homepage = http://bitbucket.org/zzzeek/alembic;
@@ -1575,7 +1575,7 @@ in modules // {
     };
 
     buildInputs =
-      [ self.sqlalchemy
+      [ self.sqlalchemy7
         self.pycryptopp
         self.nose
         self.mock
@@ -2101,7 +2101,7 @@ in modules // {
       pymongo
       pyyaml
       requests2
-      sqlalchemy_1_0
+      sqlalchemy
       tables
       toolz
     ];
@@ -3188,7 +3188,7 @@ in modules // {
       sed -i '/distribute/d' setup.py
     '';
 
-    buildInputs = with self; [ self.coverage self.sqlalchemy ];
+    buildInputs = with self; [ self.coverage self.sqlalchemy7 ];
 
     # ValueError: Could not parse auth file:
     # /tmp/nix-build-.../CoilMQ-0.6.1/coilmq/tests/resources/auth.ini
@@ -7087,7 +7087,7 @@ in modules // {
     propagatedBuildInputs = with self; [
       flup
       ldap
-      sqlalchemy
+      sqlalchemy7
     ];
 
     doCheck = true;
@@ -8894,7 +8894,7 @@ in modules // {
       sha256 = "1i9ps5d5snih9xlqhrvmi3qfiygkmqzxh92n25kj4pf89kj4s965";
     };
 
-    propagatedBuildInputs = with self ; [ flask sqlalchemy_1_0 ];
+    propagatedBuildInputs = with self ; [ flask sqlalchemy ];
 
     meta = {
       description = "SQLAlchemy extension for Flask";
@@ -13699,7 +13699,7 @@ in modules // {
     };
 
     propagatedBuildInputs = with self; [
-      six stevedore sqlalchemy_migrate sqlalchemy_1_0 oslo-utils oslo-context
+      six stevedore sqlalchemy_migrate sqlalchemy oslo-utils oslo-context
       oslo-config oslo-i18n iso8601 Babel alembic pbr psycopg2
     ];
     buildInputs = with self; [
@@ -13844,7 +13844,7 @@ in modules // {
       singledispatch logutils
     ];
     buildInputs = with self; [
-      webtest Mako genshi Kajiki sqlalchemy_1_0 gunicorn jinja2 virtualenv
+      webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
     ];
 
     meta = with stdenv.lib; {
@@ -14567,7 +14567,7 @@ in modules // {
       pytz
       xlrd
       bottleneck
-      sqlalchemy_1_0
+      sqlalchemy
       lxml
       # Disabling this because an upstream dependency, pep8, is broken on v3.5.
       (if isPy35 then null else html5lib)
@@ -20132,7 +20132,7 @@ in modules // {
     rope = if isPy3k then null else self.rope;
   };
 
-  sqlalchemy = self.sqlalchemy9.override rec {
+  sqlalchemy7 = buildPythonPackage rec {
     name = "SQLAlchemy-0.7.10";
     disabled = isPy34 || isPy35;
     doCheck = !isPyPy;
@@ -20141,17 +20141,32 @@ in modules // {
       url = "http://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
       sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp";
     };
+
     patches = [
       # see https://groups.google.com/forum/#!searchin/sqlalchemy/module$20logging$20handlers/sqlalchemy/ukuGhmQ2p6g/2_dOpBEYdDYJ
       # waiting for 0.7.11 release
       ../development/python-modules/sqlalchemy-0.7.10-test-failures.patch
     ];
+
     preConfigure = optionalString isPy3k ''
       python3 sa2to3.py --no-diffs -w lib test examples
     '';
+
+    buildInputs = with self; [ nose mock ]
+      ++ stdenv.lib.optional doCheck pysqlite;
+    propagatedBuildInputs = with self; [ modules.sqlite3 ];
+
+    checkPhase = ''
+      ${python.executable} sqla_nose.py
+    '';
+
+    meta = {
+      homepage = http://www.sqlalchemy.org/;
+      description = "A Python SQL toolkit and Object Relational Mapper";
+    };
   };
 
-  sqlalchemy8 = self.sqlalchemy9.override rec {
+  sqlalchemy8 = buildPythonPackage rec {
     name = "SQLAlchemy-0.8.7";
     disabled = isPy34 || isPy35;
     doCheck = !isPyPy;
@@ -20160,9 +20175,23 @@ in modules // {
       url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
       md5 = "4f3377306309e46739696721b1785335";
     };
+
     preConfigure = optionalString isPy3k ''
       python3 sa2to3.py --no-diffs -w lib test examples
     '';
+
+    buildInputs = with self; [ nose mock ]
+      ++ stdenv.lib.optional doCheck pysqlite;
+    propagatedBuildInputs = with self; [ modules.sqlite3 ];
+
+    checkPhase = ''
+      ${python.executable} sqla_nose.py
+    '';
+
+    meta = {
+      homepage = http://www.sqlalchemy.org/;
+      description = "A Python SQL toolkit and Object Relational Mapper";
+    };
   };
 
   sqlalchemy9 = buildPythonPackage rec {
@@ -20191,14 +20220,32 @@ in modules // {
     };
   };
 
-  sqlalchemy_1_0 = self.sqlalchemy9.override rec {
-    name = "SQLAlchemy-1.0.10";
-    doCheck = !isPyPy;  # lots of tests fail
+  sqlalchemy = buildPythonPackage rec {
+    name = "SQLAlchemy-${version}";
+    version = "1.0.10";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
       sha256 = "963415bf4ea4fa13698893464bc6917d291331e0e8202dddd0ebfed2864ef7e3";
     };
+
+    buildInputs = with self; [ nose mock ]
+      ++ stdenv.lib.optional doCheck pysqlite;
+    propagatedBuildInputs = with self; [ modules.sqlite3 ];
+
+    # Test-only dependency pysqlite doesn't build on Python 3. This isn't an
+    # acceptable reason to make all dependents unavailable on Python 3 as well
+    doCheck = !(isPyPy || isPy3k);
+
+    checkPhase = ''
+      ${python.executable} sqla_nose.py
+    '';
+
+    meta = {
+      homepage = http://www.sqlalchemy.org/;
+      description = "A Python SQL toolkit and Object Relational Mapper";
+      license = licenses.mit;
+    };
   };
 
   sqlalchemy_imageattach = buildPythonPackage rec {
@@ -20261,8 +20308,8 @@ in modules // {
     };
   };
 
-  sqlalchemy_migrate = self.sqlalchemy_migrate_func self.sqlalchemy_1_0;
-  sqlalchemy_migrate_0_7 = self.sqlalchemy_migrate_func self.sqlalchemy;
+  sqlalchemy_migrate = self.sqlalchemy_migrate_func self.sqlalchemy;
+  sqlalchemy_migrate_0_7 = self.sqlalchemy_migrate_func self.sqlalchemy7;
 
   sqlparse = buildPythonPackage rec {
     name = "sqlparse-${version}";
@@ -24810,7 +24857,7 @@ in modules // {
         thrift
         beautifulsoup4
         markdown2
-        sqlalchemy
+        sqlalchemy7
         html2text
         evernote
     ];

From b6a8348a4b5bd7eca2695d7646c5fb2ceee2c0c5 Mon Sep 17 00:00:00 2001
From: Sheena Artrip <sheena.artrip@gmail.com>
Date: Fri, 26 Feb 2016 04:05:55 -0500
Subject: [PATCH 026/338] clamav: 0.98.7 -> 0.99

---
 pkgs/tools/security/clamav/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 1f36d54ff50..efb72783391 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl
-, libmilter }:
+, libmilter, pcre }:
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
-  version = "0.98.7";
+  version = "0.99";
 
   src = fetchurl {
     url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
-    sha256 = "0wp2ad8km4cqmlndni5ljv7q3lfxm6y4r3giv0yf23bl0yvif918";
+    sha256 = "1abyg349yr31z764jcgx67q5v098jrkrj88bqkzmys6xza62qyfj";
   };
 
-  buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter ];
+  buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ];
 
   configureFlags = [
     "--with-zlib=${zlib}"
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     "--with-openssl=${openssl}"
     "--with-libncurses-prefix=${ncurses}"
     "--with-libcurl=${curl}"
+    "--with-pcre=${pcre}"
     "--enable-milter"
     "--disable-clamav"
   ];

From 3e1b8935c07ae44455af893e93f28b4ccc46dbf0 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 14:16:17 -0600
Subject: [PATCH 027/338] mbedtls: 1.3.14 -> 1.3.16 for CVE-2015-8036

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

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index 7c7b82d9eef..ef0caed69d7 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-1.3.14";
+  name = "mbedtls-1.3.16";
 
   src = fetchurl {
     url = "https://polarssl.org/download/${name}-gpl.tgz";
-    sha256 = "1y3gr3kfai3d13j08r4pv42sh47nbfm4nqi9jq8c9d06qidr2xmy";
+    sha256 = "f413146c177c52d4ad8f48015e2fb21dd3a029ca30a2ea000cbc4f9bd092c933";
   };
 
   nativeBuildInputs = [ perl ];

From a1b69275afca5ec06e930c4605d55778ee6de4b8 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 14:32:56 -0600
Subject: [PATCH 028/338] libbsd: 0.7.0 -> 0.8.2 for CVE-2016-2090

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

diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index bc88d8dc12c..541f70cabb8 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
-let name = "libbsd-0.7.0";
+let name = "libbsd-0.8.2";
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1fqhbi0vd6xjxazf633x388cc8qyn58l78704s0h6k63wlbhwfqg";
+    sha256 = "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj";
   };
 
   patchPhase = ''
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
       --replace "{exec_prefix}" "{prefix}"
   '';
 
-  meta = { 
+  meta = {
     description = "Common functions found on BSD systems";
     homepage = http://libbsd.freedesktop.org/;
     license = stdenv.lib.licenses.bsd3;

From 77134ea4a536226e1d4d6495705b6a3777f8bf15 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 14:48:29 -0600
Subject: [PATCH 029/338] jasper: patch for CVE-2016-1867

---
 pkgs/development/libraries/jasper/default.nix         |  3 ++-
 .../libraries/jasper/jasper-CVE-2016-1867.diff        | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff

diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 2fa9cf7dbf9..40d54ed400a 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    ./jasper-CVE-2016-1867.diff
     ./jasper-CVE-2014-8137-variant2.diff
     ./jasper-CVE-2014-8137-noabort.diff
     ./jasper-CVE-2014-8138.diff
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ libjpeg ];
 
   configureFlags = "--enable-shared";
-  
+
   meta = {
     homepage = https://www.ece.uvic.ca/~frodo/jasper/;
     description = "JPEG2000 Library";
diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff b/pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff
new file mode 100644
index 00000000000..b2dce8d8e70
--- /dev/null
+++ b/pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff
@@ -0,0 +1,11 @@
+--- jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2016-01-14 14:22:24.569056412 +0100
+@@ -429,7 +429,7 @@
+ 	}
+
+ 	for (pi->compno = pchg->compnostart, pi->picomp =
+-	  &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend); ++pi->compno,
++	  &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend) && pi->compno < pi->numcomps; ++pi->compno,
+ 	  ++pi->picomp) {
+ 		pirlvl = pi->picomp->pirlvls;
+ 		pi->xstep = pi->picomp->hsamp * (1 << (pirlvl->prcwidthexpn +
\ No newline at end of file

From 41d00c436dd914a2d7f62bdffd5270b28331312d Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sat, 27 Feb 2016 14:20:12 +0100
Subject: [PATCH 030/338] sienna: init at 1.0c

---
 pkgs/games/sienna/default.nix   | 59 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/games/sienna/default.nix

diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix
new file mode 100644
index 00000000000..2636bc9e799
--- /dev/null
+++ b/pkgs/games/sienna/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "sienna";
+  version = "1.0c";
+
+  icon = fetchurl {
+    url = "http://tangramgames.dk/img/thumb/sienna.png";
+    sha256 = "12q2rhk39dmb6ir50zafn8dylaad5gns8z3y21mfjabc5l5g02nn";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "sienna";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "Fast-paced one button platformer"; 
+    desktopName = "Sienna";
+    genericName = "sienna";
+    categories = "Game;";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love";
+    sha256 = "1x15276fhqspgrrv8fzkp032i2qa8piywc0yy061x59mxhdndzj6";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ lua love ];
+
+  phases = "installPhase";
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/games/lovegames
+
+    cp -v $src $out/share/games/lovegames/${pname}.love
+
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Fast-paced one button platformer";
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.linux;
+    license = licenses.free;
+    downloadPage = http://tangramgames.dk/games/sienna;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22dbfc41f43..5c6c7988756 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14633,6 +14633,8 @@ let
 
   sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { };
 
+  sienna = callPackage ../games/sienna { love = love_0_10; };
+
   simutrans = callPackage ../games/simutrans { };
   # get binaries without data built by Hydra
   simutrans_binaries = lowPrio simutrans.binaries;

From 7281144f4b9dbaa687cc3c4946124408549a9987 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sat, 27 Feb 2016 14:31:28 +0100
Subject: [PATCH 031/338] 90secondportraits: init at 1.01b

---
 pkgs/games/90secondportraits/default.nix | 59 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/games/90secondportraits/default.nix

diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix
new file mode 100644
index 00000000000..0ada8d64685
--- /dev/null
+++ b/pkgs/games/90secondportraits/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "90secondportraits";
+  version = "1.01b";
+
+  icon = fetchurl {
+    url = "http://tangramgames.dk/img/thumb/90secondportraits.png";
+    sha256 = "13k6cq8s7jw77j81xfa5ri41445m778q6iqbfplhwdpja03c6faw";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "90secondportraits";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "A silly speed painting game";
+    desktopName = "90 Second Portraits";
+    genericName = "90secondportraits";
+    categories = "Game;";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/SimonLarsen/90-Second-Portraits/releases/download/${version}/${pname}-${version}.love";
+    sha256 = "0jj3k953r6vb02212gqcgqpb4ima87gnqgls43jmylxq2mcm33h5";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ lua love ];
+
+  phases = "installPhase";
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/games/lovegames
+
+    cp -v $src $out/share/games/lovegames/${pname}.love
+
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A silly speed painting game";
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.linux;
+    license = licenses.free;
+    downloadPage = http://tangramgames.dk/games/90secondportraits;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22dbfc41f43..1b023e4d99f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14307,6 +14307,8 @@ let
 
   "2048-in-terminal" = callPackage ../games/2048-in-terminal { };
 
+  "90secondportraits" = callPackage ../games/90secondportraits { love = love_0_10; };
+
   adom = callPackage ../games/adom { };
 
   airstrike = callPackage ../games/airstrike { };

From 0a2c3ec971fd47267b0f6411fdabeb163c105f91 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 15:31:52 -0600
Subject: [PATCH 032/338] mysql: 5.5.45 -> 5.5.48 for multiple CVEs:
 CVE-2015-4792 CVE-2015-4802 CVE-2015-4815 CVE-2015-4816 CVE-2015-4819
 CVE-2015-4826 CVE-2015-4830 CVE-2015-4836 CVE-2015-4858 CVE-2015-4861
 CVE-2015-4870 CVE-2015-4879 CVE-2015-4913

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

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index dbbb9223ee4..8c288e54cd4 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.45";
+  version = "5.5.48";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
-    sha256 = "0clkr3r44j8nsgmjzv6r09pb0vjangn5hpyjxgg5ynr674ygskkl";
+    sha256 = "10fpzvf6hxvqgaq8paiz8fvhcbbs4qnzqw0svq40bvlyhx2qfgyc";
   };
 
   patches = if stdenv.isCygwin then [

From 73f64108511fc8978599fca14df053c49889e2f5 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 15:35:19 -0600
Subject: [PATCH 033/338] cgit: 0.11.2 -> 0.12 for CVE-2016-1899 CVE-2016-1900
 CVE-2016-1901

---
 .../version-management/git-and-tools/cgit/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 6cde64b3090..49e1734fe02 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "cgit-${version}";
-  version = "0.11.2";
+  version = "0.12";
 
   src = fetchurl {
     url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
-    sha256 = "0fryh56kyah7v9a8zzhbhwlyy2j116w87sxmgrn2kmwk0rvnw4if";
+    sha256 = "1dx54hgfyabmg9nm5qp6d01f54nlbqbbdwhwl0llb9imjf237qif";
   };
 
   # cgit is tightly coupled with git and needs a git source tree to build.
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to
   # 1.9.2 (see the repository history)
   gitSrc = fetchurl {
-    url    = "mirror://kernel/software/scm/git/git-2.3.2.tar.xz";
-    sha256 = "09gqijsjfnxlbsxbxzlvllg37bfs9f4jwa2plqsanmba09i89sqq";
+    url    = "mirror://kernel/software/scm/git/git-2.7.0.tar.xz";
+    sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs";
   };
 
   buildInputs = [

From 62c3ad1dde1304d97ca0c32c4f3965075e3e4526 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sat, 27 Feb 2016 22:31:29 +0100
Subject: [PATCH 034/338] love: fix broken 0.8 + added version 0.72

---
 pkgs/development/interpreters/love/0.7.nix | 51 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  3 +-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/love/0.7.nix

diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix
new file mode 100644
index 00000000000..65f38ae1613
--- /dev/null
+++ b/pkgs/development/interpreters/love/0.7.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, pkgconfig
+, SDL, mesa, openal, lua
+, libdevil, freetype, physfs
+, libmodplug, mpg123, libvorbis, libogg
+}:
+
+stdenv.mkDerivation rec {
+  name = "love-0.7.2";
+  src = fetchurl {
+    url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
+    sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5";
+  };
+
+  buildInputs = [
+    pkgconfig SDL mesa openal lua
+    libdevil freetype physfs libmodplug mpg123 libvorbis libogg
+  ];
+
+  preConfigure = ''
+    luaoptions="${"''"} lua luajit "
+    for i in lua luajit-; do
+      for j in 5 5.0 5.1 5.2 5.3 5.4; do
+        luaoptions="$luaoptions $i$j "
+      done
+    done
+    luaso="$(echo "${lua}/lib/"lib*.so.*)"
+    luaso="''${luaso##*/lib}"
+    luaso="''${luaso%%.so*}"
+    luaoptions="$luaoptions $luaso"
+    sed -e "s/${"''"} lua lua.*;/$luaoptions;/" -i configure
+
+    luaincdir="$(echo "${lua}/include"/*/ )"
+    test -d "$luaincdir" && {
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$luaincdir"
+    } || true
+  '';
+
+  NIX_CFLAGS_COMPILE = ''
+    -I${SDL}/include/SDL
+    -I${freetype}include/freetype2
+  '';
+
+  meta = {
+    homepage = "http://love2d.org";
+    description = "A Lua-based 2D game engine/scripting language";
+    license = stdenv.lib.licenses.zlib;
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7491eb99b51..35858a1cdcc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5318,7 +5318,8 @@ let
 
   lolcode = callPackage ../development/interpreters/lolcode { };
 
-  love_0_8 = callPackage ../development/interpreters/love/0.8.nix { };
+  love_0_7 = callPackage ../development/interpreters/love/0.7.nix { lua=lua5_1; };
+  love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; };
   love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
   love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };
   love = love_0_10;

From 4a54794d18683db41d2a4203f14c5debf628883c Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 16:13:47 -0600
Subject: [PATCH 035/338] xara: broken due to patch-tracker.debian.org being
 missing.

---
 pkgs/applications/graphics/xara/default.nix                   | 4 +++-
 .../networking/mailreaders/thunderbird/default.nix            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix
index cd3a09887d0..cc456465ba6 100644
--- a/pkgs/applications/graphics/xara/default.nix
+++ b/pkgs/applications/graphics/xara/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     url = http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2;
     sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh";
   };
-    
+
   nativeBuildInputs = [ automake pkgconfig gettext perl zip ];
   buildInputs = [ wxGTK gtk libxml2 freetype pango ];
 
@@ -17,4 +17,6 @@ stdenv.mkDerivation {
   patches = map fetchurl (import ./debian-patches.nix);
 
   prePatch = "patchShebangs Scripts";
+
+  meta.broken = true;
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 32f77cfa2c2..093e7a22b92 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -13,7 +13,7 @@
   enableOfficialBranding ? false
 }:
 
-let version = "38.3.0"; in
+let version = "38.6.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {

From 1aed3948d7584ff594daf35dd8200e1a74f62213 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 16:50:13 -0600
Subject: [PATCH 036/338] pythonmagick: 0.9.11 -> 0.9.12

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

diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index 17bf7d54670..5ab7d4d8a69 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/pkgs/applications/graphics/PythonMagick/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "0.9.11";
+  version = "0.9.12";
 
 in
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   name = "pythonmagick-${version}";
 
   src = fetchurl {
-    url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.gz";
-    sha256 = "01z01mlqkk0lvrh2jsmf84qjw29sq4rpj0653x7nqy7mrszwwp2v";
+    url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.xz";
+    sha256 = "1l1kr3d7l40fkxgs6mrlxj65alv2jizm9hhgg9i9g90a8qj8642b";
   };
 
   buildInputs = [python boost pkgconfig imagemagick];

From 7df907b27278abc3c3b716473c188cbff5996f84 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 16:54:04 -0600
Subject: [PATCH 037/338] moodle: 2.8.5 -> 2.8.10 for CVE-2016-0724
 CVE-2016-0725

---
 .../services/web-servers/apache-httpd/moodle.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/moodle.nix b/nixos/modules/services/web-servers/apache-httpd/moodle.nix
index 84c8281ecd8..87b1fba5aa1 100644
--- a/nixos/modules/services/web-servers/apache-httpd/moodle.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/moodle.nix
@@ -46,16 +46,16 @@ let
     '';
   # Unpack Moodle and put the config file in its root directory.
   moodleRoot = pkgs.stdenv.mkDerivation rec {
-    name= "moodle-2.8.5";
+    name= "moodle-2.8.10";
 
     src = pkgs.fetchurl {
       url = "https://download.moodle.org/stable28/${name}.tgz";
-      sha256 = "1a159a193010cddedce10ee009184502e6f732e4d7c85167d8597fe5dff9e190";
+      sha256 = "0c3r5081ipcwc9s6shakllnrkd589y2ln5z5m1q09l4h6a7cy4z2";
     };
 
     buildPhase =
       ''
-      ''; 
+      '';
 
     installPhase =
       ''
@@ -132,7 +132,7 @@ in
         cleartext in the Nix store!
       '';
     };
-    
+
     dbPrefix = mkOption {
       default = "mdl_";
       example = "my_other_mdl_";
@@ -158,7 +158,7 @@ in
       type = types.path;
       };
 
-    
+
     extraConfig = mkOption {
       default = "";
       example =

From 3f7c6006664bb203d8dffe74ccb97c5ab35b749c Mon Sep 17 00:00:00 2001
From: makefu <makefu@syntax-fehler.de>
Date: Sun, 28 Feb 2016 01:35:56 +0100
Subject: [PATCH 038/338] services.bepasty: buildEnv for creating PYTHONPATH

Fixes 'You need gevent installed to use this worker.' as well as missing Flask deps.
---
 nixos/modules/services/misc/bepasty.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix
index 12671cb1b6c..5bda73ab64f 100644
--- a/nixos/modules/services/misc/bepasty.nix
+++ b/nixos/modules/services/misc/bepasty.nix
@@ -103,9 +103,13 @@ in
           after = [ "network.target" ];
           restartIfChanged = true;
 
-          environment = {
+          environment = let
+            penv = python.buildEnv.override {
+              extraLibs = [ bepasty gevent ];
+            };
+          in {
             BEPASTY_CONFIG = "${server.workDir}/bepasty-${name}.conf";
-            PYTHONPATH= "${bepasty}/lib/${python.libPrefix}/site-packages:${gevent}/lib/${python.libPrefix}/site-packages";
+            PYTHONPATH= "${penv}/${python.sitePackages}/";
           };
 
           serviceConfig = {

From bd737b105c6f257ed602a939cd3adfb1601d08f4 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sun, 28 Feb 2016 02:39:05 +0100
Subject: [PATCH 039/338] btfs: 2.7 -> 2.8

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

diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix
index 46b015cd08a..0470110fc4b 100644
--- a/pkgs/os-specific/linux/btfs/default.nix
+++ b/pkgs/os-specific/linux/btfs/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "btfs-${version}";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchFromGitHub {
     owner = "johang";
     repo = "btfs";
-    rev = "e816b4718bd5c9d88a99805d19d2ad91971b2338";
-    sha256 = "1mac2dwg0pzpmg0x503a8d8gx3ridi4m1qx4jk6ssvl4g9v6p7fl";
+    rev = "0567010e553b290eaa50b1afaa717dd7656c82de";
+    sha256 = "1x3x1v7fhcfcpffprf63sb720nxci2ap2cq92jy1xd68kmshdmwd";
   };
   
   buildInputs = [
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     autoreconf -i
     substituteInPlace scripts/btplay \
-      --replace /usr/bin/python ${python}/bin/python
+      --replace "/usr/bin/env python" "${python}/bin/python"
   '';
 
   meta = with stdenv.lib; {

From 838379f11786226ad43d35ecc10192ae6addc435 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sun, 28 Feb 2016 02:56:22 +0100
Subject: [PATCH 040/338] bdf2psf: 1.134 -> 1.137

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

diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index 192aed7489d..c6591927657 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bdf2psf-${version}";
-  version = "1.134";
+  version = "1.137";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "1am5ka5qrbh60jjihzqac03ii3ydprvqm3w54dc55a0zwl61njsz";
+    sha256 = "08pgpwg0ccf0j4r8dbaadh1yr4h4fnvkfb5ym49kwvm2p2vxdq32";
   };
 
   buildInputs = [ dpkg ];

From 1c380842d10c7e0a5f385be3d095cddee8ab9da9 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 16 Nov 2015 20:53:39 +0100
Subject: [PATCH 041/338] pixie: init at 0-1333

This is the pixie language, a clojure-like lisp, utilizing the pypy vm
toolkit for JIT, GC and C bindings.
---
 .../interpreters/pixie/default.nix            | 79 +++++++++++++++++++
 .../interpreters/pixie/load_paths.patch       | 25 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 106 insertions(+)
 create mode 100644 pkgs/development/interpreters/pixie/default.nix
 create mode 100644 pkgs/development/interpreters/pixie/load_paths.patch

diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
new file mode 100644
index 00000000000..85af751809c
--- /dev/null
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -0,0 +1,79 @@
+{ stdenv, fetchgit, fetchurl, python, makeWrapper, pkgconfig, gcc,
+  pypy, libffi, libedit, libuv, boost, zlib,
+  variant ? "jit", buildWithPypy ? false }:
+
+let
+  commit-count = "1333";
+  common-flags = "--thread --gcrootfinder=shadowstack --continuation";
+  variants = {
+    jit = { flags = "--opt=jit"; target = "target.py"; };
+    jit-preload = { flags = "--opt=jit"; target = "target_preload.py"; };
+    no-jit = { flags = ""; target = "target.py"; };
+    no-jit-preload = { flags = ""; target = "target_preload.py"; };
+  };
+  pixie-src = fetchgit {
+    url = "https://github.com/pixie-lang/pixie.git";
+    rev = "36ce07e1cd85ca82eedadf366bef3bb57a627a2a";
+    sha256 = "1b3v99c0is33w029r15qvd0mkrc5n1mrvjjmfpcd9yvhvqb2vcjs";
+  };
+  pypy-tag = "81254";
+  pypy-src = fetchurl {
+    name = "pypy-src-${pypy-tag}";
+    url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2";
+    sha256 = "1cs9xqs1rmzdcnwxxkbvy064s5cbp6vvzhn2jmyzh5kg4di1r3bn";
+  };
+  libs = [ libffi libedit libuv boost.dev boost.lib zlib ];
+  include-path = stdenv.lib.concatStringsSep ":"
+                   (map (p: "${p}/include") libs);
+  library-path = stdenv.lib.concatStringsSep ":"
+                   (map (p: "${p}/lib") libs);
+  bin-path = stdenv.lib.concatStringsSep ":"
+               (map (p: "${p}/bin") [ gcc ]);
+  build = {flags, target}: stdenv.mkDerivation rec {
+    name = "pixie-${version}";
+    version = "0-r${commit-count}-${variant}";
+    nativeBuildInputs = libs;
+    buildInputs = [ pkgconfig makeWrapper ];
+    PYTHON = if buildWithPypy
+      then "${pypy}/pypy-c/.pypy-c-wrapped"
+      else "${python}/bin/python";
+    unpackPhase = ''
+      cp -R ${pixie-src} pixie-src
+      mkdir pypy-src
+      (cd pypy-src
+       tar --strip-components=1 -xjf ${pypy-src})
+      chmod -R +w pypy-src pixie-src
+    '';
+    patchPhase = ''
+      (cd pixie-src
+       patch -p1 < ${./load_paths.patch}
+       libraryPaths='["${libuv}" "${libedit}" "${libffi}" "${boost.dev}" "${boost.lib}" "${zlib}"]'
+       export libraryPaths
+       substituteAllInPlace ./pixie/ffi-infer.pxi)
+    '';
+    buildPhase = ''(
+      PYTHONPATH="`pwd`/pypy-src:$PYTHONPATH";
+      RPYTHON="`pwd`/pypy-src/rpython/bin/rpython";
+      cd pixie-src
+      $PYTHON $RPYTHON ${common-flags} ${target}
+      export LD_LIBRARY_PATH="${library-path}:$LD_LIBRARY_PATH"
+      find pixie -name "*.pxi" -exec ./pixie-vm -c {} \;
+    )'';
+    installPhase = ''
+      mkdir -p $out/share $out/bin
+      cp pixie-src/pixie-vm $out/share/pixie-vm
+      cp -R pixie-src/pixie $out/share/pixie
+      makeWrapper $out/share/pixie-vm $out/bin/pxi \
+        --prefix LD_LIBRARY_PATH : ${library-path} \
+        --prefix C_INCLUDE_PATH : ${include-path} \
+        --prefix LIBRARY_PATH : ${library-path} \
+        --prefix PATH : ${bin-path}
+    '';
+    meta = {
+      description = "Pixie is a clojure-like lisp, built with the pypy vm toolkit.";
+      homepage = "https://github.com/pixie-lang/pixie";
+      license = stdenv.lib.licenses.lgpl3;
+      platforms = stdenv.lib.platforms.linux;
+    };
+  };
+in build (builtins.getAttr variant variants)
diff --git a/pkgs/development/interpreters/pixie/load_paths.patch b/pkgs/development/interpreters/pixie/load_paths.patch
new file mode 100644
index 00000000000..a36d280c586
--- /dev/null
+++ b/pkgs/development/interpreters/pixie/load_paths.patch
@@ -0,0 +1,25 @@
+diff --git a/pixie/ffi-infer.pxi b/pixie/ffi-infer.pxi
+index 9f13ac7..74301c2 100644
+--- a/pixie/ffi-infer.pxi
++++ b/pixie/ffi-infer.pxi
+@@ -1,15 +1,12 @@
+ (ns pixie.ffi-infer
+   (:require [pixie.io-blocking :as io]))
+ 
++(defn -add-library-path [p]
++  (swap! load-paths conj (str p "/include"))
++  (swap! load-paths conj (str p "/lib")))
+ 
+-(defn -add-rel-path [rel]
+-  (swap! load-paths conj (str (first @load-paths) "/" rel)))
+-
+-(-add-rel-path "lib")
+-(-add-rel-path "include")
+-(-add-rel-path "../lib")
+-(-add-rel-path "../include")
+-
++(doseq [lp @libraryPaths@]
++  (-add-library-path lp))
+ 
+ (def *config* nil)
+ (set-dynamic! (var *config*))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f756a175ac..74bba53647c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5507,6 +5507,8 @@ let
     wrapPython = pythonPackages.wrapPython;
   };
 
+  pixie = callPackage ../development/interpreters/pixie { };
+
   bundix = callPackage ../development/interpreters/ruby/bundix {
     ruby = ruby_2_1_3;
   };

From 110dfca98896cda1599eb873aef623c7bd9c92de Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <daniel.fullmer@yale.edu>
Date: Sat, 27 Feb 2016 22:13:30 -0500
Subject: [PATCH 042/338] zerotierone: hardcoded path fix

New code in zerotier broke the previous substitution where we refer to
the correct path for "ip".
---
 pkgs/tools/networking/zerotierone/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index e2ba2102d76..9f5f777a239 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       substituteInPlace ./make-linux.mk \
           --replace 'CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)' "CC=${gcc}/bin/g++";
       substituteInPlace ./osdep/LinuxEthernetTap.cpp \
-          --replace '/sbin/ip' "${iproute}/bin/ip"
+          --replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",'
   '';
 
   buildInputs = [ openssl lzo zlib gcc iproute ];

From 8fa1fb492064c18f7591845ac845e1b4d0e8e2f1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 28 Feb 2016 04:51:07 +0100
Subject: [PATCH 043/338] connman-dmenu: init at git-29-9-2015

fix indentation
---
 .../networking/connman_dmenu/default.nix      | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/networking/connman_dmenu/default.nix

diff --git a/pkgs/tools/networking/connman_dmenu/default.nix b/pkgs/tools/networking/connman_dmenu/default.nix
new file mode 100644
index 00000000000..42ef7f4f4da
--- /dev/null
+++ b/pkgs/tools/networking/connman_dmenu/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, connman, dmenu }:
+stdenv.mkDerivation rec {
+  name = "connman_dmenu-${version}";
+  version = "git-29-9-2015";
+
+  src = fetchFromGitHub {
+    owner = "march-linux";
+    repo = "connman_dmenu";
+    rev = "cc89fec40b574b0d234afeb70ea3c94626ca3f5c";
+    sha256 = "061fi83pai4n19l9d7wq6wwj2d7cixwkhkh742c5ibmw1wb274yk";
+  };
+
+  buildInputs = [ connman dmenu ];
+
+  phases = "unpackPhase patchPhase installPhase fixupPhase";
+
+  # remove root requirement, see: https://github.com/march-linux/connman_dmenu/issues/3
+  patchPhase = ''
+    sed -i '89,92d' connman_dmenu
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp connman_dmenu $out/bin/
+  '';
+
+  meta = {
+    description  = "A dmenu wrapper for connmann";
+    homepage     = https://github.com/march-linux/connman_dmenu;
+    license      = stdenv.lib.licenses.free;
+    maintainers  = [ stdenv.lib.maintainers.magnetophon ];
+    platforms    = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7491eb99b51..0fdd1dbf451 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1134,6 +1134,8 @@ let
 
   connmanui = callPackage ../tools/networking/connmanui { };
 
+  connman_dmenu = callPackage ../tools/networking/connman_dmenu  { };
+
   convertlit = callPackage ../tools/text/convertlit { };
 
   collectd = callPackage ../tools/system/collectd {

From a0753c7cb2a7b11629fd0a217085659afa8d5fea Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sun, 13 Dec 2015 16:13:01 +0100
Subject: [PATCH 044/338] nsd: 4.1.6 -> 4.1.7

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

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 2bd755d0324..d11ef186c31 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -13,11 +13,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.6";
+  name = "nsd-4.1.7";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "0pvpsxhil60m21h3pqlzs0l5m8qd3l6j8fkjyfg8plwmbh2j5xl8";
+    sha256 = "12hskfgfbkvcgpa1xxkqd8lnc6xvln1amn97x6avfnj9kfrbxa3v";
   };
 
   buildInputs = [ libevent openssl ];
@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.nlnetlabs.nl;
     description = "Authoritative only, high performance, simple and open source name server";
     license = licenses.bsd3;
-
     platforms = platforms.unix;
     maintainers = [ maintainers.hrdinka ];
   };

From 8442a7d12c399cc8bbe6cd6c4092b0df9f55dbac Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 19 Jan 2016 10:34:58 +0100
Subject: [PATCH 045/338] nsd service: code cleanup

Puts everything in alphanumeric order and removes unnecessary spaces to better
match NixOS coding style.
---
 nixos/modules/services/networking/nsd.nix | 856 +++++++++++-----------
 1 file changed, 432 insertions(+), 424 deletions(-)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 10566310041..4d67703d279 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -7,14 +7,14 @@ let
 
   username = "nsd";
   stateDir = "/var/lib/nsd";
-  pidFile  = stateDir + "/var/nsd.pid";
+  pidFile = stateDir + "/var/nsd.pid";
 
   nsdPkg = pkgs.nsd.override {
     bind8Stats = cfg.bind8Stats;
-    ipv6       = cfg.ipv6;
-    ratelimit  = cfg.ratelimit.enable;
+    ipv6 = cfg.ipv6;
+    ratelimit = cfg.ratelimit.enable;
     rootServer = cfg.rootServer;
-    zoneStats  = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0;
+    zoneStats = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0;
   };
 
   zoneFiles = pkgs.stdenv.mkDerivation {
@@ -30,59 +30,60 @@ let
       ];
   };
 
+  # options are ordered alphanumerically by the nixos option name
   configFile = pkgs.writeText "nsd.conf" ''
     server:
-      username: ${username}
       chroot:   "${stateDir}"
+      username: ${username}
 
       # The directory for zonefile: files. The daemon chdirs here.
       zonesdir: "${stateDir}"
 
       # the list of dynamically added zones.
-      zonelistfile: "${stateDir}/var/zone.list"
       database:     "${stateDir}/var/nsd.db"
       pidfile:      "${pidFile}"
       xfrdfile:     "${stateDir}/var/xfrd.state"
       xfrdir:       "${stateDir}/tmp"
+      zonelistfile: "${stateDir}/var/zone.list"
 
       # interfaces
     ${forEach "  ip-address: " cfg.interfaces}
 
-      server-count:        ${toString cfg.serverCount}
-      ip-transparent:      ${yesOrNo  cfg.ipTransparent}
-      do-ip4:              ${yesOrNo  cfg.ipv4}
-      do-ip6:              ${yesOrNo  cfg.ipv6}
-      port:                ${toString cfg.port}
-      verbosity:           ${toString cfg.verbosity}
       hide-version:        ${yesOrNo  cfg.hideVersion}
       identity:            "${cfg.identity}"
+      ip-transparent:      ${yesOrNo  cfg.ipTransparent}
+      do-ip4:              ${yesOrNo  cfg.ipv4}
+      ipv4-edns-size:      ${toString cfg.ipv4EDNSSize}
+      do-ip6:              ${yesOrNo  cfg.ipv6}
+      ipv6-edns-size:      ${toString cfg.ipv6EDNSSize}
       ${maybeString "nsid: " cfg.nsid}
+      port:                ${toString cfg.port}
+      server-count:        ${toString cfg.serverCount}
+      ${if cfg.statistics == null then "" else "statistics:          ${toString cfg.statistics}"}
       tcp-count:           ${toString cfg.tcpCount}
       tcp-query-count:     ${toString cfg.tcpQueryCount}
       tcp-timeout:         ${toString cfg.tcpTimeout}
-      ipv4-edns-size:      ${toString cfg.ipv4EDNSSize}
-      ipv6-edns-size:      ${toString cfg.ipv6EDNSSize}
-      ${if cfg.statistics == null then "" else "statistics:          ${toString cfg.statistics}"}
+      verbosity:           ${toString cfg.verbosity}
       xfrd-reload-timeout: ${toString cfg.xfrdReloadTimeout}
       zonefiles-check:     ${yesOrNo  cfg.zonefilesCheck}
 
-      rrl-size:                ${toString cfg.ratelimit.size}
-      rrl-ratelimit:           ${toString cfg.ratelimit.ratelimit}
-      rrl-whitelist-ratelimit: ${toString cfg.ratelimit.whitelistRatelimit}
-      ${maybeString "rrl-slip: "               cfg.ratelimit.slip}
       ${maybeString "rrl-ipv4-prefix-length: " cfg.ratelimit.ipv4PrefixLength}
       ${maybeString "rrl-ipv6-prefix-length: " cfg.ratelimit.ipv6PrefixLength}
+      rrl-ratelimit:           ${toString cfg.ratelimit.ratelimit}
+      ${maybeString "rrl-slip: "               cfg.ratelimit.slip}
+      rrl-size:                ${toString cfg.ratelimit.size}
+      rrl-whitelist-ratelimit: ${toString cfg.ratelimit.whitelistRatelimit}
 
     ${keyConfigFile}
 
     remote-control:
       control-enable:    ${yesOrNo  cfg.remoteControl.enable}
-    ${forEach "  control-interface: " cfg.remoteControl.interfaces}
-      control-port:      ${toString cfg.port}
-      server-key-file:   "${cfg.remoteControl.serverKeyFile}"
-      server-cert-file:  "${cfg.remoteControl.serverCertFile}"
       control-key-file:  "${cfg.remoteControl.controlKeyFile}"
       control-cert-file: "${cfg.remoteControl.controlCertFile}"
+    ${forEach "  control-interface: " cfg.remoteControl.interfaces}
+      control-port:      ${toString cfg.remoteControl.port}
+      server-key-file:   "${cfg.remoteControl.serverKeyFile}"
+      server-cert-file:  "${cfg.remoteControl.serverCertFile}"
 
     # zone files reside in "${zoneFiles}" linked to "${stateDir}/zones"
     ${concatStrings (mapAttrsToList zoneConfigFile zoneConfigs)}
@@ -90,9 +91,9 @@ let
     ${cfg.extraConfig}
   '';
 
-  yesOrNo     = b: if b then "yes" else "no";
+  yesOrNo = b: if b then "yes" else "no";
   maybeString = pre: s: if s == null then "" else ''${pre} "${s}"'';
-  forEach     = pre: l: concatMapStrings (x: pre + x + "\n") l;
+  forEach = pre: l: concatMapStrings (x: pre + x + "\n") l;
 
 
   keyConfigFile = concatStrings (mapAttrsToList (keyName: keyOptions: ''
@@ -111,17 +112,18 @@ let
   '') cfg.keys);
 
 
+  # options are ordered alphanumerically by the nixos option name
   zoneConfigFile = name: zone: ''
     zone:
       name:         "${name}"
       zonefile:     "${stateDir}/zones/${name}"
-      ${maybeString "zonestats: "          zone.zoneStats}
       ${maybeString "outgoing-interface: " zone.outgoingInterface}
     ${forEach     "  rrl-whitelist: "      zone.rrlWhitelist}
+      ${maybeString "zonestats: "          zone.zoneStats}
 
+      allow-axfr-fallback: ${yesOrNo       zone.allowAXFRFallback}
     ${forEach     "  allow-notify: "       zone.allowNotify}
     ${forEach     "  request-xfr: "        zone.requestXFR}
-      allow-axfr-fallback: ${yesOrNo       zone.allowAXFRFallback}
 
     ${forEach     "  notify: "             zone.notify}
       notify-retry:                        ${toString zone.notifyRetry}
@@ -142,7 +144,7 @@ let
       );
 
   # fighting infinite recursion
-  zoneOptions  = zoneOptionsRaw // childConfig zoneOptions1 true;
+  zoneOptions = zoneOptionsRaw // childConfig zoneOptions1 true;
   zoneOptions1 = zoneOptionsRaw // childConfig zoneOptions2 false;
   zoneOptions2 = zoneOptionsRaw // childConfig zoneOptions3 false;
   zoneOptions3 = zoneOptionsRaw // childConfig zoneOptions4 false;
@@ -152,26 +154,25 @@ let
 
   childConfig = x: v: { options.children = { type = types.attrsOf x; visible = v; }; };
 
+  # options are ordered alphanumerically
   zoneOptionsRaw = types.submodule {
     options = {
-      children = mkOption {
-        default     = {};
+
+      allowAXFRFallback = mkOption {
+        type = types.bool;
+        default = true;
         description = ''
-          Children zones inherit all options of their parents. Attributes
-          defined in a child will overwrite the ones of its parent. Only
-          leaf zones will be actually served. This way it's possible to
-          define maybe zones which share most attributes without
-          duplicating everything. This mechanism replaces nsd's patterns
-          in a save and functional way.
+          If NSD as secondary server should be allowed to AXFR if the primary
+          server does not allow IXFR.
         '';
       };
 
       allowNotify = mkOption {
-        type        = types.listOf types.str;
-        default     = [ ];
-        example     = [ "192.0.2.0/24 NOKEY" "10.0.0.1-10.0.0.5 my_tsig_key_name"
-                        "10.0.3.4&255.255.0.0 BLOCKED"
-                      ];
+        type = types.listOf types.str;
+        default = [ ];
+        example = [ "192.0.2.0/24 NOKEY" "10.0.0.1-10.0.0.5 my_tsig_key_name"
+                    "10.0.3.4&255.255.0.0 BLOCKED"
+                  ];
         description = ''
           Listed primary servers are allowed to notify this secondary server.
           <screen><![CDATA[
@@ -193,28 +194,32 @@ let
         '';
       };
 
-      requestXFR = mkOption {
-        type        = types.listOf types.str;
-        default     = [];
-        example     = [];
+      children = mkOption {
+        default = {};
         description = ''
-          Format: <code>[AXFR|UDP] &lt;ip-address&gt; &lt;key-name | NOKEY&gt;</code>
+          Children zones inherit all options of their parents. Attributes
+          defined in a child will overwrite the ones of its parent. Only
+          leaf zones will be actually served. This way it's possible to
+          define maybe zones which share most attributes without
+          duplicating everything. This mechanism replaces nsd's patterns
+          in a save and functional way.
         '';
       };
 
-      allowAXFRFallback = mkOption {
-        type        = types.bool;
-        default     = true;
+      data = mkOption {
+        type = types.str;
+        default = "";
+        example = "";
         description = ''
-          If NSD as secondary server should be allowed to AXFR if the primary
-          server does not allow IXFR.
+          The actual zone data. This is the content of your zone file.
+          Use imports or pkgs.lib.readFile if you don't want this data in your config file.
         '';
       };
 
       notify = mkOption {
-        type        = types.listOf types.str;
-        default     = [];
-        example     = [ "10.0.0.1@3721 my_key" "::5 NOKEY" ];
+        type = types.listOf types.str;
+        default = [];
+        example = [ "10.0.0.1@3721 my_key" "::5 NOKEY" ];
         description = ''
           This primary server will notify all given secondary servers about
           zone changes.
@@ -231,27 +236,17 @@ let
       };
 
       notifyRetry = mkOption {
-        type        = types.int;
-        default     = 5;
+        type = types.int;
+        default = 5;
         description = ''
           Specifies the number of retries for failed notifies. Set this along with notify.
         '';
       };
 
-      provideXFR = mkOption {
-        type        = types.listOf types.str;
-        default     = [];
-        example     = [ "192.0.2.0/24 NOKEY" "192.0.2.0/24 my_tsig_key_name" ];
-        description = ''
-          Allow these IPs and TSIG to transfer zones, addr TSIG|NOKEY|BLOCKED
-          address range 192.0.2.0/24, 1.2.3.4&amp;255.255.0.0, 3.0.2.20-3.0.2.40
-        '';
-      };
-
       outgoingInterface = mkOption {
-        type        = types.nullOr types.str;
-        default     = null;
-        example     = "2000::1@1234";
+        type = types.nullOr types.str;
+        default = null;
+        example = "2000::1@1234";
         description = ''
           This address will be used for zone-transfere requests if configured
           as a secondary server or notifications in case of a primary server.
@@ -260,9 +255,28 @@ let
         '';
       };
 
+      provideXFR = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "192.0.2.0/24 NOKEY" "192.0.2.0/24 my_tsig_key_name" ];
+        description = ''
+          Allow these IPs and TSIG to transfer zones, addr TSIG|NOKEY|BLOCKED
+          address range 192.0.2.0/24, 1.2.3.4&amp;255.255.0.0, 3.0.2.20-3.0.2.40
+        '';
+      };
+
+      requestXFR = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [];
+        description = ''
+          Format: <code>[AXFR|UDP] &lt;ip-address&gt; &lt;key-name | NOKEY&gt;</code>
+        '';
+      };
+
       rrlWhitelist = mkOption {
-        type        = types.listOf types.str;
-        default     = [];
+        type = types.listOf types.str;
+        default = [];
         description = ''
           Whitelists the given rrl-types.
           The RRL classification types are:  nxdomain,  error, referral, any,
@@ -270,20 +284,10 @@ let
         '';
       };
 
-      data = mkOption {
-        type        = types.str;
-        default     = "";
-        example     = "";
-        description = ''
-          The actual zone data. This is the content of your zone file.
-          Use imports or pkgs.lib.readFile if you don't want this data in your config file.
-        '';
-      };
-
       zoneStats = mkOption {
-        type        = types.nullOr types.str;
-        default     = null;
-        example     = "%s";
+        type = types.nullOr types.str;
+        default = null;
+        example = "%s";
         description = ''
           When set to something distinct to null NSD is able to collect
           statistics per zone. All statistics of this zone(s) will be added
@@ -292,403 +296,407 @@ let
           and stats_noreset.
         '';
       };
+
     };
   };
 
 in
 {
-  options = {
-    services.nsd = {
+  # options are ordered alphanumerically
+  options.services.nsd = {
 
-      enable = mkEnableOption "NSD authoritative DNS server";
-      bind8Stats = mkEnableOption "BIND8 like statistics";
+    enable = mkEnableOption "NSD authoritative DNS server";
 
-      rootServer = mkOption {
-        type        = types.bool;
-        default     = false;
-        description = ''
-          Wheter if this server will be a root server (a DNS root server, you
-          usually don't want that).
-        '';
-      };
+    bind8Stats = mkEnableOption "BIND8 like statistics";
 
-      interfaces = mkOption {
-        type        = types.listOf types.str;
-        default     = [ "127.0.0.0" "::1" ];
-        description = ''
-          What addresses the server should listen to.
-        '';
-      };
+    extraConfig = mkOption {
+      type = types.str;
+      default = "";
+      description = ''
+        Extra nsd config.
+      '';
+    };
 
-      serverCount = mkOption {
-        type        = types.int;
-        default     = 1;
-        description = ''
-          Number of NSD servers to fork. Put the number of CPUs to use here.
-        '';
-      };
+    hideVersion = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Wheter NSD should answer VERSION.BIND and VERSION.SERVER CHAOS class queries.
+      '';
+    };
 
-      ipTransparent = mkOption {
-        type        = types.bool;
-        default     = false;
-        description = ''
-          Allow binding to non local addresses.
-        '';
-      };
+    identity = mkOption {
+      type = types.str;
+      default = "unidentified server";
+      description = ''
+        Identify the server (CH TXT ID.SERVER entry).
+      '';
+    };
 
-      ipv4 = mkOption {
-        type        = types.bool;
-        default     = true;
-        description = ''
-          Wheter to listen on IPv4 connections.
-        '';
-      };
+    interfaces = mkOption {
+      type = types.listOf types.str;
+      default = [ "127.0.0.0" "::1" ];
+      description = ''
+        What addresses the server should listen to.
+      '';
+    };
 
-      ipv6 = mkOption {
-        type        = types.bool;
-        default     = true;
-        description = ''
-          Wheter to listen on IPv6 connections.
-        '';
-      };
+    ipTransparent = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Allow binding to non local addresses.
+      '';
+    };
 
-      port = mkOption {
-        type        = types.int;
-        default     = 53;
-        description = ''
-          Port the service should bind do.
-        '';
-      };
+    ipv4 = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Wheter to listen on IPv4 connections.
+      '';
+    };
 
-      verbosity = mkOption {
-        type        = types.int;
-        default     = 0;
-        description = ''
-          Verbosity level.
-        '';
-      };
+    ipv4EDNSSize = mkOption {
+      type = types.int;
+      default = 4096;
+      description = ''
+        Preferred EDNS buffer size for IPv4.
+      '';
+    };
 
-      hideVersion = mkOption {
-        type        = types.bool;
-        default     = true;
-        description = ''
-          Wheter NSD should answer VERSION.BIND and VERSION.SERVER CHAOS class queries.
-        '';
-      };
+    ipv6 = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Wheter to listen on IPv6 connections.
+      '';
+    };
 
-      identity = mkOption {
-        type        = types.str;
-        default     = "unidentified server";
-        description = ''
-          Identify the server (CH TXT ID.SERVER entry).
-        '';
-      };
+    ipv6EDNSSize = mkOption {
+      type = types.int;
+      default = 4096;
+      description = ''
+        Preferred EDNS buffer size for IPv6.
+      '';
+    };
 
-      nsid = mkOption {
-        type        = types.nullOr types.str;
-        default     = null;
-        description = ''
-          NSID identity (hex string, or "ascii_somestring").
-        '';
-      };
+    nsid = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        NSID identity (hex string, or "ascii_somestring").
+      '';
+    };
 
-      tcpCount = mkOption {
-        type        = types.int;
-        default     = 100;
-        description = ''
-          Maximum number of concurrent TCP connections per server.
-        '';
-      };
+    port = mkOption {
+      type = types.int;
+      default = 53;
+      description = ''
+        Port the service should bind do.
+      '';
+    };
 
-      tcpQueryCount = mkOption {
-        type        = types.int;
-        default     = 0;
-        description = ''
-          Maximum number of queries served on a single TCP connection.
-          0 means no maximum.
-        '';
-      };
+    rootServer = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Wheter if this server will be a root server (a DNS root server, you
+        usually don't want that).
+      '';
+    };
 
-      tcpTimeout = mkOption {
-        type        = types.int;
-        default     = 120;
-        description = ''
-          TCP timeout in seconds.
-        '';
-      };
+    serverCount = mkOption {
+      type = types.int;
+      default = 1;
+      description = ''
+        Number of NSD servers to fork. Put the number of CPUs to use here.
+      '';
+    };
 
-      ipv4EDNSSize = mkOption {
-        type        = types.int;
-        default     = 4096;
-        description = ''
-          Preferred EDNS buffer size for IPv4.
-        '';
-      };
+    statistics = mkOption {
+      type = types.nullOr types.int;
+      default = null;
+      description = ''
+        Statistics are produced every number of seconds. Prints to log.
+        If null no statistics are logged.
+      '';
+    };
 
-      ipv6EDNSSize = mkOption {
-        type        = types.int;
-        default     = 4096;
-        description = ''
-          Preferred EDNS buffer size for IPv6.
-        '';
-      };
+    tcpCount = mkOption {
+      type = types.int;
+      default = 100;
+      description = ''
+        Maximum number of concurrent TCP connections per server.
+      '';
+    };
 
-      statistics = mkOption {
-        type        = types.nullOr types.int;
-        default     = null;
-        description = ''
-          Statistics are produced every number of seconds. Prints to log.
-          If null no statistics are logged.
-        '';
-      };
+    tcpQueryCount = mkOption {
+      type = types.int;
+      default = 0;
+      description = ''
+        Maximum number of queries served on a single TCP connection.
+        0 means no maximum.
+      '';
+    };
 
-      xfrdReloadTimeout = mkOption {
-        type        = types.int;
-        default     = 1;
-        description = ''
-          Number of seconds between reloads triggered by xfrd.
-        '';
-      };
+    tcpTimeout = mkOption {
+      type = types.int;
+      default = 120;
+      description = ''
+        TCP timeout in seconds.
+      '';
+    };
 
-      zonefilesCheck = mkOption {
-        type        = types.bool;
-        default     = true;
-        description = ''
-          Wheter to check mtime of all zone files on start and sighup.
-        '';
-      };
+    verbosity = mkOption {
+      type = types.int;
+      default = 0;
+      description = ''
+        Verbosity level.
+      '';
+    };
+
+    xfrdReloadTimeout = mkOption {
+      type = types.int;
+      default = 1;
+      description = ''
+        Number of seconds between reloads triggered by xfrd.
+      '';
+    };
+
+    zonefilesCheck = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Wheter to check mtime of all zone files on start and sighup.
+      '';
+    };
 
 
-      extraConfig = mkOption {
-        type        = types.str;
-        default     = "";
-        description = ''
-          Extra nsd config.
-        '';
-      };
+    keys = mkOption {
+      type = types.attrsOf (types.submodule {
+        options = {
 
-
-      ratelimit = {
-        enable = mkEnableOption "ratelimit capabilities";
-
-        size = mkOption {
-          type        = types.int;
-          default     = 1000000;
-          description = ''
-            Size of the hashtable. More buckets use more memory but lower
-            the chance of hash hash collisions.
-          '';
-        };
-
-        ratelimit = mkOption {
-          type        = types.int;
-          default     = 200;
-          description = ''
-            Max qps allowed from any query source.
-            0 means unlimited. With an verbosity of 2 blocked and
-            unblocked subnets will be logged.
-          '';
-        };
-
-        whitelistRatelimit = mkOption {
-          type        = types.int;
-          default     = 2000;
-          description = ''
-            Max qps allowed from whitelisted sources.
-            0 means unlimited. Set the rrl-whitelist option for specific
-            queries to apply this limit instead of the default to them.
-          '';
-        };
-
-        slip = mkOption {
-          type        = types.nullOr types.int;
-          default     = null;
-          description = ''
-            Number of packets that get discarded before replying a SLIP response.
-            0 disables SLIP responses. 1 will make every response a SLIP response.
-          '';
-        };
-
-        ipv4PrefixLength = mkOption {
-          type        = types.nullOr types.int;
-          default     = null;
-          description = ''
-            IPv4 prefix length. Addresses are grouped by netblock.
-          '';
-        };
-
-        ipv6PrefixLength = mkOption {
-          type        = types.nullOr types.int;
-          default     = null;
-          description = ''
-            IPv6 prefix length. Addresses are grouped by netblock.
-          '';
-        };
-      };
-
-
-      remoteControl = {
-        enable = mkEnableOption "remote control via nsd-control";
-
-        interfaces = mkOption {
-          type        = types.listOf types.str;
-          default     = [ "127.0.0.1" "::1" ];
-          description = ''
-            Which interfaces NSD should bind to for remote control.
-          '';
-        };
-
-        port = mkOption {
-          type        = types.int;
-          default     = 8952;
-          description = ''
-            Port number for remote control operations (uses TLS over TCP).
-          '';
-        };
-
-        serverKeyFile = mkOption {
-          type        = types.path;
-          default     = "/etc/nsd/nsd_server.key";
-          description = ''
-            Path to the server private key, which is used by the server
-            but not by nsd-control. This file is generated by nsd-control-setup.
-          '';
-        };
-
-        serverCertFile = mkOption {
-          type        = types.path;
-          default     = "/etc/nsd/nsd_server.pem";
-          description = ''
-            Path to the server self signed certificate, which is used by the server
-            but and by nsd-control. This file is generated by nsd-control-setup.
-          '';
-        };
-
-        controlKeyFile = mkOption {
-          type        = types.path;
-          default     = "/etc/nsd/nsd_control.key";
-          description = ''
-            Path to the client private key, which is used by nsd-control
-            but not by the server. This file is generated by nsd-control-setup.
-          '';
-        };
-
-        controlCertFile = mkOption {
-          type        = types.path;
-          default     = "/etc/nsd/nsd_control.pem";
-          description = ''
-            Path to the client certificate signed with the server certificate.
-            This file is used by nsd-control and generated by nsd-control-setup.
-          '';
-        };
-      };
-
-
-      keys = mkOption {
-        type = types.attrsOf (types.submodule {
-          options = {
-            algorithm = mkOption {
-              type        = types.str;
-              default     = "hmac-sha256";
-              description = ''
-                Authentication algorithm for this key.
-              '';
-            };
-
-            keyFile = mkOption {
-              type        = types.path;
-              description = ''
-                Path to the file which contains the actual base64 encoded
-                key. The key will be copied into "${stateDir}/private" before
-                NSD starts. The copied file is only accessibly by the NSD
-                user.
-              '';
-            };
+          algorithm = mkOption {
+            type = types.str;
+            default = "hmac-sha256";
+            description = ''
+              Authentication algorithm for this key.
+            '';
           };
-        });
-        default = {};
-        example = {
-          "tsig.example.org" = {
-            algorithm = "hmac-md5";
-            secret    = "aaaaaabbbbbbccccccdddddd";
+
+          keyFile = mkOption {
+            type = types.path;
+            description = ''
+              Path to the file which contains the actual base64 encoded
+              key. The key will be copied into "${stateDir}/private" before
+              NSD starts. The copied file is only accessibly by the NSD
+              user.
+            '';
           };
+
         };
+      });
+      default = {};
+      example = {
+        "tsig.example.org" = {
+          algorithm = "hmac-md5";
+          secret = "aaaaaabbbbbbccccccdddddd";
+        };
+      };
+      description = ''
+        Define your TSIG keys here.
+      '';
+    };
+
+
+    ratelimit = {
+
+      enable = mkEnableOption "ratelimit capabilities";
+
+      ipv4PrefixLength = mkOption {
+        type = types.nullOr types.int;
+        default = null;
         description = ''
-          Define your TSIG keys here.
+          IPv4 prefix length. Addresses are grouped by netblock.
         '';
       };
 
-      zones = mkOption {
-        type        = types.attrsOf zoneOptions;
-        default     = {};
-        example     = literalExample ''
-          { "serverGroup1" = {
-              provideXFR = [ "10.1.2.3 NOKEY" ];
-              children = {
-                "example.com." = {
-                  data = '''
-                    $ORIGIN example.com.
-                    $TTL    86400
-                    @ IN SOA a.ns.example.com. admin.example.com. (
-                    ...
-                  ''';
-                };
-                "example.org." = {
-                  data = '''
-                    $ORIGIN example.org.
-                    $TTL    86400
-                    @ IN SOA a.ns.example.com. admin.example.com. (
-                    ...
-                  ''';
-                };
-              };
-            };
-
-            "example.net." = {
-              provideXFR = [ "10.3.2.1 NOKEY" ];
-              data = '''
-                ...
-              ''';
-            };
-          }
-        '';
+      ipv6PrefixLength = mkOption {
+        type = types.nullOr types.int;
+        default = null;
         description = ''
-          Define your zones here. Zones can cascade other zones and therefore
-          inherit settings from parent zones. Look at the definition of
-          children to learn about inheritance and child zones.
-          The given example will define 3 zones (example.(com|org|net).). Both
-          example.com. and example.org. inherit their configuration from
-          serverGroup1.
+          IPv6 prefix length. Addresses are grouped by netblock.
+        '';
+      };
+
+      ratelimit = mkOption {
+        type = types.int;
+        default = 200;
+        description = ''
+          Max qps allowed from any query source.
+          0 means unlimited. With an verbosity of 2 blocked and
+          unblocked subnets will be logged.
+        '';
+      };
+
+      slip = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        description = ''
+          Number of packets that get discarded before replying a SLIP response.
+          0 disables SLIP responses. 1 will make every response a SLIP response.
+        '';
+      };
+
+      size = mkOption {
+        type = types.int;
+        default = 1000000;
+        description = ''
+          Size of the hashtable. More buckets use more memory but lower
+          the chance of hash hash collisions.
+        '';
+      };
+
+      whitelistRatelimit = mkOption {
+        type = types.int;
+        default = 2000;
+        description = ''
+          Max qps allowed from whitelisted sources.
+          0 means unlimited. Set the rrl-whitelist option for specific
+          queries to apply this limit instead of the default to them.
         '';
       };
 
     };
+
+
+    remoteControl = {
+
+      enable = mkEnableOption "remote control via nsd-control";
+
+      controlCertFile = mkOption {
+        type = types.path;
+        default = "/etc/nsd/nsd_control.pem";
+        description = ''
+          Path to the client certificate signed with the server certificate.
+          This file is used by nsd-control and generated by nsd-control-setup.
+        '';
+      };
+
+      controlKeyFile = mkOption {
+        type = types.path;
+        default = "/etc/nsd/nsd_control.key";
+        description = ''
+          Path to the client private key, which is used by nsd-control
+          but not by the server. This file is generated by nsd-control-setup.
+        '';
+      };
+
+      interfaces = mkOption {
+        type = types.listOf types.str;
+        default = [ "127.0.0.1" "::1" ];
+        description = ''
+          Which interfaces NSD should bind to for remote control.
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 8952;
+        description = ''
+          Port number for remote control operations (uses TLS over TCP).
+        '';
+      };
+
+      serverCertFile = mkOption {
+        type = types.path;
+        default = "/etc/nsd/nsd_server.pem";
+        description = ''
+          Path to the server self signed certificate, which is used by the server
+          but and by nsd-control. This file is generated by nsd-control-setup.
+        '';
+      };
+
+      serverKeyFile = mkOption {
+        type = types.path;
+        default = "/etc/nsd/nsd_server.key";
+        description = ''
+          Path to the server private key, which is used by the server
+          but not by nsd-control. This file is generated by nsd-control-setup.
+        '';
+      };
+
+    };
+
+
+    zones = mkOption {
+      type = types.attrsOf zoneOptions;
+      default = {};
+      example = {
+        "serverGroup1" = {
+          provideXFR = [ "10.1.2.3 NOKEY" ];
+          children = {
+            "example.com." = {
+              data = ''
+                $ORIGIN example.com.
+                $TTL    86400
+                @ IN SOA a.ns.example.com. admin.example.com. (
+                ...
+              '';
+            };
+            "example.org." = {
+              data = ''
+                $ORIGIN example.org.
+                $TTL    86400
+                @ IN SOA a.ns.example.com. admin.example.com. (
+                ...
+              '';
+            };
+          };
+        };
+
+        "example.net." = {
+          provideXFR = [ "10.3.2.1 NOKEY" ];
+          data = ''...'';
+        };
+      };
+      description = ''
+        Define your zones here. Zones can cascade other zones and therefore
+        inherit settings from parent zones. Look at the definition of
+        children to learn about inheritance and child zones.
+        The given example will define 3 zones (example.(com|org|net).). Both
+        example.com. and example.org. inherit their configuration from
+        serverGroup1.
+      '';
+    };
+
   };
 
   config = mkIf cfg.enable {
 
     users.extraGroups = singleton {
       name = username;
-      gid  = config.ids.gids.nsd;
+      gid = config.ids.gids.nsd;
     };
 
     users.extraUsers = singleton {
-      name        = username;
+      name = username;
       description = "NSD service user";
-      home        = stateDir;
+      home = stateDir;
       createHome  = true;
-      uid         = config.ids.uids.nsd;
-      group       = username;
+      uid = config.ids.uids.nsd;
+      group = username;
     };
 
     systemd.services.nsd = {
       description = "NSD authoritative only domain name service";
-      wantedBy    = [ "multi-user.target" ];
-      after       = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
 
       serviceConfig = {
-        PIDFile   = pidFile;
-        Restart   = "always";
+        PIDFile = pidFile;
+        Restart = "always";
         ExecStart = "${nsdPkg}/sbin/nsd -d -c ${configFile}";
       };
 

From 6a096504cc8d661dc12957dbf79b6209a69d72af Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 19 Jan 2016 11:03:57 +0100
Subject: [PATCH 046/338] nsd service: add missing options

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

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 4d67703d279..b822a29423a 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -56,14 +56,18 @@ let
       ipv4-edns-size:      ${toString cfg.ipv4EDNSSize}
       do-ip6:              ${yesOrNo  cfg.ipv6}
       ipv6-edns-size:      ${toString cfg.ipv6EDNSSize}
+      log-time-asci:       ${yesOrNo  cfg.logTimeAscii}
       ${maybeString "nsid: " cfg.nsid}
       port:                ${toString cfg.port}
+      reuseport:           ${yesOrNo  cfg.reuseport}
+      round-robin:         ${yesOrNo  cfg.roundRobin}
       server-count:        ${toString cfg.serverCount}
       ${if cfg.statistics == null then "" else "statistics:          ${toString cfg.statistics}"}
       tcp-count:           ${toString cfg.tcpCount}
       tcp-query-count:     ${toString cfg.tcpQueryCount}
       tcp-timeout:         ${toString cfg.tcpTimeout}
       verbosity:           ${toString cfg.verbosity}
+      ${maybeString "version: " cfg.version}
       xfrd-reload-timeout: ${toString cfg.xfrdReloadTimeout}
       zonefiles-check:     ${yesOrNo  cfg.zonefilesCheck}
 
@@ -381,6 +385,14 @@ in
       '';
     };
 
+    logTimeAscii = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Log time in ascii, if false then in unix epoch seconds.
+      '';
+    };
+
     nsid = mkOption {
       type = types.nullOr types.str;
       default = null;
@@ -397,6 +409,17 @@ in
       '';
     };
 
+    reuseport = mkOption {
+      type = types.bool;
+      default = pkgs.stdenv.isLinux;
+      description = ''
+        Wheter to enable SO_REUSEPORT on all used sockets. This lets multiple
+        processes bind to the same port. This speeds up operation especially
+        if the server count is greater than one and makes fast restarts less
+        prone to fail
+      '';
+    };
+
     rootServer = mkOption {
       type = types.bool;
       default = false;
@@ -406,6 +429,8 @@ in
       '';
     };
 
+    roundRobin = mkEnableOption "round robin rotation of records";
+
     serverCount = mkOption {
       type = types.int;
       default = 1;
@@ -456,6 +481,16 @@ in
       '';
     };
 
+    version = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        The version string replied for CH TXT version.server and version.bind
+        queries. Will use the compiled package version on null.
+        See hideVersion for enabling/disabling this responses.
+      '';
+    };
+
     xfrdReloadTimeout = mkOption {
       type = types.int;
       default = 1;

From c4c9019105f790252a3b996c6dad4c33393e7977 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 19 Jan 2016 11:10:09 +0100
Subject: [PATCH 047/338] nsd service: make use of literalExample

---
 nixos/modules/services/networking/nsd.nix | 62 ++++++++++++-----------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index b822a29423a..5a7bc7f748e 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -533,12 +533,13 @@ in
         };
       });
       default = {};
-      example = {
-        "tsig.example.org" = {
-          algorithm = "hmac-md5";
-          secret = "aaaaaabbbbbbccccccdddddd";
+      example = literalExample ''
+        { "tsig.example.org" = {
+            algorithm = "hmac-md5";
+            keyFile = "/path/to/my/key";
+          };
         };
-      };
+      '';
       description = ''
         Define your TSIG keys here.
       '';
@@ -668,34 +669,37 @@ in
     zones = mkOption {
       type = types.attrsOf zoneOptions;
       default = {};
-      example = {
-        "serverGroup1" = {
-          provideXFR = [ "10.1.2.3 NOKEY" ];
-          children = {
-            "example.com." = {
-              data = ''
-                $ORIGIN example.com.
-                $TTL    86400
-                @ IN SOA a.ns.example.com. admin.example.com. (
-                ...
-              '';
-            };
-            "example.org." = {
-              data = ''
-                $ORIGIN example.org.
-                $TTL    86400
-                @ IN SOA a.ns.example.com. admin.example.com. (
-                ...
-              '';
+      example = literalExample ''
+        { "serverGroup1" = {
+            provideXFR = [ "10.1.2.3 NOKEY" ];
+            children = {
+              "example.com." = {
+                data = '''
+                  $ORIGIN example.com.
+                  $TTL    86400
+                  @ IN SOA a.ns.example.com. admin.example.com. (
+                  ...
+                ''';
+              };
+              "example.org." = {
+                data = '''
+                  $ORIGIN example.org.
+                  $TTL    86400
+                  @ IN SOA a.ns.example.com. admin.example.com. (
+                  ...
+                ''';
+              };
             };
           };
-        };
 
-        "example.net." = {
-          provideXFR = [ "10.3.2.1 NOKEY" ];
-          data = ''...'';
+          "example.net." = {
+            provideXFR = [ "10.3.2.1 NOKEY" ];
+            data = '''
+              ...
+            ''';
+          };
         };
-      };
+      '';
       description = ''
         Define your zones here. Zones can cascade other zones and therefore
         inherit settings from parent zones. Look at the definition of

From 73630b89862222daacd67a3acd0b41cb4e41071a Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Aug 2015 16:39:13 +0200
Subject: [PATCH 048/338] nsd service: add non-backward compatible release note
 entry

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

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index ddbd80a8a00..5c2938794b9 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -226,6 +226,27 @@ programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ];
     was removed. Please review the currently available options.</para>
   </listitem>
 
+  <listitem>
+    <para>
+    The option <option>services.nsd.zones.&lt;name&gt;.data</option> no
+    longer interpret the dollar sign ($) as a shell variable, as such it
+    should not be escaped anymore.  Thus the following zone data:
+    </para>
+    <programlisting>
+\$ORIGIN example.com.
+\$TTL 1800
+@       IN      SOA     ns1.vpn.nbp.name.      admin.example.com. (
+    </programlisting>
+    <para>
+    Should modified to look like the actual file expected by nsd:
+    </para>
+    <programlisting>
+$ORIGIN example.com.
+$TTL 1800
+@       IN      SOA     ns1.vpn.nbp.name.      admin.example.com. (
+    </programlisting>
+  </listitem>
+
 </itemizedlist>
 
 

From fd46f18cf6cb0edcc5a775e7be95a71297f0c54e Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 19 Jan 2016 21:53:16 +0100
Subject: [PATCH 049/338] nsd service: add build time config validation

---
 nixos/modules/services/networking/nsd.nix | 86 +++++++++++++++--------
 1 file changed, 58 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 5a7bc7f748e..b3f2730e672 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -9,6 +9,7 @@ let
   stateDir = "/var/lib/nsd";
   pidFile = stateDir + "/var/nsd.pid";
 
+  # build nsd with the options needed for the given config
   nsdPkg = pkgs.nsd.override {
     bind8Stats = cfg.bind8Stats;
     ipv6 = cfg.ipv6;
@@ -17,21 +18,42 @@ let
     zoneStats = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0;
   };
 
-  zoneFiles = pkgs.stdenv.mkDerivation {
-    preferLocalBuild = true;
+
+  nsdEnv = pkgs.buildEnv {
     name = "nsd-env";
-    buildCommand = concatStringsSep "\n"
-      [ "mkdir -p $out"
-        (concatStrings (mapAttrsToList (zoneName: zoneOptions: ''
-          cat > "$out/${zoneName}" <<_EOF_
-          ${zoneOptions.data}
-          _EOF_
-        '') zoneConfigs))
-      ];
+
+    paths = [ configFile ]
+      ++ mapAttrsToList (name: zone: writeZoneData name zone.data) zoneConfigs;
+
+    postBuild = ''
+      echo "checking zone files"
+      cd $out/zones
+
+      for zoneFile in *; do
+        ${nsdPkg}/sbin/nsd-checkzone "$zoneFile" "$zoneFile" || {
+          if grep -q \\\\\\$ "$zoneFile"; then
+            echo zone "$zoneFile" contains escaped dollar signes \\\$
+            echo Escaping them is not needed any more. Please make shure \
+                 to unescape them where they prefix a variable name
+          fi
+
+          exit 1
+        }
+      done
+
+      echo "checking configuration file"
+      ${nsdPkg}/sbin/nsd-checkconf $out/nsd.conf
+    '';
   };
 
+  writeZoneData = name: text: pkgs.writeTextFile {
+    inherit name text;
+    destination = "/zones/${name}";
+  };
+
+
   # options are ordered alphanumerically by the nixos option name
-  configFile = pkgs.writeText "nsd.conf" ''
+  configFile = pkgs.writeTextDir "nsd.conf" ''
     server:
       chroot:   "${stateDir}"
       username: ${username}
@@ -56,7 +78,7 @@ let
       ipv4-edns-size:      ${toString cfg.ipv4EDNSSize}
       do-ip6:              ${yesOrNo  cfg.ipv6}
       ipv6-edns-size:      ${toString cfg.ipv6EDNSSize}
-      log-time-asci:       ${yesOrNo  cfg.logTimeAscii}
+      log-time-ascii:      ${yesOrNo  cfg.logTimeAscii}
       ${maybeString "nsid: " cfg.nsid}
       port:                ${toString cfg.port}
       reuseport:           ${yesOrNo  cfg.reuseport}
@@ -89,7 +111,6 @@ let
       server-key-file:   "${cfg.remoteControl.serverKeyFile}"
       server-cert-file:  "${cfg.remoteControl.serverCertFile}"
 
-    # zone files reside in "${zoneFiles}" linked to "${stateDir}/zones"
     ${concatStrings (mapAttrsToList zoneConfigFile zoneConfigs)}
 
     ${cfg.extraConfig}
@@ -111,8 +132,8 @@ let
     secret=$(cat "${keyOptions.keyFile}")
     dest="${stateDir}/private/${keyName}"
     echo "  secret: \"$secret\"" > "$dest"
-    ${pkgs.coreutils}/bin/chown ${username}:${username} "$dest"
-    ${pkgs.coreutils}/bin/chmod 0400 "$dest"
+    chown ${username}:${username} "$dest"
+    chmod 0400 "$dest"
   '') cfg.keys);
 
 
@@ -730,31 +751,40 @@ in
 
     systemd.services.nsd = {
       description = "NSD authoritative only domain name service";
+
+      after = [ "keys.target" "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      wants = [ "keys.target" ];
 
       serviceConfig = {
+        ExecStart = "${nsdPkg}/sbin/nsd -d -c ${nsdEnv}/nsd.conf";
         PIDFile = pidFile;
         Restart = "always";
-        ExecStart = "${nsdPkg}/sbin/nsd -d -c ${configFile}";
+        RestartSec = "4s";
+        StartLimitBurst = 4;
+        StartLimitInterval = "5min";
       };
 
       preStart = ''
-        ${pkgs.coreutils}/bin/mkdir -m 0700 -p "${stateDir}/private"
-        ${pkgs.coreutils}/bin/mkdir -m 0700 -p "${stateDir}/tmp"
-        ${pkgs.coreutils}/bin/mkdir -m 0700 -p "${stateDir}/var"
+        rm -Rf "${stateDir}/private/"
+        rm -Rf "${stateDir}/tmp/"
 
-        ${pkgs.coreutils}/bin/touch "${stateDir}/don't touch anything in here"
+        mkdir -m 0700 -p "${stateDir}/private"
+        mkdir -m 0700 -p "${stateDir}/tmp"
+        mkdir -m 0700 -p "${stateDir}/var"
 
-        ${pkgs.coreutils}/bin/rm -f "${stateDir}/private/"*
-        ${pkgs.coreutils}/bin/rm -f "${stateDir}/tmp/"*
+        cat > "${stateDir}/don't touch anything in here" << EOF
+        Everything in this directory except NSD's state in var is
+        automatically generated and will be purged and redeployed
+        by the nsd.service pre-start script.
+        EOF
 
-        ${pkgs.coreutils}/bin/chown nsd:nsd -R "${stateDir}/private"
-        ${pkgs.coreutils}/bin/chown nsd:nsd -R "${stateDir}/tmp"
-        ${pkgs.coreutils}/bin/chown nsd:nsd -R "${stateDir}/var"
+        chown ${username}:${username} -R "${stateDir}/private"
+        chown ${username}:${username} -R "${stateDir}/tmp"
+        chown ${username}:${username} -R "${stateDir}/var"
 
-        ${pkgs.coreutils}/bin/rm -rf "${stateDir}/zones"
-        ${pkgs.coreutils}/bin/cp -r  "${zoneFiles}" "${stateDir}/zones"
+        rm -rf "${stateDir}/zones"
+        cp -rL "${nsdEnv}/zones" "${stateDir}/zones"
 
         ${copyKeys}
       '';

From 6bb016101fc20e8af54c2fc92b4cd44232bb7f74 Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Sun, 28 Feb 2016 16:19:18 +0800
Subject: [PATCH 050/338] postfix: use relative symlinks for mailq and
 newaliases

---
 pkgs/servers/mail/postfix/3.0.nix                 |  7 ++++++-
 pkgs/servers/mail/postfix/relative-symlinks.patch | 13 +++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/mail/postfix/relative-symlinks.patch

diff --git a/pkgs/servers/mail/postfix/3.0.nix b/pkgs/servers/mail/postfix/3.0.nix
index 9ea151e597b..52327090e44 100644
--- a/pkgs/servers/mail/postfix/3.0.nix
+++ b/pkgs/servers/mail/postfix/3.0.nix
@@ -35,7 +35,12 @@ in stdenv.mkDerivation rec {
                 ++ lib.optional withMySQL libmysql
                 ++ lib.optional withSQLite sqlite;
 
-  patches = [ ./postfix-script-shell.patch ./postfix-3.0-no-warnings.patch ./post-install-script.patch ];
+  patches = [
+    ./postfix-script-shell.patch
+    ./postfix-3.0-no-warnings.patch
+    ./post-install-script.patch
+    ./relative-symlinks.patch
+  ];
 
   preBuild = ''
     sed -e '/^PATH=/d' -i postfix-install
diff --git a/pkgs/servers/mail/postfix/relative-symlinks.patch b/pkgs/servers/mail/postfix/relative-symlinks.patch
new file mode 100644
index 00000000000..f7a2078c034
--- /dev/null
+++ b/pkgs/servers/mail/postfix/relative-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/postfix-install b/postfix/postfix-install
+index 1662c3d..0f20ec0 100644
+--- a/postfix-install
++++ b/postfix-install
+@@ -336,7 +336,7 @@ compare_or_symlink() {
+ 	# 2) we cannot use mv to replace a symlink-to-directory;
+ 	# 3) "ln -n" is not in POSIX, therefore it's not portable.
+ 	# rm+ln is less atomic but this affects compatibility symlinks only.
+-	rm -f $2 && ln -sf $link $2 || exit 1
++	rm -f $2 && ln -rsf $link $2 || exit 1
+     }
+ }
+ 

From 3069cab2e70ca782c0ce1cb7f74e46bf191523d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 08:25:08 +0000
Subject: [PATCH 051/338] travis-ci: stop abusing hydra now that it pushes
 directly to cache

---
 maintainers/scripts/travis-nox-review-pr.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index e0d1952d543..99cf769fcd7 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -11,11 +11,7 @@ if [[ $1 == nix ]]; then
 
     # Make sure we can use hydra's binary cache
     sudo mkdir /etc/nix
-    sudo tee /etc/nix/nix.conf <<EOF >/dev/null
-binary-caches = http://cache.nixos.org http://hydra.nixos.org
-trusted-binary-caches = http://hydra.nixos.org
-build-max-jobs = 4
-EOF
+    sudo echo "build-max-jobs = 4" > /etc/nix/nix.conf
 
     # Verify evaluation
     echo "=== Verifying that nixpkgs evaluates..."

From 8b2be11b137dd86449554ba1d033744c44385049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 08:33:14 +0000
Subject: [PATCH 052/338] note the desktopManagerHandlesLidAndPower removal

---
 nixos/modules/services/x11/display-managers/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 8d7593e8e54..b7eee446d39 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -289,6 +289,10 @@ in
 
     services.xserver.displayManager.xserverBin = "${xorg.xorgserver}/bin/X";
 
+    imports = [
+     (mkRemovedOptionModule [ "services" "xserver" "displayManager" "desktopManagerHandlesLidAndPower" ])
+    ];
+
   };
 
 }

From cf463bbd1ab63235d15996f3b46452f50d63ae24 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 16:18:05 +0100
Subject: [PATCH 053/338] perl-DBIx-Class: 0.082820 -> 0.082821

Also remove patches for issues that have been resolved upstream.
---
 ...ndency-tests-to-work-on-newer-libsql.patch | 95 -------------------
 .../perl-modules/dbix-class-fix-52leaks.patch | 23 -----
 pkgs/top-level/perl-packages.nix              |  9 +-
 3 files changed, 2 insertions(+), 125 deletions(-)
 delete mode 100644 pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch
 delete mode 100644 pkgs/development/perl-modules/dbix-class-fix-52leaks.patch

diff --git a/pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch b/pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch
deleted file mode 100644
index b080771b17d..00000000000
--- a/pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 5de3b12e4eecd4efb47e1896dc1d5432bc532568 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Tue, 3 Nov 2015 15:22:54 +0100
-Subject: [PATCH] Adjust view-dependency tests to work on newer libsqlite
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Port upstream fix for SQLite-3.9.0 to 0.082820:
-
-commit 26c663f123032941cb3f61d6cd11869b86716d6d
-Author: Peter Rabbitson <ribasushi@cpan.org>
-Date:   Tue Nov 3 14:35:35 2015 +0100
-
-    Adjust view-dependency tests to work on newer libsqlite
-
-    The test and mechanism behind it is largely useless in these cases, but old
-    sqlite installations will lurk around for ever, so keep the check while moving
-    it to xt/
-
-The original fix makes the tests author's tests, so they are not run
-at all. Let's keep the test running by default until upstream releases
-new version.
-
-CPAN RT#107852
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- t/105view_deps.t | 29 ++++++++++++++++-------------
- 1 file changed, 16 insertions(+), 13 deletions(-)
-
-diff --git a/t/105view_deps.t b/t/105view_deps.t
-index 21aa92b..39bb632 100644
---- a/t/105view_deps.t
-+++ b/t/105view_deps.t
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+use DBIx::Class::Optional::Dependencies -skip_all_without => 'deploy';
-
- use strict;
- use warnings;
-@@ -11,15 +11,6 @@ use DBICTest;
- use ViewDeps;
- use ViewDepsBad;
-
--BEGIN {
--    require DBIx::Class;
--    plan skip_all => 'Test needs ' .
--        DBIx::Class::Optional::Dependencies->req_missing_for('deploy')
--      unless DBIx::Class::Optional::Dependencies->req_ok_for('deploy');
--}
--
--use_ok('DBIx::Class::ResultSource::View');
--
- #################### SANITY
-
- my $view = DBIx::Class::ResultSource::View->new;
-@@ -73,10 +64,16 @@ can_ok( $view, $_ ) for qw/new from deploy_depends_on/;
-     = ViewDepsBad->connect( DBICTest->_database ( quote_char => '"') );
-   ok( $schema2, 'Connected to ViewDepsBad schema OK' );
-
-+  my $lazy_view_validity = !(
-+    $schema2->storage->_server_info->{normalized_dbms_version}
-+      <
-+    3.009
-+  );
-+
- #################### DEPLOY2
-
-   warnings_exist { $schema2->deploy }
--    [qr/no such table: main.aba_name_artists/],
-+    [ $lazy_view_validity ? () : qr/no such table: main.aba_name_artists/ ],
-     "Deploying the bad schema produces a warning: aba_name_artists was not created.";
-
- #################### DOES ORDERING WORK 2?
-@@ -106,9 +103,15 @@ can_ok( $view, $_ ) for qw/new from deploy_depends_on/;
-     } grep { !/AbaNameArtistsAnd2010CDsWithManyTracks/ }
-     @{ [ $schema2->sources ] };
-
-+  $schema2->storage->dbh->do(q( DROP VIEW "aba_name_artists" ))
-+    if $lazy_view_validity;
-+
-   throws_ok { $schema2->resultset('AbaNameArtistsAnd2010CDsWithManyTracks')->next }
--    qr/no such table: aba_name_artists_and_2010_cds_with_many_tracks/,
--    "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the table does not exist"
-+    qr/no such table: (?:main\.)?aba_name_artists/,
-+    sprintf(
-+      "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the%s view does not exist",
-+      $lazy_view_validity ? ' underlying' : ''
-+    )
-   ;
- }
-
---
-2.4.3
diff --git a/pkgs/development/perl-modules/dbix-class-fix-52leaks.patch b/pkgs/development/perl-modules/dbix-class-fix-52leaks.patch
deleted file mode 100644
index 84af4a5acf1..00000000000
--- a/pkgs/development/perl-modules/dbix-class-fix-52leaks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e9d552de92cde6552f35cd45a3572df1e25609cc Mon Sep 17 00:00:00 2001
-From: Peter Rabbitson <ribasushi@cpan.org>
-Date: Tue, 19 May 2015 05:49:48 +0200
-Subject: [PATCH] Make sure tests pass without a compiler present (another step
- to RT#74706)
-
---- a/t/52leaks.t
-+++ b/t/52leaks.t
-@@ -446,6 +446,14 @@ for my $addr (keys %$weak_registry) {
-     delete $weak_registry->{$addr}
-       unless $cleared->{hash_merge_singleton}{$weak_registry->{$addr}{weakref}{behavior}}++;
-   }
-+  elsif ($names =~ /^B::Hooks::EndOfScope::PP::_TieHintHashFieldHash/m) {
-+    # there is one tied lexical which stays alive until GC time
-+    # https://metacpan.org/source/ETHER/B-Hooks-EndOfScope-0.15/lib/B/Hooks/EndOfScope/PP/FieldHash.pm#L24
-+    # simply ignore it here, instead of teaching the leaktracer to examine ties
-+    # the latter is possible yet terrible: https://github.com/dbsrgits/dbix-class/blob/v0.082820/t/lib/DBICTest/Util/LeakTracer.pm#L113-L117
-+    delete $weak_registry->{$addr}
-+      unless $cleared->{bheos_pptiehinthashfieldhash}++;
-+  }
-   elsif ($names =~ /^DateTime::TimeZone::UTC/m) {
-     # DT is going through a refactor it seems - let it leak zones for now
-     delete $weak_registry->{$addr};
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6c1c23f3454..73dec8b1925 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3339,18 +3339,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   DBIxClass = buildPerlPackage rec {
-    name = "DBIx-Class-0.082820";
+    name = "DBIx-Class-0.082821";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz";
-      sha256 = "7b6083a1273d474d785aa93581dc1da334bbe5d83c741574ee2e3942559daeb9";
+      sha256 = "1picibywz5sdpaa1pmbv7xfw52nbz6fh32afb1p2qwsgzbkhqvnw";
     };
     buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ];
     propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName namespaceclean ];
-    patches = [
-      # Fix test error inside t/52leaks.t
-      ../development/perl-modules/dbix-class-fix-52leaks.patch
-      ../development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch
-    ];
     meta = {
       homepage = http://www.dbix-class.org/;
       description = "Extensible and flexible object <-> relational mapper";

From 98625b331b8435c0788e18120f611fd73cc16c85 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 16:20:28 +0100
Subject: [PATCH 054/338] perl-DateTime-Format-MySQL: 0.05 -> 0.06

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 73dec8b1925..2b9d3e45259 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3060,10 +3060,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTimeFormatMySQL = buildPerlPackage rec {
-    name = "DateTime-Format-MySQL-0.05";
+    name = "DateTime-Format-MySQL-0.06";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XM/XMIKEW/${name}.tar.gz";
-      sha256 = "26d0348a930aa34d3b33ec1b2a9d9629f2ee78234e224ca74d594703922ca2e9";
+      sha256 = "07cgz60gxvrv7xqvngyll60pa8cx93h3jyx9kc9wdkn95qbd864q";
     };
     propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ];
     meta = {

From 13a6b7e623abf1bed1cf787c2c74e954912f8620 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 16:21:52 +0100
Subject: [PATCH 055/338] perl-CGI: 4.25 -> 4.26

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2b9d3e45259..2b8bcdb96e0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1416,10 +1416,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   "CGI" = buildPerlPackage rec {
-    name = "CGI-4.25";
+    name = "CGI-4.26";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
-      sha256 = "efb3e5235ada6a91f97ca2905399a686bedea60f6b525e52f4a147baff4f131a";
+      sha256 = "0k8rcmgl9ysk6h4racd5sximida5ypn8fdzi7q34rpq4l7xqcm2n";
     };
     buildInputs = [ TestDeep TestWarn ];
     propagatedBuildInputs = [ HTMLParser self."if" ];

From affb8938316e60bf8f326f14b461e0f1073a188e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 16:25:22 +0100
Subject: [PATCH 056/338] perl-Log-Any: 1.032 -> 1.038

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2b8bcdb96e0..fe94021c321 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6764,10 +6764,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LogAny = buildPerlPackage rec {
-    name = "Log-Any-1.032";
+    name = "Log-Any-1.038";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
-      sha256 = "808558fa42aa96365ed0af773973a5618b4ad50511d81fc7548f67133efdb956";
+      sha256 = "0872jkdbaymyq4sx3i2smv7j57yihxia4bkf14aa3vwpnylpv809";
     };
     meta = {
       homepage = https://github.com/dagolden/Log-Any;

From ae385fb25c5d261abd0a7cb2a70d19a7f9964a64 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 16:26:03 +0100
Subject: [PATCH 057/338] perl-Redis: 1.981 -> 1.982

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index fe94021c321..b6827f4cb62 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9875,10 +9875,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Redis = buildPerlPackage rec {
-    name = "Redis-1.981";
+    name = "Redis-1.982";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DAMS/${name}.tar.gz";
-      sha256 = "5eb65fb6fdfc43f143c7095ec9500f829724274a295eb43d3882ff8798fa3793";
+      sha256 = "1ig6sg1sgdz1dq8gpafin9m4nk0n9k1hzs9c45fl6wslpyim864z";
     };
     buildInputs = [ IOString ModuleBuildTiny PodCoverageTrustPod TestCPANMeta TestDeep TestFatal TestSharedFork TestTCP ];
     propagatedBuildInputs = [ IOSocketTimeout ];

From d9e0cd9302e0f165305db471d86df13f3d60bdcb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 16:48:21 +0100
Subject: [PATCH 058/338] perl-URI: 1.69 -> 1.71

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b6827f4cb62..0e2581b6a29 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13002,11 +13002,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  URI = buildPerlPackage {
-    name = "URI-1.69";
+  "URI" = buildPerlPackage rec {
+    name = "URI-1.71";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/URI-1.69.tar.gz;
-      sha256 = "0bdlk1cn7ipy4kdylrn73yz9i2k39ikm1cqvh9hq0vvbcbm1cjxp";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "9c8eca0d7f39e74bbc14706293e653b699238eeb1a7690cc9c136fb8c2644115";
     };
     meta = {
       description = "Uniform Resource Identifiers (absolute and relative)";

From 3a9842c7c5cf8685420fbc7d2d3632feed8dd166 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 27 Feb 2016 17:13:49 +0100
Subject: [PATCH 059/338] perl-LWP: 6.13 -> 6.15

Also remove no longer needed patch.
---
 .../lwp-test-with-localhost.patch             | 75 -------------------
 pkgs/top-level/perl-packages.nix              |  7 +-
 2 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/development/perl-modules/lwp-test-with-localhost.patch

diff --git a/pkgs/development/perl-modules/lwp-test-with-localhost.patch b/pkgs/development/perl-modules/lwp-test-with-localhost.patch
deleted file mode 100644
index 25b96796d23..00000000000
--- a/pkgs/development/perl-modules/lwp-test-with-localhost.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2d7a479b39bb20a0d61f067ba6c2df92117fcb8c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Wed, 23 Apr 2014 12:45:38 +0200
-Subject: [PATCH] Connect to localhost instead of hostname
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The hostname does not have to be resolvable nor reachable. It's just
-a machine name.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- t/local/http.t   | 2 +-
- t/robot/ua-get.t | 2 +-
- t/robot/ua.t     | 2 +-
- talk-to-ourself  | 3 +--
- 4 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/t/local/http.t b/t/local/http.t
-index 779cc21..534b4c8 100644
---- a/t/local/http.t
-+++ b/t/local/http.t
-@@ -20,7 +20,7 @@ if ($D eq 'daemon') {
- 
-     require HTTP::Daemon;
- 
--    my $d = HTTP::Daemon->new(Timeout => 10);
-+    my $d = HTTP::Daemon->new(Timeout => 10, LocalAddr => 'localhost');
- 
-     print "Please to meet you at: <URL:", $d->url, ">\n";
-     open(STDOUT, $^O eq 'VMS'? ">nl: " : ">/dev/null");
-diff --git a/t/robot/ua-get.t b/t/robot/ua-get.t
-index 5754c4b..bf24589 100644
---- a/t/robot/ua-get.t
-+++ b/t/robot/ua-get.t
-@@ -19,7 +19,7 @@ if ($D eq 'daemon') {
- 
-     require HTTP::Daemon;
- 
--    my $d = new HTTP::Daemon Timeout => 10;
-+    my $d = new HTTP::Daemon Timeout => 10, LocalAddr => 'localhost';
- 
-     print "Please to meet you at: <URL:", $d->url, ">\n";
-     open(STDOUT, $^O eq 'MSWin32' ?  ">nul" : $^O eq 'VMS' ? ">NL:"  : ">/dev/null");
-diff --git a/t/robot/ua.t b/t/robot/ua.t
-index 21ad5c8..11fafa8 100644
---- a/t/robot/ua.t
-+++ b/t/robot/ua.t
-@@ -19,7 +19,7 @@ if ($D eq 'daemon') {
- 
-     require HTTP::Daemon;
- 
--    my $d = new HTTP::Daemon Timeout => 10;
-+    my $d = new HTTP::Daemon Timeout => 10, LocalAddr => 'localhost';
- 
-     print "Please to meet you at: <URL:", $d->url, ">\n";
-     open(STDOUT, $^O eq 'MSWin32' ?  ">nul" : $^O eq 'VMS' ? ">NL:"  : ">/dev/null");
-diff --git a/talk-to-ourself b/talk-to-ourself
-index 6c0257a..b4acda2 100644
---- a/talk-to-ourself
-+++ b/talk-to-ourself
-@@ -9,8 +9,7 @@ require IO::Socket;
- 
- if (@ARGV >= 2 && $ARGV[0] eq "--port") {
-     my $port = $ARGV[1];
--    require Sys::Hostname;
--    my $host = Sys::Hostname::hostname();
-+    my $host = 'localhost';
-     if (my $socket = IO::Socket::INET->new(PeerAddr => "$host:$port", Timeout => 5)) {
- 	require IO::Select;
- 	if (IO::Select->new($socket)->can_read(1)) {
--- 
-1.9.0
-
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0e2581b6a29..89fad8071a6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6900,13 +6900,12 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  LWP = buildPerlPackage rec {
-    name = "libwww-perl-6.13";
+  "LWP" = buildPerlPackage rec {
+    name = "libwww-perl-6.15";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "1cpqjl59viw50bnbdyn8xzrwzg7g54b2rszw0fifacqrppp17gaz";
+      sha256 = "6f349d45c21b1ec0501c4437dfcb70570940e6c3d5bff783bd91d4cddead8322";
     };
-    patches = [ ../development/perl-modules/lwp-test-with-localhost.patch ];
     propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP URI WWWRobotRules ];
     meta = with stdenv.lib; {
       description = "The World-Wide Web library for Perl";

From 033fd6ad4484d2bc4f5f2491d215baffd8e55e30 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 28 Feb 2016 00:46:23 +0100
Subject: [PATCH 060/338] perl-Log-Any: 1.038 -> 1.040

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 89fad8071a6..7be8bd55091 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6764,10 +6764,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LogAny = buildPerlPackage rec {
-    name = "Log-Any-1.038";
+    name = "Log-Any-1.040";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
-      sha256 = "0872jkdbaymyq4sx3i2smv7j57yihxia4bkf14aa3vwpnylpv809";
+      sha256 = "9759211bfc28055e4617894cf96c3b419e0c3c6afb4bdbfe2382f247193b3864";
     };
     meta = {
       homepage = https://github.com/dagolden/Log-Any;

From 762678d6af35a5751d33d72fdbabd954f50f702a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 28 Feb 2016 00:46:51 +0100
Subject: [PATCH 061/338] perl-Readonly: 2.00 -> 2.01

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7be8bd55091..7cae676f829 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9851,11 +9851,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   Readonly = buildPerlModule rec {
-    name = "Readonly-2.00";
+    name = "Readonly-2.01";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SA/SANKO/${name}.tar.gz";
-      sha256 = "9bd0156e958842fdfd6c3bb27a23b47232d4737a407d81fabc4dc64b9363bf98";
+      sha256 = "ec7076c6851b6d3338e959645cd995343241f5b20000ffc29519faf28f6b482e";
     };
+    buildInputs = [ ModuleBuildTiny ];
     meta = {
       homepage = https://github.com/sanko/readonly;
       description = "Facility for creating read-only scalars, arrays, hashes";

From 3c84ae406d80ba01f96a6da27de954b61f0e735b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 08:49:55 +0000
Subject: [PATCH 062/338] PULL_REQUEST_TEMPLATE.md: clarify a few things

---
 .github/PULL_REQUEST_TEMPLATE.md | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 787524c7575..64904c2908b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,15 +1,17 @@
 ###### Things done:
-- [ ] Tested via `nix.useChroot`.
-- [ ] Built on platform(s): .
-- [ ] Tested compilation of all pkgs that depend on this change.
-- [ ] Tested execution of binary products.
+- [ ] Tested using sandboxing (`nix-build --option build-use-chroot true` or [nix.useChroot](http://nixos.org/nixos/manual/options.html#opt-nix.useChroot) on NixOS)
+- [ ] Built on platform(s): NixOS + OSX + Linux
+- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
+- [ ] Tested execution of all binary files (usually in `./result/bin/`)
 - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
 
-###### Extra
-Fixes # .
+###### More
+
+Fixes issue #<insert id>
+
+cc @<maintainer>
 
-cc @ .
 
 ---
 
-_Please note, that points are not mandatory._
+_Please note, that points are not mandatory, but ._

From ad23ac715e6bcd30885362ee5b0fa1a7876e2f6c Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sat, 27 Feb 2016 16:09:18 +0100
Subject: [PATCH 063/338] duckmarines: init at 1.0b

---
 pkgs/games/duckmarines/default.nix | 59 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/games/duckmarines/default.nix

diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix
new file mode 100644
index 00000000000..fc4a006a6a9
--- /dev/null
+++ b/pkgs/games/duckmarines/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "duckmarines";
+  version = "1.0b";
+
+  icon = fetchurl {
+    url = "http://tangramgames.dk/img/thumb/duckmarines.png";
+    sha256 = "07ypbwqcgqc5f117yxy9icix76wlybp1cmykc8f3ivdps66hl0k5";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "duckmarines";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "Duck-themed action puzzle video game";
+    desktopName = "Duck Marines";
+    genericName = "duckmarines";
+    categories = "Game;";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-1.0-love.zip";
+    sha256 = "0fpzbsgrhbwm1lff9gyzh6c9jigw328ngddvrj5w7qmjcm2lv6lv";
+  };
+
+  nativeBuildInputs = [ makeWrapper unzip ];
+  buildInputs = [ lua love ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/games/lovegames
+
+    cp -v ./${pname}-1.0.love $out/share/games/lovegames/${pname}.love
+
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Duck-themed action puzzle video game";
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.linux;
+    license = licenses.free;
+    downloadPage = http://tangramgames.dk/games/duckmarines;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22dbfc41f43..3417a36a6f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14396,6 +14396,8 @@ let
 
   drumkv1 = callPackage ../applications/audio/drumkv1 { };
 
+  duckmarines = callPackage ../games/duckmarines { love = love_0_9; };
+
   dwarf-fortress-packages = callPackage ../games/dwarf-fortress { };
 
   dwarf-fortress = dwarf-fortress-packages.dwarf-fortress.override { };

From f8516a0717569f496653821d5fa286da59854550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 28 Feb 2016 10:06:27 +0100
Subject: [PATCH 064/338] nixos copySystemConfiguration: fix when chrooted

Fixes #7974. Also makes the description more informative.
---
 nixos/modules/system/activation/top-level.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index d66580b7b9b..2d1b0ffb54c 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -178,9 +178,10 @@ in
       default = false;
       description = ''
         If enabled, copies the NixOS configuration file
-        <literal>$NIXOS_CONFIG</literal> (usually
-        <filename>/etc/nixos/configuration.nix</filename>)
-        to the system store path.
+        (usually <filename>/etc/nixos/configuration.nix</filename>)
+        and links it from the resulting system
+        (getting to <filename>/run/current-system/configuration.nix</filename>).
+        Note that only this single file is copied, even if it imports others.
       '';
     };
 
@@ -238,7 +239,9 @@ in
     system.extraSystemBuilderCmds =
       optionalString
         config.system.copySystemConfiguration
-        "cp ${maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out";
+        ''ln -s '${import ../../../lib/from-env.nix "NIXOS_CONFIG" <nixos-config>}' \
+            "$out/configuration.nix"
+        '';
 
     system.build.toplevel = system;
 

From 2af46e43935c735efb65b51c67edead62dae44ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 09:26:21 +0000
Subject: [PATCH 065/338] PULL_REQUEST_TEMPLATE: fix issues raised in 3c84ae406

---
 .github/PULL_REQUEST_TEMPLATE.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 64904c2908b..6ef9a4d21e8 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,7 @@
 ###### Things done:
+
 - [ ] Tested using sandboxing (`nix-build --option build-use-chroot true` or [nix.useChroot](http://nixos.org/nixos/manual/options.html#opt-nix.useChroot) on NixOS)
-- [ ] Built on platform(s): NixOS + OSX + Linux
+- [ ] Built on platform(s): NixOS / OSX / Linux
 - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
 - [ ] Tested execution of all binary files (usually in `./result/bin/`)
 - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
@@ -14,4 +15,4 @@ cc @<maintainer>
 
 ---
 
-_Please note, that points are not mandatory, but ._
+_Please note, that points are not mandatory, but rather desired._

From a08c8b12f02cbe261e6f2675675776b9c4edbc89 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 28 Feb 2016 10:39:20 +0100
Subject: [PATCH 066/338] Add Apache Jena Fuseki instead of obsolete and
 unavailable Jena Joseki

---
 pkgs/servers/http/joseki/default.nix          | 112 ------------------
 pkgs/servers/nosql/apache-jena/binary.nix     |   2 +-
 .../nosql/apache-jena/fuseki-binary.nix       |  41 +++++++
 .../nosql/apache-jena/fuseki-binary.upstream  |   4 +
 pkgs/top-level/all-packages.nix               |   9 +-
 5 files changed, 53 insertions(+), 115 deletions(-)
 delete mode 100644 pkgs/servers/http/joseki/default.nix
 create mode 100644 pkgs/servers/nosql/apache-jena/fuseki-binary.nix
 create mode 100644 pkgs/servers/nosql/apache-jena/fuseki-binary.upstream

diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix
deleted file mode 100644
index 59f9fd8624d..00000000000
--- a/pkgs/servers/http/joseki/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-x@{builderDefsPackage
-  , unzip
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="jena-joseki";
-    version="3.4.3-201103";
-    name="${baseName}-${version}";
-  };
-in
-rec {
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  tarballs = {
-    jenaBin = a.fetchurl {
-      url = "mirror://sourceforge/project/jena/Jena/Jena-2.6.4/jena-2.6.4.zip";
-      sha256 = "ec23a24eee9148b1ddb366ab035a48eacd43c2b50c534a7bdd9cf31c6f8a9e7c";
-    };
-    josekiBin = a.fetchurl {
-      url = "mirror://sourceforge/project/joseki/Joseki-SPARQL/Joseki-3.4.3/joseki-3.4.3.zip";
-      sha256 = "cde1138e7bafcc2db7800dcde08f268237accd76c0a3e4b4c95cc96eacdcad12";
-    };
-    tdbBin = a.fetchurl {
-      url = "mirror://sourceforge/project/jena/TDB/TDB-0.8.9/tdb-0.8.9.zip";
-      sha256 = "78fd4b6cea5a6e412f1d58ba8a9e1fc72315becdf06f3675e4e604cd4435779e";
-    };
-    arqBin = a.fetchurl {
-      url = "mirror://sourceforge/project/jena/ARQ/ARQ-2.8.7/arq-2.8.7.zip";
-      sha256 = "66990e92514a85a9596a7efaf128041002cd098e063964dd5d2264cfcdd26070";
-    };
-    jettyBin = a.fetchurl {
-      url = "http://dist.codehaus.org/jetty/jetty-6.1.26/jetty-6.1.26.zip";
-      sha256 = "96c08eb87ec3772dccc2b3dba54fea85ccc3f804faf7429eecfba3ed55648187";
-    };
-  };
-  tarballFiles = map (x: builtins.getAttr x tarballs) (builtins.attrNames tarballs);
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doDeploy" "fixScripts"];
-
-  fixScripts = a.doPatchShebangs ''$TARGET/bin'';
-
-  doDeploy = a.fullDepEntry (''
-    ${a.lib.concatStringsSep ";" (map (y : "unzip ${y}") tarballFiles)}
-    for i in */; do cp -rTf $i merged; done
-    cd merged
-
-    for i in "lib/"jsp-*/*.jar; do
-      ln -s "''${i#lib/}" "lib" || true
-    done
-
-    cp [Cc]opyright* doc
-    mkdir lib/obsolete
-    (
-      ls "lib/"log4j-[0-9]*.jar | sort | tac | tail -n +2 ;
-      ls "lib/"slf4j-api-[0-9]*.jar | sort | tac | tail -n +2 ;
-      ls "lib/"xercesImpl-[0-9]*.jar | sort | tac | tail -n +2 ;
-      ls "lib/"arq-[0-9]*.jar | sort | tac | tail -n +2
-      ls "lib/"tdb-[0-9]*.jar | sort | tac | tail -n +2
-      ls "lib/"jetty-[0-9]*.jar | sort | tac | tail -n +2
-      ls "lib/"jetty-util-[0-9]*.jar | sort | tac | tail -n +2
-    ) |
-      xargs -I @@ mv @@  lib/obsolete
-
-    mv lib/slf4j-simple-*.jar lib/obsolete
-
-    mkdir -p "$out/share"
-    TARGET="$out/share/${name}-dist"
-    cp -r . "$TARGET"
-    ln -s  "$TARGET/lib" "$out/lib"
-    chmod a+x "$TARGET/bin/"*
-    mkdir -p "$out/bin"
-
-    sed -e 's/\r//g' -i "$TARGET/bin"/*
-
-    echo -e '#! ${a.stdenv.shell}\nls "'"$TARGET"'"/bin' > "$out/bin/jena-list-commands"
-    echo '#! ${a.stdenv.shell}' >> "$out/bin/jena-command"
-    echo 'export JENAROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
-    echo 'export JOSEKIROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
-    echo 'export TDBROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
-    echo 'export ARQROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
-    echo 'sh "'"$TARGET"'"/bin/"$@"' >> "$out/bin/jena-command"
-
-    chmod a+x "$out/bin/"*
-  '') ["defEnsureDir" "minInit" "addInputs"];
-
-  trimVersions = a.fullDepEntry (''
-  '') ["doDeploy" "minInit"];
-
-  passthru = {
-    inherit tarballs;
-  };
-
-  meta = {
-    description = "An RDF database with SparQL interface over HTTP";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    hydraPlatforms = []; # Builder is just unpacking/mixing what is needed
-    license = a.lib.licenses.free; # mix of packages under different licenses
-    homepage = "http://openjena.org/";
-  };
-}) x
diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index 22c9fc06972..84937467b0c 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation {
     homepage = "http://jena.apache.org";
     downloadPage = "http://archive.apache.org/dist/jena/binaries/";
     updateWalker = true;
-    downloadURLRegex = "apache-jena-.*[.]tar[.]gz\$";
+    downloadURLRegexp = "apache-jena-.*[.]tar[.]gz\$";
   };
 }
diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
new file mode 100644
index 00000000000..bbc7bb496fe
--- /dev/null
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
@@ -0,0 +1,41 @@
+{stdenv, fetchurl, java, makeWrapper}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="apache-jena-fuseki";
+    version = "2.3.1";
+    name="${baseName}-${version}";
+    url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
+    sha256 = "1c5330kwnby1vqcia1vm6z17j8hzyyajvvv46rf478l7wkzmyvlp";
+  };
+  buildInputs = [
+    makeWrapper
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  installPhase = ''
+    cp -r . "$out"
+    ln -s "$out"/{fuseki-server,fuseki} "$out/bin"
+    for i in "$out"/bin/*; do
+      wrapProgram "$i" \
+        --prefix "PATH" : "${java}/bin/" \
+        --set "FUSEKI_HOME" '"''${FUSEKI_HOME:-'"$out"'}"' \
+        ;
+    done
+  '';
+  meta = {
+    inherit (s) version;
+    description = ''SPARQL server'';
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://jena.apache.org";
+    downloadPage = "http://archive.apache.org/dist/jena/binaries/";
+    downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$";
+  };
+}
diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream b/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream
new file mode 100644
index 00000000000..a18675347d5
--- /dev/null
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream
@@ -0,0 +1,4 @@
+name apache-jena-fuseki
+attribute apache-jena-fuseki
+target fuseki-binary.nix
+minimize_overwrite
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f57fb8815ba..2a4af60e13d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9426,6 +9426,12 @@ let
     java = jdk;
   };
 
+  apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix {
+    java = jdk;
+  };
+
+  fuseki = apache-jena-fuseki;
+
   apcupsd = callPackage ../servers/apcupsd { };
 
   asterisk = callPackage ../servers/asterisk { };
@@ -9544,8 +9550,6 @@ let
 
   jetty92 = callPackage ../servers/http/jetty/9.2.nix { };
 
-  joseki = callPackage ../servers/http/joseki {};
-
   rdkafka = callPackage ../development/libraries/rdkafka { };
 
   leafnode = callPackage ../servers/news/leafnode { };
@@ -16215,6 +16219,7 @@ aliases = with pkgs; {
   htmlTidy = html-tidy;  # added 2014-12-06
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15
   inotifyTools = inotify-tools;
+  joseki = apache-jena-fuseki; # added 2016-02-28
   jquery_ui = jquery-ui;  # added 2014-09-07
   libdbusmenu_qt5 = qt5.libdbusmenu;  # added 2015-12-19
   libtidy = html-tidy;  # added 2014-12-21

From 02c7d65bf9030147150e593edad5f3213c1886cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 09:35:43 +0000
Subject: [PATCH 067/338] fix NixOS eval

---
 .../modules/services/x11/display-managers/default.nix  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index b7eee446d39..533b03aff08 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -286,13 +286,11 @@ in
   };
 
   config = {
-
     services.xserver.displayManager.xserverBin = "${xorg.xorgserver}/bin/X";
-
-    imports = [
-     (mkRemovedOptionModule [ "services" "xserver" "displayManager" "desktopManagerHandlesLidAndPower" ])
-    ];
-
   };
 
+  imports = [
+   (mkRemovedOptionModule [ "services" "xserver" "displayManager" "desktopManagerHandlesLidAndPower" ])
+  ];
+
 }

From 82560aefd705e0a382f0daac7227404a8f58a457 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 27 Feb 2016 23:18:31 +0300
Subject: [PATCH 068/338] samba: reduce closure size

---
 pkgs/servers/samba/4.x.nix      | 19 ++++++++-----------
 pkgs/top-level/all-packages.nix |  1 -
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 8fcc1a4a973..4ef47122c28 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -5,7 +5,6 @@
 , gnutls, libgcrypt, libgpgerror
 , ncurses, libunwind, libibverbs, librdmacm, systemd
 
-, enableKerberos ? false
 , enableInfiniband ? false
 , enableLDAP ? false
 , enablePrinting ? false
@@ -34,10 +33,9 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
       docbook_xml_dtd_45 */ readline talloc ntdb tdb tevent ldb popt iniparser
-      libbsd libarchive zlib acl fam libiconv gettext libunwind
+      libbsd libarchive zlib acl fam libiconv gettext libunwind kerberos
     ]
     ++ optionals stdenv.isLinux [ libaio pam systemd ]
-    ++ optional enableKerberos kerberos
     ++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ]
     ++ optional enableLDAP openldap
     ++ optional (enablePrinting && stdenv.isLinux) cups
@@ -58,23 +56,22 @@ stdenv.mkDerivation rec {
   configureFlags =
     [ "--with-static-modules=NONE"
       "--with-shared-modules=ALL"
+      "--with-system-mitkrb5"
       "--enable-fhs"
       "--sysconfdir=/etc"
       "--localstatedir=/var"
-      "--bundled-libraries=${if enableKerberos && kerberos != null &&
-        kerberos.implementation == "heimdal" then "NONE" else "com_err"}"
+      "--bundled-libraries=NONE"
       "--private-libraries=NONE"
-      "--builtin-libraries=replace"
+      "--builtin-libraries=NONE"
     ]
-    ++ optional (enableKerberos && kerberos != null &&
-      kerberos.implementation == "krb5") "--with-system-mitkrb5"
     ++ optional (!enableDomainController) "--without-ad-dc"
     ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ];
 
   enableParallelBuilding = true;
 
-  stripAllList = [ "bin" "sbin" ];
-
+  # Some libraries don't have /lib/samba in RPATH but need it.
+  # Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \;
+  # Looks like a bug in installer scripts.
   postFixup = ''
     export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)"
     read -r -d "" SCRIPT << EOF || true
@@ -85,7 +82,7 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?;
     patchelf --shrink-rpath "\$BIN";
     EOF
-    find $out -type f -exec $SHELL -c "$SCRIPT" \;
+    find $out -type f -name \*.so -exec $SHELL -c "$SCRIPT" \;
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f756a175ac..6558f04d22e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9819,7 +9819,6 @@ let
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    kerberos = null;  # Bundle kerberos because samba uses internal, non-stable functions
     # enableLDAP
   };
 

From d589391202aefed3df385e9fce7b3b825cdd7406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 28 Feb 2016 11:01:25 +0100
Subject: [PATCH 069/338] gitinspector: 0.4.1 -> 0.4.4

---
 pkgs/applications/version-management/gitinspector/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix
index 4e440d4bc6a..56d8b334e8e 100644
--- a/pkgs/applications/version-management/gitinspector/default.nix
+++ b/pkgs/applications/version-management/gitinspector/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonApplication rec {
   name = "gitinspector-${version}";
-  version = "0.4.1";
+  version = "0.4.4";
   namePrefix = "";
 
   src = fetchzip {
     url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz";
-    sha256 = "07kjvf9cj6g6gvjgnnas5facm3nhxppf0l0fcxyd4vq6xhdb3swp";
+    sha256 = "1pfsw6xldm6jigs3nhysvqaxk8a0zf8zczgfkrp920as9sya3c7m";
     name = name + "-src";
   };
 

From 6dd798f67fc3773967994069bad21b593c67aa08 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Feb 2016 08:28:42 +0100
Subject: [PATCH 070/338] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-12-g567601b using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/82be4306aef14f3d97c4bf6bebcb875bf046b12e
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/300be01a1038afe0c7b12f3737b8c06f2103e855
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/45f9a3dc1607fcbd0be11ab4c185c0cb9baf9d99
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/18441cd11a18cd8f47f2e1efe89e02049b9e292f
---
 .../haskell-modules/configuration-lts-0.0.nix |   22 +
 .../haskell-modules/configuration-lts-0.1.nix |   22 +
 .../haskell-modules/configuration-lts-0.2.nix |   22 +
 .../haskell-modules/configuration-lts-0.3.nix |   22 +
 .../haskell-modules/configuration-lts-0.4.nix |   22 +
 .../haskell-modules/configuration-lts-0.5.nix |   22 +
 .../haskell-modules/configuration-lts-0.6.nix |   22 +
 .../haskell-modules/configuration-lts-0.7.nix |   22 +
 .../haskell-modules/configuration-lts-1.0.nix |   22 +
 .../haskell-modules/configuration-lts-1.1.nix |   22 +
 .../configuration-lts-1.10.nix                |   22 +
 .../configuration-lts-1.11.nix                |   22 +
 .../configuration-lts-1.12.nix                |   22 +
 .../configuration-lts-1.13.nix                |   22 +
 .../configuration-lts-1.14.nix                |   22 +
 .../configuration-lts-1.15.nix                |   22 +
 .../haskell-modules/configuration-lts-1.2.nix |   22 +
 .../haskell-modules/configuration-lts-1.4.nix |   22 +
 .../haskell-modules/configuration-lts-1.5.nix |   22 +
 .../haskell-modules/configuration-lts-1.7.nix |   22 +
 .../haskell-modules/configuration-lts-1.8.nix |   22 +
 .../haskell-modules/configuration-lts-1.9.nix |   22 +
 .../haskell-modules/configuration-lts-2.0.nix |   24 +
 .../haskell-modules/configuration-lts-2.1.nix |   24 +
 .../configuration-lts-2.10.nix                |   24 +
 .../configuration-lts-2.11.nix                |   24 +
 .../configuration-lts-2.12.nix                |   24 +
 .../configuration-lts-2.13.nix                |   24 +
 .../configuration-lts-2.14.nix                |   24 +
 .../configuration-lts-2.15.nix                |   25 +
 .../configuration-lts-2.16.nix                |   25 +
 .../configuration-lts-2.17.nix                |   25 +
 .../configuration-lts-2.18.nix                |   25 +
 .../configuration-lts-2.19.nix                |   25 +
 .../haskell-modules/configuration-lts-2.2.nix |   24 +
 .../configuration-lts-2.20.nix                |   25 +
 .../configuration-lts-2.21.nix                |   25 +
 .../configuration-lts-2.22.nix                |   25 +
 .../haskell-modules/configuration-lts-2.3.nix |   24 +
 .../haskell-modules/configuration-lts-2.4.nix |   24 +
 .../haskell-modules/configuration-lts-2.5.nix |   24 +
 .../haskell-modules/configuration-lts-2.6.nix |   24 +
 .../haskell-modules/configuration-lts-2.7.nix |   24 +
 .../haskell-modules/configuration-lts-2.8.nix |   24 +
 .../haskell-modules/configuration-lts-2.9.nix |   24 +
 .../haskell-modules/configuration-lts-3.0.nix |   27 +
 .../haskell-modules/configuration-lts-3.1.nix |   27 +
 .../configuration-lts-3.10.nix                |   28 +
 .../configuration-lts-3.11.nix                |   28 +
 .../configuration-lts-3.12.nix                |   28 +
 .../configuration-lts-3.13.nix                |   28 +
 .../configuration-lts-3.14.nix                |   28 +
 .../configuration-lts-3.15.nix                |   28 +
 .../configuration-lts-3.16.nix                |   28 +
 .../configuration-lts-3.17.nix                |   28 +
 .../configuration-lts-3.18.nix                |   29 +
 .../configuration-lts-3.19.nix                |   29 +
 .../haskell-modules/configuration-lts-3.2.nix |   27 +
 .../configuration-lts-3.20.nix                |   29 +
 .../configuration-lts-3.21.nix                |   29 +
 .../configuration-lts-3.22.nix                |   29 +
 .../haskell-modules/configuration-lts-3.3.nix |   27 +
 .../haskell-modules/configuration-lts-3.4.nix |   27 +
 .../haskell-modules/configuration-lts-3.5.nix |   27 +
 .../haskell-modules/configuration-lts-3.6.nix |   27 +
 .../haskell-modules/configuration-lts-3.7.nix |   27 +
 .../haskell-modules/configuration-lts-3.8.nix |   28 +
 .../haskell-modules/configuration-lts-3.9.nix |   28 +
 .../haskell-modules/configuration-lts-4.0.nix |   36 +
 .../haskell-modules/configuration-lts-4.1.nix |   36 +
 .../haskell-modules/configuration-lts-4.2.nix |   36 +
 .../haskell-modules/configuration-lts-5.0.nix |   44 +
 .../haskell-modules/configuration-lts-5.1.nix |   46 +
 .../haskell-modules/configuration-lts-5.2.nix |   50 +
 .../haskell-modules/configuration-lts-5.3.nix |   53 +
 .../haskell-modules/configuration-lts-5.4.nix | 7739 +++++++++++++++++
 .../haskell-modules/hackage-packages.nix      | 1800 +++-
 77 files changed, 11214 insertions(+), 311 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.4.nix

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 7ac9c0a1283..6137adecf0c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1489,6 +1490,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1982,6 +1984,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_0";
@@ -1996,6 +1999,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2737,6 +2741,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2753,6 +2758,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3246,6 +3252,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4057,6 +4064,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4255,6 +4263,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4753,6 +4762,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5415,6 +5425,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6140,6 +6151,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6215,6 +6227,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6293,6 +6306,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6524,6 +6538,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6544,6 +6559,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6912,6 +6928,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7363,6 +7381,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7654,6 +7673,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8346,6 +8366,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8676,6 +8697,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 56f08b2f1e1..b01ec9391bf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1489,6 +1490,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1982,6 +1984,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_0";
@@ -1996,6 +1999,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2737,6 +2741,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2753,6 +2758,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3246,6 +3252,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4057,6 +4064,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4255,6 +4263,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4753,6 +4762,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5415,6 +5425,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6140,6 +6151,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6215,6 +6227,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6293,6 +6306,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6524,6 +6538,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6544,6 +6559,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6912,6 +6928,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7363,6 +7381,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7654,6 +7673,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8346,6 +8366,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8676,6 +8697,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 3d4c59742e3..a960665bd20 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1489,6 +1490,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1982,6 +1984,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_0";
@@ -1996,6 +1999,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2737,6 +2741,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2753,6 +2758,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3246,6 +3252,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4057,6 +4064,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4255,6 +4263,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4753,6 +4762,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5415,6 +5425,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6140,6 +6151,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6215,6 +6227,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6293,6 +6306,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6524,6 +6538,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6544,6 +6559,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6912,6 +6928,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7363,6 +7381,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7654,6 +7673,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8346,6 +8366,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8676,6 +8697,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 52ce8fe742d..bd8ec9285b5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1489,6 +1490,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1982,6 +1984,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_0";
@@ -1996,6 +1999,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2737,6 +2741,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2753,6 +2758,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3246,6 +3252,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4057,6 +4064,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4255,6 +4263,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4753,6 +4762,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5415,6 +5425,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6140,6 +6151,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6215,6 +6227,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6293,6 +6306,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6524,6 +6538,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6544,6 +6559,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6912,6 +6928,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7363,6 +7381,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7654,6 +7673,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8346,6 +8366,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8676,6 +8697,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index c5b407f3039..03c9cbf1302 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1489,6 +1490,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1982,6 +1984,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_0";
@@ -1996,6 +1999,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2736,6 +2740,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2752,6 +2757,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3245,6 +3251,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4054,6 +4061,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4252,6 +4260,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4750,6 +4759,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5412,6 +5422,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6137,6 +6148,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6212,6 +6224,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6290,6 +6303,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6521,6 +6535,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6541,6 +6556,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6909,6 +6925,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7359,6 +7377,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7650,6 +7669,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8342,6 +8362,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8672,6 +8693,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 75fe2a26249..8ad110b2627 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1489,6 +1490,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1982,6 +1984,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_0";
@@ -1996,6 +1999,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2736,6 +2740,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2752,6 +2757,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3245,6 +3251,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4054,6 +4061,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4252,6 +4260,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4750,6 +4759,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5412,6 +5422,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6137,6 +6148,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6212,6 +6224,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6290,6 +6303,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6521,6 +6535,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6541,6 +6556,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6909,6 +6925,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7359,6 +7377,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7650,6 +7669,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8342,6 +8362,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8672,6 +8693,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 69ebdb8e3ab..a68ffba5feb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1488,6 +1489,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1981,6 +1983,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_1";
@@ -1995,6 +1998,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2735,6 +2739,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2751,6 +2756,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3244,6 +3250,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4053,6 +4060,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4250,6 +4258,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4748,6 +4757,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5410,6 +5420,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6135,6 +6146,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6210,6 +6222,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6288,6 +6301,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6519,6 +6533,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6539,6 +6554,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6907,6 +6923,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7356,6 +7374,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7647,6 +7666,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8339,6 +8359,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8669,6 +8690,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 223d20571bd..e84e33b8b6f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1488,6 +1489,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1981,6 +1983,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_1";
@@ -1995,6 +1998,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2735,6 +2739,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2751,6 +2756,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3244,6 +3250,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4053,6 +4060,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4250,6 +4258,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4748,6 +4757,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5410,6 +5420,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6135,6 +6146,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6210,6 +6222,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6288,6 +6301,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6519,6 +6533,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6539,6 +6554,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6907,6 +6923,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7356,6 +7374,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7647,6 +7666,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8339,6 +8359,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8669,6 +8690,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index c88b0e0759c..8fcb4a7b14b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -652,6 +652,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1484,6 +1485,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1974,6 +1976,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_1";
@@ -1988,6 +1991,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2727,6 +2731,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2743,6 +2748,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3235,6 +3241,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4044,6 +4051,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4241,6 +4249,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4737,6 +4746,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5399,6 +5409,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6124,6 +6135,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6199,6 +6211,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6277,6 +6290,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6508,6 +6522,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6528,6 +6543,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6896,6 +6912,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7344,6 +7362,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7635,6 +7654,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8326,6 +8346,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8655,6 +8676,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 28189cb09cf..d2c2eb366c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -652,6 +652,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1484,6 +1485,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1973,6 +1975,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_1";
@@ -1987,6 +1990,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2725,6 +2729,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2741,6 +2746,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3232,6 +3238,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4040,6 +4047,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4237,6 +4245,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4731,6 +4740,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5393,6 +5403,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6117,6 +6128,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6192,6 +6204,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6270,6 +6283,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6501,6 +6515,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6521,6 +6536,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6889,6 +6905,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7337,6 +7355,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7627,6 +7646,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8314,6 +8334,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8642,6 +8663,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index c1b5f626abf..79508ed479d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_1";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3225,6 +3231,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4030,6 +4037,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4226,6 +4234,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4720,6 +4729,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_5";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5377,6 +5387,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6098,6 +6109,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6173,6 +6185,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6250,6 +6263,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6481,6 +6495,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6501,6 +6516,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6868,6 +6884,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7315,6 +7333,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7604,6 +7623,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8287,6 +8307,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8614,6 +8635,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 34bf0833092..d49b03d721e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_1";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3224,6 +3230,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4029,6 +4036,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4225,6 +4233,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4719,6 +4728,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_5";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5373,6 +5383,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6094,6 +6105,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6169,6 +6181,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6246,6 +6259,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6477,6 +6491,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6497,6 +6512,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6864,6 +6880,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7311,6 +7329,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7600,6 +7619,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8283,6 +8303,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8610,6 +8631,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 4960dfb1142..07203ef2701 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_2";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3224,6 +3230,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4029,6 +4036,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4224,6 +4232,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4718,6 +4727,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_5";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5372,6 +5382,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6093,6 +6104,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6168,6 +6180,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6245,6 +6258,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6476,6 +6490,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6496,6 +6511,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6863,6 +6879,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7310,6 +7328,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7599,6 +7618,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8281,6 +8301,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8608,6 +8629,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 700792e04d3..9e9c3094ada 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_2";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3224,6 +3230,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4028,6 +4035,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4223,6 +4231,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4717,6 +4726,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_5";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5371,6 +5381,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6092,6 +6103,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6167,6 +6179,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6244,6 +6257,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6475,6 +6489,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6495,6 +6510,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6862,6 +6878,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7309,6 +7327,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7598,6 +7617,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8279,6 +8299,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8606,6 +8627,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 68c3439efa0..05194bba331 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -650,6 +650,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1482,6 +1483,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1969,6 +1971,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_2";
@@ -1983,6 +1986,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2718,6 +2722,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2734,6 +2739,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3221,6 +3227,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4025,6 +4032,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4219,6 +4227,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4713,6 +4722,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5366,6 +5376,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6086,6 +6097,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6161,6 +6173,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6238,6 +6251,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6469,6 +6483,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6489,6 +6504,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6855,6 +6871,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7302,6 +7320,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7591,6 +7610,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8272,6 +8292,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8599,6 +8620,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 4a3bcbb31e2..356c8b4652d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -650,6 +650,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1481,6 +1482,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1968,6 +1970,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_2";
@@ -1982,6 +1985,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2715,6 +2719,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2731,6 +2736,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3217,6 +3223,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4021,6 +4028,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4215,6 +4223,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4709,6 +4718,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5362,6 +5372,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6080,6 +6091,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6155,6 +6167,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6232,6 +6245,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6463,6 +6477,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6483,6 +6498,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6848,6 +6864,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7295,6 +7313,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7584,6 +7603,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8263,6 +8283,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8590,6 +8611,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index cac7ea84e5a..db969111d4e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -652,6 +652,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1484,6 +1485,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1973,6 +1975,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_1";
@@ -1987,6 +1990,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2723,6 +2727,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2739,6 +2744,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3230,6 +3236,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4037,6 +4044,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4234,6 +4242,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4728,6 +4737,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5390,6 +5400,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6114,6 +6125,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6189,6 +6201,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6266,6 +6279,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6497,6 +6511,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6517,6 +6532,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6884,6 +6900,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7331,6 +7349,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7621,6 +7640,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8308,6 +8328,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8636,6 +8657,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index a2057dcca1d..29c93121b18 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1972,6 +1974,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_1";
@@ -1986,6 +1989,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2722,6 +2726,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2738,6 +2743,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3228,6 +3234,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4035,6 +4042,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4231,6 +4239,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4725,6 +4734,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5387,6 +5397,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6110,6 +6121,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6185,6 +6197,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6262,6 +6275,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6493,6 +6507,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6513,6 +6528,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6880,6 +6896,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7327,6 +7345,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7617,6 +7636,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8303,6 +8323,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8631,6 +8652,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index ea9f668b711..adf9213f2c2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_1";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3227,6 +3233,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4034,6 +4041,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4230,6 +4238,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4724,6 +4733,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5386,6 +5396,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6109,6 +6120,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6184,6 +6196,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6261,6 +6274,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6492,6 +6506,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6512,6 +6527,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6879,6 +6895,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7326,6 +7344,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7616,6 +7635,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8301,6 +8321,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8628,6 +8649,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 0f17f0281f8..0bb90638d10 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_1";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3227,6 +3233,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4034,6 +4041,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4230,6 +4238,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4724,6 +4733,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5381,6 +5391,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6104,6 +6115,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6179,6 +6191,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6256,6 +6269,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6487,6 +6501,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6507,6 +6522,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6874,6 +6890,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7321,6 +7339,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7611,6 +7630,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8296,6 +8316,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8623,6 +8644,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 47ef6d937c4..1fe763664aa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_1";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3225,6 +3231,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4031,6 +4038,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4227,6 +4235,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4721,6 +4730,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5378,6 +5388,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6100,6 +6111,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6175,6 +6187,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6252,6 +6265,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6483,6 +6497,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6503,6 +6518,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6870,6 +6886,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7317,6 +7335,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7607,6 +7626,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8291,6 +8311,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8618,6 +8639,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 371c2dadf42..efbe3f49269 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_1";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3225,6 +3231,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4030,6 +4037,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4226,6 +4234,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4720,6 +4729,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_5";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5377,6 +5387,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6099,6 +6110,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6174,6 +6186,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6251,6 +6264,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6482,6 +6496,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6502,6 +6517,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6869,6 +6885,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7316,6 +7334,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7606,6 +7625,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8290,6 +8310,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8617,6 +8638,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index e48c6649f9d..cc0205433b2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1473,6 +1474,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1958,6 +1960,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_3";
@@ -1972,6 +1975,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2701,6 +2705,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2717,6 +2722,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3203,6 +3209,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4003,6 +4010,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4197,6 +4205,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4420,6 +4429,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4687,6 +4697,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5328,6 +5339,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5891,6 +5903,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6035,6 +6048,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6110,6 +6124,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6187,6 +6202,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6416,6 +6432,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6436,6 +6453,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6800,6 +6818,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7246,6 +7266,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7531,6 +7552,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8208,6 +8230,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8533,6 +8556,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 786d58cac8b..83feb1b2f3d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1473,6 +1474,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1957,6 +1959,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_3";
@@ -1971,6 +1974,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2700,6 +2704,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2716,6 +2721,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3202,6 +3208,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -4002,6 +4009,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4196,6 +4204,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4419,6 +4428,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4686,6 +4696,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5327,6 +5338,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5890,6 +5902,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6034,6 +6047,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6109,6 +6123,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6186,6 +6201,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6415,6 +6431,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6435,6 +6452,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6799,6 +6817,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7245,6 +7265,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7530,6 +7551,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8207,6 +8229,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8531,6 +8554,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 36a315c5180..67d34a15694 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1466,6 +1467,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1946,6 +1948,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_4";
@@ -1960,6 +1963,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2687,6 +2691,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2703,6 +2708,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3185,6 +3191,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3983,6 +3990,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4177,6 +4185,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4399,6 +4408,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4664,6 +4674,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5301,6 +5312,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5861,6 +5873,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6003,6 +6016,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6078,6 +6092,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6155,6 +6170,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = doDistribute super."optparse-simple_0_0_2";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6382,6 +6398,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6402,6 +6419,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6764,6 +6782,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7208,6 +7228,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7492,6 +7513,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8160,6 +8182,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8484,6 +8507,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index ef4c7ce282d..8f2db34a72c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1465,6 +1466,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1945,6 +1947,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_4";
@@ -1959,6 +1962,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2686,6 +2690,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2702,6 +2707,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3184,6 +3190,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3981,6 +3988,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4174,6 +4182,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4396,6 +4405,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4661,6 +4671,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5297,6 +5308,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5856,6 +5868,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5998,6 +6011,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6073,6 +6087,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6150,6 +6165,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6376,6 +6392,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6396,6 +6413,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6758,6 +6776,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7201,6 +7221,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7485,6 +7506,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8151,6 +8173,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8475,6 +8498,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 8303aacfd80..4888317d87e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1465,6 +1466,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1945,6 +1947,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_4";
@@ -1959,6 +1962,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2686,6 +2690,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2702,6 +2707,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3184,6 +3190,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3981,6 +3988,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4174,6 +4182,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4396,6 +4405,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4661,6 +4671,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5297,6 +5308,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5856,6 +5868,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5998,6 +6011,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6073,6 +6087,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6150,6 +6165,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6376,6 +6392,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6396,6 +6413,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6758,6 +6776,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7200,6 +7220,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7484,6 +7505,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8150,6 +8172,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8474,6 +8497,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 52cec4732ba..6ac434b7126 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1465,6 +1466,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1945,6 +1947,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_0";
@@ -1959,6 +1962,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2686,6 +2690,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2702,6 +2707,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3184,6 +3190,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3980,6 +3987,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4173,6 +4181,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4395,6 +4404,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4660,6 +4670,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5295,6 +5306,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5854,6 +5866,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5996,6 +6009,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6071,6 +6085,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6148,6 +6163,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6374,6 +6390,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6394,6 +6411,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6756,6 +6774,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7198,6 +7218,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7482,6 +7503,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8148,6 +8170,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8472,6 +8495,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 8ae1bed9f3c..55462d75497 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1464,6 +1465,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1944,6 +1946,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_0";
@@ -1958,6 +1961,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2685,6 +2689,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2701,6 +2706,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3182,6 +3188,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3978,6 +3985,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4171,6 +4179,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4393,6 +4402,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4657,6 +4667,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5292,6 +5303,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5851,6 +5863,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5993,6 +6006,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6068,6 +6082,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6145,6 +6160,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6371,6 +6387,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6391,6 +6408,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6753,6 +6771,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7195,6 +7215,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7478,6 +7499,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8144,6 +8166,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8468,6 +8491,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index cc1588571ce..2327163b9f8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1464,6 +1465,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1944,6 +1946,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_0";
@@ -1958,6 +1961,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2685,6 +2689,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2701,6 +2706,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3181,6 +3187,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3977,6 +3984,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4170,6 +4178,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4392,6 +4401,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4656,6 +4666,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5291,6 +5302,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5849,6 +5861,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5967,6 +5980,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5990,6 +6004,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6065,6 +6080,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6142,6 +6158,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6368,6 +6385,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6388,6 +6406,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6750,6 +6769,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7192,6 +7213,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7475,6 +7497,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8140,6 +8163,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8464,6 +8488,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index ab44df6f4f7..c0bdb9c075f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1464,6 +1465,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1944,6 +1946,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_0";
@@ -1958,6 +1961,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2682,6 +2686,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2698,6 +2703,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3177,6 +3183,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3973,6 +3980,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4166,6 +4174,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4388,6 +4397,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4652,6 +4662,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5286,6 +5297,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5844,6 +5856,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5962,6 +5975,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5985,6 +5999,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6060,6 +6075,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6137,6 +6153,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6363,6 +6380,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6383,6 +6401,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6745,6 +6764,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7187,6 +7208,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7470,6 +7492,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8135,6 +8158,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8459,6 +8483,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 04df96c30c8..f7d9f4e7938 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1463,6 +1464,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1942,6 +1944,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_0";
@@ -1956,6 +1959,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2680,6 +2684,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2696,6 +2701,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3173,6 +3179,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3968,6 +3975,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4161,6 +4169,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4383,6 +4392,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4647,6 +4657,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5281,6 +5292,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5839,6 +5851,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5957,6 +5970,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5980,6 +5994,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6054,6 +6069,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6131,6 +6147,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6357,6 +6374,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6377,6 +6395,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6739,6 +6758,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7181,6 +7202,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7464,6 +7486,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8129,6 +8152,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8453,6 +8477,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 0bae504f61a..625bb751dd7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1463,6 +1464,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1941,6 +1943,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_0";
@@ -1955,6 +1958,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2679,6 +2683,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2695,6 +2700,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3171,6 +3177,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3966,6 +3973,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4158,6 +4166,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4380,6 +4389,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4644,6 +4654,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5278,6 +5289,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5836,6 +5848,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5953,6 +5966,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5976,6 +5990,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6050,6 +6065,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6127,6 +6143,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6353,6 +6370,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6373,6 +6391,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6735,6 +6754,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7177,6 +7198,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7460,6 +7482,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8124,6 +8147,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8448,6 +8472,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index d213048219c..a86e275379d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1463,6 +1464,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1941,6 +1943,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_1";
@@ -1955,6 +1958,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2679,6 +2683,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2695,6 +2700,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3171,6 +3177,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3965,6 +3972,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4157,6 +4165,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4379,6 +4388,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4643,6 +4653,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5277,6 +5288,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5834,6 +5846,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5951,6 +5964,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5974,6 +5988,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6048,6 +6063,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6125,6 +6141,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6351,6 +6368,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6371,6 +6389,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6733,6 +6752,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7175,6 +7196,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7456,6 +7478,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8120,6 +8143,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8444,6 +8468,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 55f13118e3f..5bd503e257b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1472,6 +1473,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1954,6 +1956,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_3";
@@ -1968,6 +1971,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2697,6 +2701,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2713,6 +2718,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3199,6 +3205,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3999,6 +4006,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4193,6 +4201,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4416,6 +4425,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4683,6 +4693,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5324,6 +5335,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5887,6 +5899,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6031,6 +6044,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6106,6 +6120,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6183,6 +6198,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6412,6 +6428,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6432,6 +6449,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6796,6 +6814,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7242,6 +7262,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7527,6 +7548,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8204,6 +8226,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8528,6 +8551,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index ebfd30a5ced..d214cf62b66 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1463,6 +1464,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1941,6 +1943,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_1";
@@ -1955,6 +1958,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2678,6 +2682,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2694,6 +2699,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3170,6 +3176,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3964,6 +3971,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4156,6 +4164,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4378,6 +4387,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4642,6 +4652,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5276,6 +5287,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5833,6 +5845,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5950,6 +5963,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5973,6 +5987,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6047,6 +6062,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6124,6 +6140,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6350,6 +6367,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6370,6 +6388,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6731,6 +6750,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7173,6 +7194,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7453,6 +7475,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8117,6 +8140,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8441,6 +8465,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 3fce33ab764..a23e5cebefb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1463,6 +1464,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1941,6 +1943,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_1";
@@ -1955,6 +1958,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2678,6 +2682,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2694,6 +2699,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3170,6 +3176,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3964,6 +3971,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4156,6 +4164,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4378,6 +4387,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4642,6 +4652,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5275,6 +5286,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5832,6 +5844,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5949,6 +5962,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5972,6 +5986,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6046,6 +6061,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6123,6 +6139,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6349,6 +6366,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6369,6 +6387,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6729,6 +6748,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7171,6 +7192,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7451,6 +7473,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8115,6 +8138,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8437,6 +8461,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 87a4bc9f864..159429c5915 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1463,6 +1464,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1941,6 +1943,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_1";
@@ -1955,6 +1958,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2678,6 +2682,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2694,6 +2699,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3170,6 +3176,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3964,6 +3971,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4156,6 +4164,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4377,6 +4386,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4641,6 +4651,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5274,6 +5285,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5830,6 +5842,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5947,6 +5960,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5970,6 +5984,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6044,6 +6059,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6121,6 +6137,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6347,6 +6364,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6367,6 +6385,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6727,6 +6746,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7169,6 +7190,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7449,6 +7471,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8113,6 +8136,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8435,6 +8459,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 485e45cc6e2..22cb853d62c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1472,6 +1473,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1954,6 +1956,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_3";
@@ -1968,6 +1971,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2697,6 +2701,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2713,6 +2718,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3198,6 +3204,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3998,6 +4005,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4192,6 +4200,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4415,6 +4424,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4682,6 +4692,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5322,6 +5333,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5885,6 +5897,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6029,6 +6042,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6104,6 +6118,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6181,6 +6196,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6410,6 +6426,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6430,6 +6447,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6794,6 +6812,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7240,6 +7260,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7525,6 +7546,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8202,6 +8224,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8526,6 +8549,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 8a4a70c5298..0b54e10bcf1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1472,6 +1473,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1953,6 +1955,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_3";
@@ -1967,6 +1970,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2696,6 +2700,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2712,6 +2717,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3197,6 +3203,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3997,6 +4004,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4191,6 +4199,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4414,6 +4423,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4681,6 +4691,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5321,6 +5332,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5883,6 +5895,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6027,6 +6040,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6102,6 +6116,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6179,6 +6194,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6407,6 +6423,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6427,6 +6444,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6791,6 +6809,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7236,6 +7256,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7521,6 +7542,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8198,6 +8220,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8522,6 +8545,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 4233d8fc454..21ce9326946 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1472,6 +1473,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1953,6 +1955,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_3";
@@ -1967,6 +1970,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2695,6 +2699,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2711,6 +2716,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3196,6 +3202,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3996,6 +4003,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4190,6 +4198,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4413,6 +4422,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4680,6 +4690,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5320,6 +5331,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5882,6 +5894,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6026,6 +6039,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6101,6 +6115,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6178,6 +6193,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6406,6 +6422,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6426,6 +6443,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6790,6 +6808,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7235,6 +7255,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7520,6 +7541,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8197,6 +8219,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8521,6 +8544,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index ec0401314e0..5f281520fe1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1470,6 +1471,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1950,6 +1952,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_3";
@@ -1964,6 +1967,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2692,6 +2696,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2708,6 +2713,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3193,6 +3199,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3991,6 +3998,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4185,6 +4193,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4408,6 +4417,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4675,6 +4685,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5315,6 +5326,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5877,6 +5889,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6020,6 +6033,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6095,6 +6109,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6172,6 +6187,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6400,6 +6416,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6420,6 +6437,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6784,6 +6802,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7229,6 +7249,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7514,6 +7535,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8189,6 +8211,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8513,6 +8536,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 72a550021b7..71801ba1ac6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1469,6 +1470,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1949,6 +1951,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_3";
@@ -1963,6 +1966,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2691,6 +2695,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2707,6 +2712,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3192,6 +3198,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3990,6 +3997,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4184,6 +4192,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4407,6 +4416,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4674,6 +4684,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5314,6 +5325,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5877,6 +5889,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6019,6 +6032,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6094,6 +6108,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6171,6 +6186,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6399,6 +6415,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6419,6 +6436,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6783,6 +6801,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7228,6 +7248,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7513,6 +7534,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8188,6 +8210,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8512,6 +8535,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index f8c03a26d70..03512c1024f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1468,6 +1469,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1948,6 +1950,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_3";
@@ -1962,6 +1965,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2690,6 +2694,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2706,6 +2711,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3190,6 +3196,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3988,6 +3995,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4182,6 +4190,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4405,6 +4414,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4672,6 +4682,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5312,6 +5323,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5875,6 +5887,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6017,6 +6030,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6092,6 +6106,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6169,6 +6184,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = doDistribute super."optparse-simple_0_0_2";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6397,6 +6413,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6417,6 +6434,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6781,6 +6799,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7225,6 +7245,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7509,6 +7530,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8182,6 +8204,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8506,6 +8529,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 0b803aceaa7..85897a41255 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1466,6 +1467,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1946,6 +1948,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_2_4";
@@ -1960,6 +1963,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2688,6 +2692,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2704,6 +2709,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3186,6 +3192,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3984,6 +3991,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4178,6 +4186,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4401,6 +4410,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4666,6 +4676,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5305,6 +5316,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5867,6 +5879,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6009,6 +6022,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6084,6 +6098,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
@@ -6161,6 +6176,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = doDistribute super."optparse-simple_0_0_2";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6388,6 +6404,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6408,6 +6425,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6772,6 +6790,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7216,6 +7236,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7500,6 +7521,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8169,6 +8191,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8493,6 +8516,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index a4dcc621a82..e2c72b96b62 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -633,6 +633,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1425,6 +1426,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1737,6 +1739,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1885,6 +1888,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_1";
@@ -1899,6 +1903,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2607,6 +2612,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2622,6 +2628,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3082,6 +3089,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3868,6 +3876,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4057,6 +4066,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4275,6 +4285,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4534,6 +4545,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5134,6 +5146,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5251,6 +5264,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5670,6 +5684,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5808,6 +5823,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5880,6 +5896,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5953,6 +5970,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6172,6 +6190,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6188,6 +6207,7 @@ self: super: {
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6545,6 +6565,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6985,6 +7007,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7014,6 +7037,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7260,6 +7284,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7903,6 +7928,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8219,6 +8245,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index da4b30b8f9c..42ad5e82e7e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -633,6 +633,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1424,6 +1425,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1736,6 +1738,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1884,6 +1887,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_1";
@@ -1898,6 +1902,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2606,6 +2611,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2621,6 +2627,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3079,6 +3086,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3865,6 +3873,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4054,6 +4063,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4272,6 +4282,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4531,6 +4542,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5131,6 +5143,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5248,6 +5261,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5665,6 +5679,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5803,6 +5818,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5875,6 +5891,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5948,6 +5965,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6166,6 +6184,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6182,6 +6201,7 @@ self: super: {
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6539,6 +6559,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6978,6 +7000,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7007,6 +7030,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7253,6 +7277,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7896,6 +7921,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8211,6 +8237,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 3b608d17c16..c36daa1f5e9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -628,6 +628,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1413,6 +1414,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1722,6 +1724,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1869,6 +1872,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1883,6 +1887,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2585,6 +2590,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2600,6 +2606,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3052,6 +3059,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3834,6 +3842,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4022,6 +4031,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4238,6 +4248,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4496,6 +4507,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5088,6 +5100,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5205,6 +5218,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5618,6 +5632,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5754,6 +5769,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5826,6 +5842,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5898,6 +5915,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6115,6 +6133,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6130,6 +6149,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6317,6 +6337,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6480,6 +6501,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6918,6 +6941,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6947,6 +6971,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7189,6 +7214,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7824,6 +7850,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8136,6 +8163,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 71295c733a2..25a29c1d60a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -628,6 +628,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1413,6 +1414,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1722,6 +1724,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1868,6 +1871,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1882,6 +1886,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2584,6 +2589,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2599,6 +2605,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3050,6 +3057,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3832,6 +3840,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4020,6 +4029,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4236,6 +4246,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4494,6 +4505,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5086,6 +5098,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5203,6 +5216,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5616,6 +5630,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5752,6 +5767,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5824,6 +5840,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5896,6 +5913,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6112,6 +6130,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6127,6 +6146,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6314,6 +6334,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6477,6 +6498,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6915,6 +6938,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6944,6 +6968,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7185,6 +7210,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7820,6 +7846,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8132,6 +8159,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index cd3a21a0424..28327fc0dd2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1412,6 +1413,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1721,6 +1723,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1867,6 +1870,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1881,6 +1885,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2580,6 +2585,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2595,6 +2601,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3046,6 +3053,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3827,6 +3835,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4015,6 +4024,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4231,6 +4241,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4489,6 +4500,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5081,6 +5093,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5198,6 +5211,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5611,6 +5625,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5747,6 +5762,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5819,6 +5835,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5891,6 +5908,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6106,6 +6124,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6121,6 +6140,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6308,6 +6328,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6471,6 +6492,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6909,6 +6932,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6938,6 +6962,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7179,6 +7204,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7812,6 +7838,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8124,6 +8151,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index eb17f7e72a8..0127a5f9330 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1412,6 +1413,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1721,6 +1723,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1867,6 +1870,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1881,6 +1885,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2580,6 +2585,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2595,6 +2601,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3046,6 +3053,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3827,6 +3835,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4015,6 +4024,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4230,6 +4240,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4488,6 +4499,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5079,6 +5091,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5196,6 +5209,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5609,6 +5623,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5745,6 +5760,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5817,6 +5833,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5889,6 +5906,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6103,6 +6121,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6118,6 +6137,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6305,6 +6325,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6468,6 +6489,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6906,6 +6929,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6935,6 +6959,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7176,6 +7201,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7809,6 +7835,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8121,6 +8148,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 4977ead89e3..b7422753928 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1410,6 +1411,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1718,6 +1720,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1864,6 +1867,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1878,6 +1882,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2574,6 +2579,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2589,6 +2595,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3040,6 +3047,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3821,6 +3829,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4009,6 +4018,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4224,6 +4234,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4481,6 +4492,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5072,6 +5084,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5189,6 +5202,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5601,6 +5615,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5737,6 +5752,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5809,6 +5825,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5881,6 +5898,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6095,6 +6113,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6110,6 +6129,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6297,6 +6317,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6460,6 +6481,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6898,6 +6921,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6927,6 +6951,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7168,6 +7193,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7801,6 +7827,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_3";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8113,6 +8140,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 69adc7bd0e4..93f64e0297e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1410,6 +1411,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1718,6 +1720,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1864,6 +1867,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1878,6 +1882,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2574,6 +2579,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2589,6 +2595,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3040,6 +3047,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3819,6 +3827,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4007,6 +4016,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4221,6 +4231,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4478,6 +4489,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5068,6 +5080,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5185,6 +5198,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5597,6 +5611,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5733,6 +5748,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5805,6 +5821,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5877,6 +5894,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6091,6 +6109,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6106,6 +6125,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6293,6 +6313,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6456,6 +6477,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6894,6 +6917,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6922,6 +6946,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7163,6 +7188,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7796,6 +7822,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_3";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8108,6 +8135,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index fb176346a7b..547e69051d1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1409,6 +1410,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1717,6 +1719,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1863,6 +1866,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1877,6 +1881,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2573,6 +2578,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2588,6 +2594,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3038,6 +3045,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3816,6 +3824,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4004,6 +4013,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4218,6 +4228,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4475,6 +4486,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5064,6 +5076,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5181,6 +5194,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5592,6 +5606,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5728,6 +5743,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5800,6 +5816,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5872,6 +5889,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6085,6 +6103,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6100,6 +6119,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6286,6 +6306,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6449,6 +6470,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6885,6 +6908,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6913,6 +6937,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7154,6 +7179,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7784,6 +7810,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_3";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8096,6 +8123,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index d3db8afa300..bc49a4c4d8b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1408,6 +1409,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1716,6 +1718,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1862,6 +1865,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1876,6 +1880,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2571,6 +2576,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2586,6 +2592,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3036,6 +3043,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3813,6 +3821,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4001,6 +4010,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4215,6 +4225,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4472,6 +4483,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5060,6 +5072,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5176,6 +5189,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5586,6 +5600,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5722,6 +5737,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5794,6 +5810,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5866,6 +5883,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6079,6 +6097,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6094,6 +6113,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6280,6 +6300,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6443,6 +6464,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6879,6 +6902,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6907,6 +6931,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7148,6 +7173,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7778,6 +7804,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_3";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8090,6 +8117,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 35eb440d756..9fcfa0c19a1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1408,6 +1409,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1716,6 +1718,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1861,6 +1864,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1875,6 +1879,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2570,6 +2575,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2585,6 +2591,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3035,6 +3042,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3809,6 +3817,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -3996,6 +4005,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4209,6 +4219,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4463,6 +4474,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5051,6 +5063,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5167,6 +5180,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5577,6 +5591,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5713,6 +5728,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5785,6 +5801,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5857,6 +5874,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6069,6 +6087,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6084,6 +6103,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6270,6 +6290,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6431,6 +6452,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6867,6 +6890,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6895,6 +6919,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7135,6 +7160,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7765,6 +7791,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_3";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7938,6 +7965,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -8076,6 +8104,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index ce8ecc39852..5b282ac41e0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -626,6 +626,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1405,6 +1406,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1712,6 +1714,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1856,6 +1859,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1870,6 +1874,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2564,6 +2569,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2579,6 +2585,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3029,6 +3036,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3803,6 +3811,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -3990,6 +3999,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4201,6 +4211,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4454,6 +4465,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5041,6 +5053,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5156,6 +5169,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5566,6 +5580,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5701,6 +5716,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5773,6 +5789,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5845,6 +5862,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6055,6 +6073,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6070,6 +6089,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6256,6 +6276,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6417,6 +6438,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6853,6 +6876,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6881,6 +6905,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7120,6 +7145,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7750,6 +7776,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_4";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7923,6 +7950,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -8061,6 +8089,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index ba9460ae8c0..1ebe77d959a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1422,6 +1423,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1734,6 +1736,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1882,6 +1885,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_1";
@@ -1896,6 +1900,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2604,6 +2609,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2619,6 +2625,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3076,6 +3083,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3861,6 +3869,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4050,6 +4059,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4268,6 +4278,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4527,6 +4538,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5125,6 +5137,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5242,6 +5255,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5659,6 +5673,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5797,6 +5812,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5869,6 +5885,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5942,6 +5959,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6160,6 +6178,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6175,6 +6194,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6531,6 +6551,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6970,6 +6992,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6999,6 +7022,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7243,6 +7267,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7886,6 +7911,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8201,6 +8227,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 444c6627aee..76dc6b16681 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -625,6 +625,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1404,6 +1405,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1711,6 +1713,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1855,6 +1858,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1869,6 +1873,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2563,6 +2568,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2578,6 +2584,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3028,6 +3035,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3802,6 +3810,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -3989,6 +3998,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4200,6 +4210,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4453,6 +4464,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5039,6 +5051,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5154,6 +5167,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5564,6 +5578,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5699,6 +5714,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5771,6 +5787,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5843,6 +5860,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6052,6 +6070,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6067,6 +6086,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6253,6 +6273,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6414,6 +6435,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6849,6 +6872,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6877,6 +6901,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7116,6 +7141,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7744,6 +7770,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_4";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7917,6 +7944,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -8055,6 +8083,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 5d00ab1621b..3cfb0693f21 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -625,6 +625,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1404,6 +1405,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1711,6 +1713,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1855,6 +1858,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1869,6 +1873,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2562,6 +2567,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2577,6 +2583,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3025,6 +3032,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3798,6 +3806,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -3985,6 +3994,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4196,6 +4206,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4449,6 +4460,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5033,6 +5045,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5148,6 +5161,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5557,6 +5571,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5692,6 +5707,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5764,6 +5780,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5836,6 +5853,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6044,6 +6062,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6058,6 +6077,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6244,6 +6264,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6405,6 +6426,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6837,6 +6860,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
@@ -6857,6 +6881,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7095,6 +7120,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7722,6 +7748,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7895,6 +7922,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -8033,6 +8061,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 3c00b7054b4..bf031881d65 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -625,6 +625,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1404,6 +1405,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1711,6 +1713,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1855,6 +1858,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1869,6 +1873,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2562,6 +2567,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2577,6 +2583,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3023,6 +3030,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3796,6 +3804,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -3982,6 +3991,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4193,6 +4203,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4446,6 +4457,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5027,6 +5039,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5142,6 +5155,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5551,6 +5565,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5686,6 +5701,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5758,6 +5774,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5830,6 +5847,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6038,6 +6056,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6052,6 +6071,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6238,6 +6258,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6399,6 +6420,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6831,6 +6854,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
@@ -6851,6 +6875,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7089,6 +7114,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7716,6 +7742,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7889,6 +7916,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -8027,6 +8055,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index f42c314bfbc..faad5bb99d4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1421,6 +1422,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1733,6 +1735,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1881,6 +1884,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_3_1";
@@ -1895,6 +1899,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2602,6 +2607,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2617,6 +2623,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3073,6 +3080,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3858,6 +3866,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4047,6 +4056,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4264,6 +4274,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4523,6 +4534,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5121,6 +5133,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5238,6 +5251,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5655,6 +5669,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5793,6 +5808,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5865,6 +5881,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5938,6 +5955,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6156,6 +6174,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6171,6 +6190,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6527,6 +6547,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6965,6 +6987,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_2";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6994,6 +7017,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7237,6 +7261,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7879,6 +7904,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8193,6 +8219,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 43c7b1f735f..76d1fc195f9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1421,6 +1422,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1733,6 +1735,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1881,6 +1884,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1895,6 +1899,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2602,6 +2607,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2617,6 +2623,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3073,6 +3080,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3858,6 +3866,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4047,6 +4056,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4264,6 +4274,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4523,6 +4534,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5121,6 +5133,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5238,6 +5251,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5655,6 +5669,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5793,6 +5808,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5865,6 +5881,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5938,6 +5955,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6156,6 +6174,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6171,6 +6190,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6527,6 +6547,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6965,6 +6987,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_2";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6994,6 +7017,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7237,6 +7261,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7878,6 +7903,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8192,6 +8218,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 7ec796dda7b..cd190f6fec1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1420,6 +1421,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1732,6 +1734,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1880,6 +1883,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1894,6 +1898,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2601,6 +2606,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2616,6 +2622,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3071,6 +3078,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3856,6 +3864,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4045,6 +4054,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4261,6 +4271,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4519,6 +4530,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5115,6 +5127,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5232,6 +5245,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5648,6 +5662,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5786,6 +5801,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5858,6 +5874,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5931,6 +5948,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6148,6 +6166,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6163,6 +6182,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6518,6 +6538,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6956,6 +6978,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_2";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6985,6 +7008,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7228,6 +7252,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7866,6 +7891,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8180,6 +8206,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index a112ab1e422..aeea6d22b6d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1420,6 +1421,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1732,6 +1734,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1880,6 +1883,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1894,6 +1898,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2601,6 +2606,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2616,6 +2622,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3071,6 +3078,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3853,6 +3861,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4042,6 +4051,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4258,6 +4268,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4516,6 +4527,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5109,6 +5121,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5226,6 +5239,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5641,6 +5655,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5779,6 +5794,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5851,6 +5867,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5924,6 +5941,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6141,6 +6159,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6156,6 +6175,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6511,6 +6531,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6949,6 +6971,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_2";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6978,6 +7001,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7221,6 +7245,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7858,6 +7883,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8171,6 +8197,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 65572393d10..53311a3df47 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1418,6 +1419,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1730,6 +1732,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1878,6 +1881,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1892,6 +1896,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2598,6 +2603,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2613,6 +2619,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3068,6 +3075,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3850,6 +3858,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4038,6 +4047,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4254,6 +4264,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4512,6 +4523,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5104,6 +5116,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5221,6 +5234,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5636,6 +5650,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5774,6 +5789,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5846,6 +5862,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5919,6 +5936,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6136,6 +6154,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6151,6 +6170,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6504,6 +6524,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6942,6 +6964,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_4";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6971,6 +6994,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7214,6 +7238,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7850,6 +7875,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8163,6 +8189,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 5620e12acfb..4226be5db23 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1418,6 +1419,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1728,6 +1730,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1875,6 +1878,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1889,6 +1893,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2591,6 +2596,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2606,6 +2612,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3061,6 +3068,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3843,6 +3851,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4031,6 +4040,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4247,6 +4257,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4505,6 +4516,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5097,6 +5109,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5214,6 +5227,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5627,6 +5641,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5765,6 +5780,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5837,6 +5853,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5910,6 +5927,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6127,6 +6145,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6142,6 +6161,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6330,6 +6350,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6493,6 +6514,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6931,6 +6954,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_4";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6960,6 +6984,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7203,6 +7228,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7838,6 +7864,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8151,6 +8178,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 6be418c5b6e..a973edbf42f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -630,6 +630,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1416,6 +1417,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1725,6 +1727,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1872,6 +1875,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1886,6 +1890,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2588,6 +2593,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2603,6 +2609,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3056,6 +3063,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3838,6 +3846,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4026,6 +4035,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4242,6 +4252,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4500,6 +4511,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5092,6 +5104,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -5209,6 +5222,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5622,6 +5636,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5760,6 +5775,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5832,6 +5848,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5904,6 +5921,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6121,6 +6139,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6136,6 +6155,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6324,6 +6344,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6487,6 +6508,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6925,6 +6948,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_4";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6954,6 +6978,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7197,6 +7222,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7832,6 +7858,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8145,6 +8172,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index ab83739308c..eff8ca3cc61 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -609,6 +609,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1311,6 +1312,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1603,6 +1605,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1698,6 +1701,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1742,6 +1746,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1756,6 +1761,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1847,9 +1853,11 @@ self: super: {
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2419,6 +2427,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2434,6 +2443,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2873,6 +2883,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3623,6 +3634,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -3807,6 +3819,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4007,6 +4020,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4241,6 +4255,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
   "http-media" = doDistribute super."http-media_0_6_2";
@@ -4803,6 +4818,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -4917,6 +4933,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5312,6 +5329,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5417,6 +5435,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5439,6 +5458,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nixfromnpm" = dontDistribute super."nixfromnpm";
@@ -5509,6 +5529,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5577,6 +5598,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_12_0_0";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5774,6 +5796,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5787,6 +5811,7 @@ self: super: {
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5963,6 +5988,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6119,6 +6145,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6529,6 +6557,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6545,6 +6574,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6774,6 +6804,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7372,6 +7403,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_4";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7533,6 +7565,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7640,6 +7673,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7663,6 +7697,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -7846,6 +7881,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 82a17df0206..612919ac2c9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -609,6 +609,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1309,6 +1310,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1601,6 +1603,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1696,6 +1699,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1740,6 +1744,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1754,6 +1759,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1845,9 +1851,11 @@ self: super: {
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2417,6 +2425,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2432,6 +2441,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2867,6 +2877,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3617,6 +3628,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -3800,6 +3812,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4000,6 +4013,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4234,6 +4248,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
   "http-media" = doDistribute super."http-media_0_6_2";
@@ -4788,6 +4803,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -4902,6 +4918,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5297,6 +5314,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5402,6 +5420,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5424,6 +5443,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nixfromnpm" = dontDistribute super."nixfromnpm";
@@ -5494,6 +5514,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5562,6 +5583,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_12_0_0";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5758,6 +5780,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5770,6 +5794,7 @@ self: super: {
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5946,6 +5971,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6102,6 +6128,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6512,6 +6540,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6528,6 +6557,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6757,6 +6787,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7354,6 +7385,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7515,6 +7547,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7622,6 +7655,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7645,6 +7679,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -7827,6 +7862,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index d0be0c20d0b..f103942113d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -607,6 +607,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1304,6 +1305,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1596,6 +1598,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1689,6 +1692,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1732,6 +1736,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava" = doDistribute super."cassava_0_4_4_0";
@@ -1746,6 +1751,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -1836,9 +1842,11 @@ self: super: {
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2404,6 +2412,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2419,6 +2428,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2850,6 +2860,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3593,6 +3604,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -3773,6 +3785,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -3972,6 +3985,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4202,6 +4216,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
   "http-media" = doDistribute super."http-media_0_6_2";
@@ -4752,6 +4767,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -4866,6 +4882,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5257,6 +5274,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5362,6 +5380,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5384,6 +5403,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nixfromnpm" = dontDistribute super."nixfromnpm";
@@ -5454,6 +5474,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5522,6 +5543,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_12_0_0";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5718,6 +5740,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5730,6 +5754,7 @@ self: super: {
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5903,6 +5928,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6059,6 +6085,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6464,6 +6492,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6480,6 +6509,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6705,6 +6735,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7298,6 +7329,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7459,6 +7491,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7566,6 +7599,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7589,6 +7623,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -7767,6 +7802,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 222090f32d0..75dc1fec671 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -598,6 +598,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1288,6 +1289,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1574,6 +1576,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1663,6 +1666,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1706,6 +1710,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
@@ -1719,6 +1724,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -1807,9 +1813,11 @@ self: super: {
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2364,6 +2372,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2379,6 +2388,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2798,6 +2808,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3528,6 +3539,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -3708,6 +3720,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -3906,6 +3919,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4135,6 +4149,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
   "http-media" = doDistribute super."http-media_0_6_2";
@@ -4414,6 +4429,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_0";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4679,6 +4695,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -4791,6 +4808,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -4937,6 +4955,7 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5174,6 +5193,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5278,6 +5298,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -5299,6 +5320,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nixfromnpm" = dontDistribute super."nixfromnpm";
@@ -5369,6 +5391,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5436,6 +5459,7 @@ self: super: {
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5627,6 +5651,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5638,6 +5664,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5809,6 +5836,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -5961,6 +5989,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6360,6 +6390,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6376,6 +6407,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6598,6 +6630,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7175,6 +7208,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7330,6 +7364,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7348,6 +7383,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = doDistribute super."userid_0_1_2_3";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
@@ -7433,6 +7472,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7456,6 +7496,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
@@ -7504,8 +7545,10 @@ self: super: {
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
   "warp-dynamic" = dontDistribute super."warp-dynamic";
   "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_2_0";
   "warp-tls-uid" = dontDistribute super."warp-tls-uid";
   "watchdog" = dontDistribute super."watchdog";
   "watcher" = dontDistribute super."watcher";
@@ -7630,6 +7673,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index 2cf782f7032..1c901164f84 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -596,6 +596,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1285,6 +1286,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1567,6 +1569,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1655,6 +1658,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1698,6 +1702,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
@@ -1711,6 +1716,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -1796,9 +1802,11 @@ self: super: {
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2352,6 +2360,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2367,6 +2376,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2786,6 +2796,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3454,6 +3465,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_6";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3515,6 +3527,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -3695,6 +3708,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -3893,6 +3907,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4122,6 +4137,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
   "http-media" = doDistribute super."http-media_0_6_2";
@@ -4400,6 +4416,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_0";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4623,6 +4640,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_9_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4663,6 +4681,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -4775,6 +4794,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -4921,6 +4941,7 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5156,6 +5177,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5260,6 +5282,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -5281,6 +5304,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nixfromnpm" = dontDistribute super."nixfromnpm";
@@ -5351,6 +5375,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5418,6 +5443,7 @@ self: super: {
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5609,6 +5635,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5620,6 +5648,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5791,6 +5820,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -5943,6 +5973,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6340,6 +6372,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6356,6 +6389,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6578,6 +6612,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7154,6 +7189,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7309,6 +7345,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7327,6 +7364,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = doDistribute super."userid_0_1_2_3";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
@@ -7411,6 +7452,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7434,6 +7476,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
@@ -7482,8 +7525,10 @@ self: super: {
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
   "warp-dynamic" = dontDistribute super."warp-dynamic";
   "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_2_0";
   "warp-tls-uid" = dontDistribute super."warp-tls-uid";
   "watchdog" = dontDistribute super."watchdog";
   "watcher" = dontDistribute super."watcher";
@@ -7608,6 +7653,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index 8f8760d1ad2..e42fbcebc2a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -595,6 +595,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1284,6 +1285,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1319,6 +1321,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_17";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1343,6 +1346,7 @@ self: super: {
   "barrier-monad" = dontDistribute super."barrier-monad";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
+  "base-orphans" = doDistribute super."base-orphans_0_5_1";
   "base-prelude" = doDistribute super."base-prelude_0_1_21";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
@@ -1564,6 +1568,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1651,6 +1656,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1694,6 +1700,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
@@ -1707,6 +1714,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -1792,9 +1800,11 @@ self: super: {
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2347,6 +2357,7 @@ self: super: {
   "direct-plugins" = dontDistribute super."direct-plugins";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2362,6 +2373,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2778,6 +2790,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3443,6 +3456,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_6";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3504,6 +3518,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -3684,6 +3699,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -3772,6 +3788,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_2";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -3788,6 +3805,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_28";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -3880,6 +3898,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4109,6 +4128,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
   "http-monad" = dontDistribute super."http-monad";
@@ -4385,6 +4405,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_0";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4608,6 +4629,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_9_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4648,6 +4670,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -4760,6 +4783,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -4906,6 +4930,7 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5135,6 +5160,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5239,6 +5265,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -5260,6 +5287,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nixfromnpm" = dontDistribute super."nixfromnpm";
@@ -5330,6 +5358,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5397,6 +5426,7 @@ self: super: {
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5585,6 +5615,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5596,6 +5628,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5766,6 +5799,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -5916,6 +5950,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6312,6 +6348,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6328,6 +6365,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6550,6 +6588,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7124,6 +7163,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7279,6 +7319,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7297,6 +7338,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = doDistribute super."userid_0_1_2_3";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
@@ -7380,6 +7425,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7403,6 +7449,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
@@ -7451,8 +7498,10 @@ self: super: {
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
   "warp-dynamic" = dontDistribute super."warp-dynamic";
   "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_2_0";
   "warp-tls-uid" = dontDistribute super."warp-tls-uid";
   "watchdog" = dontDistribute super."watchdog";
   "watcher" = dontDistribute super."watcher";
@@ -7577,6 +7626,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
index dd5823102ac..9b45729c2ff 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -592,6 +592,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1278,6 +1279,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1313,6 +1315,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_17";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1337,6 +1340,7 @@ self: super: {
   "barrier-monad" = dontDistribute super."barrier-monad";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
+  "base-orphans" = doDistribute super."base-orphans_0_5_1";
   "base-prelude" = doDistribute super."base-prelude_0_1_21";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
@@ -1556,6 +1560,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1643,6 +1648,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1685,6 +1691,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
@@ -1698,6 +1705,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -1778,9 +1786,11 @@ self: super: {
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2329,6 +2339,7 @@ self: super: {
   "direct-plugins" = dontDistribute super."direct-plugins";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
@@ -2344,6 +2355,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2752,6 +2764,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3415,6 +3428,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_6";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3476,6 +3490,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -3656,6 +3671,7 @@ self: super: {
   "herringbone" = dontDistribute super."herringbone";
   "herringbone-embed" = dontDistribute super."herringbone-embed";
   "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
   "hesql" = dontDistribute super."hesql";
   "hetero-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -3744,6 +3760,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_2";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -3760,6 +3777,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_28";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -3852,6 +3870,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4081,6 +4100,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
   "http-monad" = dontDistribute super."http-monad";
@@ -4090,6 +4110,7 @@ self: super: {
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
   "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_5";
   "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
   "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
   "httpspec" = dontDistribute super."httpspec";
@@ -4355,6 +4376,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_0";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4578,6 +4600,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_9_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4618,6 +4641,7 @@ self: super: {
   "libtagc" = dontDistribute super."libtagc";
   "libvirt-hs" = dontDistribute super."libvirt-hs";
   "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
   "libxml" = dontDistribute super."libxml";
   "libxml-enumerator" = dontDistribute super."libxml-enumerator";
   "libxslt" = dontDistribute super."libxslt";
@@ -4676,6 +4700,7 @@ self: super: {
   "list-grouping" = dontDistribute super."list-grouping";
   "list-mux" = dontDistribute super."list-mux";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_6";
   "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
   "list-t-html-parser" = dontDistribute super."list-t-html-parser";
   "list-t-http-client" = dontDistribute super."list-t-http-client";
@@ -4728,6 +4753,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -4873,6 +4899,7 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5100,6 +5127,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_3";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5204,6 +5232,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -5225,6 +5254,7 @@ self: super: {
   "nicovideo-translator" = dontDistribute super."nicovideo-translator";
   "nikepub" = dontDistribute super."nikepub";
   "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
   "nitro" = dontDistribute super."nitro";
   "nix-eval" = dontDistribute super."nix-eval";
   "nixfromnpm" = dontDistribute super."nixfromnpm";
@@ -5295,6 +5325,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5353,6 +5384,7 @@ self: super: {
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_1";
   "opn" = dontDistribute super."opn";
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
@@ -5361,6 +5393,7 @@ self: super: {
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5547,6 +5580,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5558,6 +5593,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5727,6 +5763,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -5876,6 +5913,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6269,6 +6308,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6285,6 +6325,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6504,6 +6545,7 @@ self: super: {
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7074,6 +7116,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7229,6 +7272,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7247,6 +7291,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = doDistribute super."userid_0_1_2_3";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
@@ -7329,6 +7377,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7352,6 +7401,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
@@ -7397,8 +7447,10 @@ self: super: {
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
   "warp-dynamic" = dontDistribute super."warp-dynamic";
   "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_2_0";
   "warp-tls-uid" = dontDistribute super."warp-tls-uid";
   "watchdog" = dontDistribute super."watchdog";
   "watcher" = dontDistribute super."watcher";
@@ -7523,6 +7575,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
new file mode 100644
index 00000000000..7c553d410e3
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
@@ -0,0 +1,7739 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-5.4 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "EdisonAPI" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "Gifcurry" = dontDistribute super."Gifcurry";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hclip" = dontDistribute super."Hclip";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IOSpec" = dontDistribute super."IOSpec";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "NumberTheory" = dontDistribute super."NumberTheory";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickCheck-safe" = dontDistribute super."QuickCheck-safe";
+  "QuickPlot" = dontDistribute super."QuickPlot";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "Stream" = dontDistribute super."Stream";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "Vulkan" = dontDistribute super."Vulkan";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adler32" = dontDistribute super."adler32";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-schema" = dontDistribute super."aeson-schema";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alea" = dontDistribute super."alea";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon2" = dontDistribute super."argon2";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "arrows" = dontDistribute super."arrows";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesome-prelude" = dontDistribute super."awesome-prelude";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_17";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base-orphans" = doDistribute super."base-orphans_0_5_1";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "bencoding" = dontDistribute super."bencoding";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bifunctors" = doDistribute super."bifunctors_5_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
+  "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloodhound" = dontDistribute super."bloodhound";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
+  "brainfuck" = dontDistribute super."brainfuck";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "conceit" = dontDistribute super."conceit";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "cond" = dontDistribute super."cond";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
+  "conf" = dontDistribute super."conf";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-omega" = dontDistribute super."control-monad-omega";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "converge" = dontDistribute super."converge";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default-extra" = dontDistribute super."data-default-extra";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-or" = dontDistribute super."data-or";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-monoid" = dontDistribute super."derive-monoid";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "djembe" = dontDistribute super."djembe";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "doctest-discover" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynobud" = dontDistribute super."dynobud";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "eithers" = dontDistribute super."eithers";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-growler" = dontDistribute super."engine-io-growler";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envparse" = dontDistribute super."envparse";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "external-sort" = dontDistribute super."external-sort";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-mcmc" = dontDistribute super."flat-mcmc";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "fordo" = dontDistribute super."fordo";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
+  "freekick2" = dontDistribute super."freekick2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "funcons-tools" = dontDistribute super."funcons-tools";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gamma" = dontDistribute super."gamma";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github-backup" = dontDistribute super."github-backup";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-utils" = dontDistribute super."github-utils";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gore-and-ash" = dontDistribute super."gore-and-ash";
+  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
+  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
+  "gore-and-ash-glfw" = dontDistribute super."gore-and-ash-glfw";
+  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
+  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
+  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
+  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "grasp" = dontDistribute super."grasp";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
+  "grid" = dontDistribute super."grid";
+  "gridfs" = dontDistribute super."gridfs";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "groupoid" = dontDistribute super."groupoid";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
+  "haiji" = dontDistribute super."haiji";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-filestore" = dontDistribute super."hakyll-filestore";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_6";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hardware-edsl" = dontDistribute super."hardware-edsl";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harpy" = dontDistribute super."harpy";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_2";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_19_6";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres" = dontDistribute super."hasql-postgres";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl-amazonka" = dontDistribute super."haxl-amazonka";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbayes" = dontDistribute super."hbayes";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "herf-time" = dontDistribute super."herf-time";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_28";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-repa" = dontDistribute super."hmatrix-repa";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt" = dontDistribute super."hmt";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hoppy-generator" = dontDistribute super."hoppy-generator";
+  "hoppy-runtime" = dontDistribute super."hoppy-runtime";
+  "hoppy-std" = dontDistribute super."hoppy-std";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = dontDistribute super."hpack";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-GeoIP" = dontDistribute super."hs-GeoIP";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsay" = dontDistribute super."hsay";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htoml" = dontDistribute super."htoml";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_5";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
+  "hzk" = dontDistribute super."hzk";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imap" = dontDistribute super."imap";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "isohunt" = dontDistribute super."isohunt";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_0";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lackey" = dontDistribute super."lackey";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot" = dontDistribute super."lambdabot";
+  "lambdabot-core" = dontDistribute super."lambdabot-core";
+  "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins";
+  "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins";
+  "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins";
+  "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins";
+  "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins";
+  "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins";
+  "lambdabot-trusted" = dontDistribute super."lambdabot-trusted";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysmallcheck" = dontDistribute super."lazysmallcheck";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_9_0";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logfloat" = dontDistribute super."logfloat";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logict-state" = dontDistribute super."logict-state";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "lol-apps" = dontDistribute super."lol-apps";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandulia" = dontDistribute super."mandulia";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
+  "mdcat" = dontDistribute super."mdcat";
+  "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
+  "mecab" = dontDistribute super."mecab";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "mohws" = dontDistribute super."mohws";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = doDistribute super."mwc-probability_1_0_3";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = dontDistribute super."nested-routes";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype" = dontDistribute super."numtype";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oanda-rest-api" = dontDistribute super."oanda-rest-api";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
+  "oeis" = dontDistribute super."oeis";
+  "off-simple" = dontDistribute super."off-simple";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "operational-extra" = dontDistribute super."operational-extra";
+  "opml" = dontDistribute super."opml";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_1";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "parsec-extra" = dontDistribute super."parsec-extra";
+  "parsec-numbers" = dontDistribute super."parsec-numbers";
+  "parsec-parsers" = dontDistribute super."parsec-parsers";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partial" = dontDistribute super."partial";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_7";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-json" = dontDistribute super."remote-json";
+  "remote-json-client" = dontDistribute super."remote-json-client";
+  "remote-json-server" = dontDistribute super."remote-json-server";
+  "remote-monad" = dontDistribute super."remote-monad";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retryer" = dontDistribute super."retryer";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_7_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-elm" = dontDistribute super."servant-elm";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "show" = dontDistribute super."show";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log" = dontDistribute super."simple-log";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc" = dontDistribute super."simpleirc";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sql-words" = dontDistribute super."sql-words";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-record" = dontDistribute super."state-record";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_2_1";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "symbol" = dontDistribute super."symbol";
+  "sync" = dontDistribute super."sync";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "t-regex" = dontDistribute super."t-regex";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "testPkg" = dontDistribute super."testPkg";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show" = doDistribute super."text-show_2_1_2";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracker" = dontDistribute super."tracker";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
+  "tweak" = dontDistribute super."tweak";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlambda" = dontDistribute super."unlambda";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "userid" = doDistribute super."userid_0_1_2_4";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-space-points" = dontDistribute super."vector-space-points";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vivid" = dontDistribute super."vivid";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
+  "waddle" = dontDistribute super."waddle";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_2_0";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wuss" = dontDistribute super."wuss";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "zippo" = dontDistribute super."zippo";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zot" = dontDistribute super."zot";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index da1c1fb01b9..b363ca74bfe 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -12957,6 +12957,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "MASMGen" = callPackage
+    ({ mkDerivation, base, containers, mtl }:
+     mkDerivation {
+       pname = "MASMGen";
+       version = "0.4.0.0";
+       sha256 = "9565a4905772c12dfccd9c17c5b3f52601e2aa28c9a7a288e2ab577834ed10e5";
+       libraryHaskellDepends = [ base containers mtl ];
+       testHaskellDepends = [ base containers mtl ];
+       description = "Generate MASM code from haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "MC-Fold-DP" = callPackage
     ({ mkDerivation, base, Biobase, cmdargs, PrimitiveArray, split
      , tuple, vector
@@ -13281,6 +13293,7 @@ self: {
        version = "0.1.2";
        sha256 = "9df832cee4d6fa42667b1ee1a985f2366a1771f84409b7b9414d284af78045cf";
        libraryHaskellDepends = [ base hstats ];
+       jailbreak = true;
        homepage = "http://github.com/benhamner/Metrics/";
        description = "Evaluation metrics commonly used in supervised machine learning";
        license = stdenv.lib.licenses.bsd3;
@@ -14042,8 +14055,8 @@ self: {
      }:
      mkDerivation {
        pname = "NXT";
-       version = "0.2.3";
-       sha256 = "23429e3654c48d7b009f5a0fef46af6831919c59aa15c250ef9920ce5b9a41cd";
+       version = "0.2.5";
+       sha256 = "fc644fb66a152bf4642fa08b6e3baf92670b822b433f8793e7a9ea4a0bfa0c13";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -16683,8 +16696,8 @@ self: {
      }:
      mkDerivation {
        pname = "Rasenschach";
-       version = "0.1.3.1";
-       sha256 = "a73c29528685248d266404daa4a92fcd3bd2f1e0442db39982989a213e652079";
+       version = "0.1.3.2";
+       sha256 = "4657bacee6bbdc17481174ee6a444cd77e72775d772e2f7f6db8b9e6a95f64f2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -20773,18 +20786,24 @@ self: {
 
   "YamlReference" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, dlist
-     , HUnit, regex-compat
+     , hashmap, HUnit, mtl, regex-compat
      }:
      mkDerivation {
        pname = "YamlReference";
-       version = "0.9.3";
-       sha256 = "cfee41cb2e8f860ceadd6847fddecb5e384ca40151039d3f4c85ec1907ff675a";
+       version = "0.10.0";
+       sha256 = "4d89cd7714f25c82c6a49a99e8d8b1789640222a1b5863da0a7aa3f4566b9205";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers dlist HUnit regex-compat
+         base bytestring containers dlist regex-compat
+       ];
+       executableHaskellDepends = [
+         base bytestring containers dlist regex-compat
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory dlist hashmap HUnit mtl
+         regex-compat
        ];
-       executableHaskellDepends = [ directory ];
        homepage = "http://www.ben-kiki.org/oren/YamlReference";
        description = "YAML reference implementation";
        license = "LGPL";
@@ -22317,12 +22336,13 @@ self: {
     ({ mkDerivation, aeson, base, text, time, unordered-containers }:
      mkDerivation {
        pname = "activitystreams-aeson";
-       version = "0.2.0.1";
-       sha256 = "4fe91f1355c2572661baa932988159123dd8a61e6c9c09a40af98b520291f9ae";
+       version = "0.2.0.2";
+       sha256 = "1252d328e4dad9e18f6bd188961ffc4ce12eefe35a3ecccb693297a057c512ec";
        libraryHaskellDepends = [
          aeson base text time unordered-containers
        ];
        jailbreak = true;
+       homepage = "https://github.com/aisamanra/activitystreams-aeson";
        description = "An interface to the ActivityStreams specification";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24336,15 +24356,16 @@ self: {
      }) {};
 
   "alga" = callPackage
-    ({ mkDerivation, base, containers, directory, exceptions, filepath
-     , formatting, haskeline, hxt, megaparsec, mtl, optparse-applicative
-     , path, QuickCheck, random, temporary, test-framework
-     , test-framework-quickcheck2, text, tf-random, transformers
+    ({ mkDerivation, aeson, base, containers, data-default, exceptions
+     , filepath, formatting, haskeline, hxt, megaparsec, mtl
+     , optparse-applicative, path, path-io, QuickCheck, random
+     , test-framework, test-framework-quickcheck2, text, tf-random
+     , transformers, yaml
      }:
      mkDerivation {
        pname = "alga";
-       version = "0.1.0";
-       sha256 = "e5a0bccf2817a5fa4446a6ee348de0f43f60e75884b61f12229cde948617f813";
+       version = "0.2.1";
+       sha256 = "157f622f2851da9bcc2a05df9c192c8abb955745d22d4acdfc8d3a89b765d8e7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -24352,9 +24373,9 @@ self: {
          text tf-random transformers
        ];
        executableHaskellDepends = [
-         base containers directory exceptions filepath formatting haskeline
-         hxt megaparsec mtl optparse-applicative path random temporary text
-         tf-random transformers
+         aeson base containers data-default exceptions filepath formatting
+         haskeline hxt megaparsec mtl optparse-applicative path path-io
+         random text tf-random transformers yaml
        ];
        testHaskellDepends = [
          base containers hxt megaparsec mtl QuickCheck random test-framework
@@ -31636,8 +31657,8 @@ self: {
      }:
      mkDerivation {
        pname = "atp-haskell";
-       version = "1.10";
-       sha256 = "a6e9178c6db9de5a2c1ad4a158d1730f2e3e5eb1b20f9a06a7263597fe8a1d32";
+       version = "1.13";
+       sha256 = "9e71ff29922844208afc039bf0541392a58ef4d651f6020e19679a8fa68bb5b0";
        libraryHaskellDepends = [
          applicative-extras base containers HUnit mtl parsec pretty
          template-haskell time
@@ -32342,6 +32363,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "autoexporter" = callPackage
+    ({ mkDerivation, base, directory, filepath }:
+     mkDerivation {
+       pname = "autoexporter";
+       version = "0.1.2";
+       sha256 = "bdc64e16ee42cbadf596cba93ca665cdfd3cf621f636ea5a1f3f8e7248616f2e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base ];
+       description = "Automatically re-export modules";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "autonix-deps" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, conduit
      , containers, errors, filepath, lens, libarchive-conduit, mtl
@@ -33204,8 +33239,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-route53";
-       version = "0.1.2.1";
-       sha256 = "b67317d4949a2e6649392bb6fd1e72767c3658670dbd52867ca2169ca7e6b5bc";
+       version = "0.1.2.2";
+       sha256 = "eaddcf6c4903ab17c6a963bbb2228581c016026f2e4d9cc26db2ed527487d05b";
        libraryHaskellDepends = [
          aws base bytestring containers http-conduit http-types old-locale
          resourcet text time xml-conduit xml-hamlet
@@ -33614,7 +33649,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "b9" = callPackage
+  "b9_0_5_17" = callPackage
     ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
      , bytestring, conduit, conduit-extra, ConfigFile, directory
      , filepath, free, hashable, hspec, hspec-expectations, mtl
@@ -33645,6 +33680,40 @@ self: {
        homepage = "https://github.com/sheyll/b9-vm-image-builder";
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "b9" = callPackage
+    ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
+     , bytestring, conduit, conduit-extra, ConfigFile, directory
+     , filepath, free, hashable, hspec, hspec-expectations, mtl
+     , optparse-applicative, parallel, parsec, pretty, pretty-show
+     , process, QuickCheck, random, semigroups, syb, template, text
+     , time, transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "b9";
+       version = "0.5.18";
+       sha256 = "978edf4fcb9801716e9095b75eabb248cf9ad68fdeeb360bd3ed75643b9cfedc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bifunctors binary boxes bytestring conduit
+         conduit-extra ConfigFile directory filepath free hashable mtl
+         parallel parsec pretty pretty-show process QuickCheck random
+         semigroups syb template text time transformers unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring directory optparse-applicative
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec hspec-expectations QuickCheck
+         semigroups text unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/sheyll/b9-vm-image-builder";
+       description = "A tool and library for building virtual machine images";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "babylon" = callPackage
@@ -34308,7 +34377,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-orphans" = callPackage
+  "base-orphans_0_5_1" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "base-orphans";
@@ -34319,6 +34388,20 @@ self: {
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "base-orphans" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "base-orphans";
+       version = "0.5.2";
+       sha256 = "83de88294742641fe72c92aa3337e575c8f572a7486fad383fd272e857342f1e";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/haskell-compat/base-orphans#readme";
+       description = "Backwards-compatible orphan instances for base";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "base-prelude_0_1_6" = callPackage
@@ -37486,8 +37569,8 @@ self: {
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.1.0";
-       sha256 = "0ce36b2dc686a77804158d70658cc0600056ae62e7d465663b75e784b52950a9";
+       version = "0.1.1";
+       sha256 = "ac95d23555ac96d87ebf90c90fd665587b037ae22d2fd92864efb95a8725863f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38103,15 +38186,16 @@ self: {
   "bitx-bitcoin" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest, hspec
      , http-client, http-client-tls, http-types, microlens, microlens-th
-     , network, safe, scientific, split, text, time
+     , network, QuickCheck, safe, scientific, split, text, time
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.6.0.0";
-       sha256 = "f08ac6744d6a1e74060de589603e0ee1355711a54c67501473526735ac6fb834";
+       version = "0.7.0.0";
+       sha256 = "533cad5eb0c66efc407b676b9d2a43259e74b5343b00c35e2ded9382a5a36948";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls http-types
-         microlens microlens-th network scientific split text time
+         microlens microlens-th network QuickCheck scientific split text
+         time
        ];
        testHaskellDepends = [
          aeson base bytestring directory doctest hspec http-client
@@ -38379,8 +38463,8 @@ self: {
      }:
      mkDerivation {
        pname = "blatex";
-       version = "0.1.0.5";
-       sha256 = "8c421e5c355d374463793a6bd3815185fcd8d0e8134d72b7d6e7a916f5932479";
+       version = "0.1.0.7";
+       sha256 = "1f6979e4bc113132b2dd1e840ccf1642f1649bca8f16708e13a26f2a45310aa8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39828,13 +39912,12 @@ self: {
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "brainfuck-tut";
-       version = "0.7.0.0";
-       sha256 = "d2f4142ecc30ce39a83e58a144b650a44288e6cf62d47b83cc8ee95ac2aba8a7";
+       version = "0.7.0.1";
+       sha256 = "761ef393826ecc54b9a5ab2d37b0c1af9db169bf6edb02282df67a71e02a1855";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
        executableHaskellDepends = [ array base ];
-       jailbreak = true;
        homepage = "https://gitlab.com/cpp.cabrera/brainfuck-tut";
        description = "A simple BF interpreter";
        license = stdenv.lib.licenses.bsd3;
@@ -40205,7 +40288,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "btrfs" = callPackage
+  "btrfs_0_1_1_1" = callPackage
     ({ mkDerivation, base, bytestring, time, unix }:
      mkDerivation {
        pname = "btrfs";
@@ -40219,6 +40302,21 @@ self: {
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "btrfs" = callPackage
+    ({ mkDerivation, base, bytestring, time, unix }:
+     mkDerivation {
+       pname = "btrfs";
+       version = "0.1.2.0";
+       sha256 = "a1e7bdb44c587686299e3e9e3910fb7a271bcd7462ee6fac0ffccd8c7a60fe0c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring time unix ];
+       homepage = "https://github.com/redneb/hs-btrfs";
+       description = "Bindings to the btrfs API";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
@@ -43261,7 +43359,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "cacophony" = callPackage
+  "cacophony_0_4_0" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, directory, doctest
      , filepath, hlint, lens, memory, mtl, QuickCheck, tasty
      , tasty-quickcheck
@@ -43281,6 +43379,29 @@ self: {
        homepage = "https://github.com/centromere/cacophony";
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cacophony" = callPackage
+    ({ mkDerivation, async, base, bytestring, cryptonite, directory
+     , doctest, filepath, free, hlint, lens, memory, mtl, QuickCheck
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cacophony";
+       version = "0.5.0";
+       sha256 = "942167185eebb4290e576f2c25816d0ccd52d68b47641dbdf5b5d8fffcd8f750";
+       libraryHaskellDepends = [
+         base bytestring cryptonite free lens memory mtl
+       ];
+       testHaskellDepends = [
+         async base bytestring directory doctest filepath hlint mtl
+         QuickCheck tasty tasty-quickcheck
+       ];
+       doCheck = false;
+       homepage = "https://github.com/centromere/cacophony";
+       description = "A library implementing the Noise protocol";
+       license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "caf" = callPackage
@@ -44354,6 +44475,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "casr-logbook" = callPackage
+    ({ mkDerivation, base, containers, directory, doctest, filepath
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "casr-logbook";
+       version = "0.0.3";
+       sha256 = "467e3484e77c94f6d077048fd184ea6b50904afe80291be88114455dd9af4fd5";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/tonymorris/casr-61.345";
+       description = "CASR 61.345 Pilot Personal Logbook";
+       license = "unknown";
+     }) {};
+
   "cassandra-cql" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, cryptohash
      , Decimal, hslogger, MonadCatchIO-transformers, mtl, network
@@ -44821,6 +44959,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "category-traced" = callPackage
+    ({ mkDerivation, base, categories }:
+     mkDerivation {
+       pname = "category-traced";
+       version = "0.1.0.1";
+       sha256 = "20dcb78f02c43f1dab7a7a4cb250404221dc46bbfe1075a3a200e72b77078701";
+       libraryHaskellDepends = [ base categories ];
+       description = "Traced monoidal categories";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cautious-file" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, unix }:
      mkDerivation {
@@ -45477,8 +45626,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.6.1";
-       sha256 = "49cfd5695a20c7cdad917704e81ae6cb50e77d7db6a18f7792237bb6c4dbfc38";
+       version = "6.6.2";
+       sha256 = "3c4aa9458da80a7df400479f969a432b331d9e47e57cd1358749a465e728f437";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -48538,7 +48687,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "clckwrks" = callPackage
+  "clckwrks_0_23_13" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
      , blaze-html, bytestring, cereal, containers, directory, filepath
      , happstack-authenticate, happstack-hsp, happstack-jmacro
@@ -48569,6 +48718,40 @@ self: {
        homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
+  "clckwrks" = callPackage
+    ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
+     , blaze-html, bytestring, cereal, containers, directory, filepath
+     , happstack-authenticate, happstack-hsp, happstack-jmacro
+     , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs
+     , ixset, jmacro, lens, mtl, network, network-uri, old-locale
+     , openssl, process, random, reform, reform-happstack, reform-hsp
+     , safecopy, stm, tagsoup, text, time, time-locale-compat
+     , unordered-containers, userid, utf8-string, uuid-orphans
+     , uuid-types, vector, web-plugins, web-routes, web-routes-happstack
+     , web-routes-hsp, web-routes-th, xss-sanitize
+     }:
+     mkDerivation {
+       pname = "clckwrks";
+       version = "0.23.14";
+       sha256 = "17c351be5beeb0cdd9aca04577d99e64f8968e558240f7c1c780f5ab91436ea7";
+       libraryHaskellDepends = [
+         acid-state aeson aeson-qq attoparsec base blaze-html bytestring
+         cereal containers directory filepath happstack-authenticate
+         happstack-hsp happstack-jmacro happstack-server
+         happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl
+         network network-uri old-locale process random reform
+         reform-happstack reform-hsp safecopy stm tagsoup text time
+         time-locale-compat unordered-containers userid utf8-string
+         uuid-orphans uuid-types vector web-plugins web-routes
+         web-routes-happstack web-routes-hsp web-routes-th xss-sanitize
+       ];
+       librarySystemDepends = [ openssl ];
+       homepage = "http://www.clckwrks.com/";
+       description = "A secure, reliable content management system (CMS) and blogging platform";
+       license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
   "clckwrks-cli" = callPackage
@@ -48686,7 +48869,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "clckwrks-plugin-page" = callPackage
+  "clckwrks-plugin-page_0_4_3" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
      , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
@@ -48708,6 +48891,31 @@ self: {
        homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clckwrks-plugin-page" = callPackage
+    ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
+     , containers, directory, filepath, happstack-hsp, happstack-server
+     , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
+     , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell
+     , text, time, time-locale-compat, uuid, web-plugins, web-routes
+     , web-routes-happstack, web-routes-th
+     }:
+     mkDerivation {
+       pname = "clckwrks-plugin-page";
+       version = "0.4.3.1";
+       sha256 = "2594d8737035bb069147580abf1a284fced822d654b854ea84c466d25c4896b4";
+       libraryHaskellDepends = [
+         acid-state aeson attoparsec base clckwrks containers directory
+         filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
+         old-locale random reform reform-happstack reform-hsp safecopy
+         tagsoup template-haskell text time time-locale-compat uuid
+         web-plugins web-routes web-routes-happstack web-routes-th
+       ];
+       homepage = "http://www.clckwrks.com/";
+       description = "support for CMS/Blogging in clckwrks";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "clckwrks-theme-bootstrap" = callPackage
@@ -49606,8 +49814,8 @@ self: {
      }:
      mkDerivation {
        pname = "cndict";
-       version = "0.6.4";
-       sha256 = "087b98003461144617d8d932ff5d6e853e44d599f5b2df1f378f1bb07ddb91da";
+       version = "0.7.1";
+       sha256 = "fa8e41c031e0a60abb73b0b76b18ea1a470e0a1ff8eed357c0b3f424bed9106f";
        libraryHaskellDepends = [
          base binary bytestring cassava containers text vector
        ];
@@ -54841,8 +55049,8 @@ self: {
     ({ mkDerivation, array, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "2.5.4";
-       sha256 = "d9b1c49aace29dda1189a711888ca39c6af4ab5adb4798e65a1bef489813449e";
+       version = "3.3.0";
+       sha256 = "1ec656f97612b82870000f96a3fa147796e67c305d433efd6958f9b5d794a8c0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers parallel ];
@@ -56137,6 +56345,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cryptohash_0_11_7" = callPackage
+    ({ mkDerivation, base, byteable, bytestring, ghc-prim, HUnit
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cryptohash";
+       version = "0.11.7";
+       sha256 = "da297489f6b2a029a14e08f53ff841743ca7bd35646ee7c05ebcd0028b9d0e30";
+       libraryHaskellDepends = [ base byteable bytestring ghc-prim ];
+       testHaskellDepends = [
+         base byteable bytestring HUnit QuickCheck tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       homepage = "http://github.com/vincenthz/hs-cryptohash";
+       description = "collection of crypto hashes, fast, pure and practical";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cryptohash-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , cryptohash, resourcet, transformers
@@ -56406,8 +56633,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptonite";
-       version = "0.12";
-       sha256 = "8ab0570f6f0864004d6bdce012aaafbf365a45b1721061c7d35554b92f1ababd";
+       version = "0.13";
+       sha256 = "cd8adffda8fa7daf2063d27b502d52a4509e22f5e33cca861ffbf2f32bb32ad4";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
@@ -62876,8 +63103,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-pandoc";
-       version = "0.2";
-       sha256 = "03bc32e95873000bae33d837319367febc2efad073671677afa3fdd59d246459";
+       version = "0.3";
+       sha256 = "7bc3593aa45454aff222f0e23abe2e4277af6cdf96e484a7e967c16e9a48a510";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62889,7 +63116,7 @@ self: {
          filepath linear optparse-applicative pandoc-types
        ];
        jailbreak = true;
-       description = "A pandoc filter to express diagrams inline using the haskell EDSL _diagrams_";
+       description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -64506,6 +64733,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "directory-listing-webpage-parser" = callPackage
+    ({ mkDerivation, base, bytestring, network-uri, tagsoup, text, time
+     }:
+     mkDerivation {
+       pname = "directory-listing-webpage-parser";
+       version = "0.1.0.0";
+       sha256 = "03b5f5d9180784a2d9ba481f09b9cc503b1dfbc10a747e6eebd12e9f6338e4cf";
+       libraryHaskellDepends = [
+         base bytestring network-uri tagsoup text time
+       ];
+       description = "directory listing webpage parser";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "directory-tree" = callPackage
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
@@ -64809,6 +65050,8 @@ self: {
        pname = "distributed-process";
        version = "0.6.0";
        sha256 = "d79f7e24e7b2896681f9f4b798da0e987742caab4c34917a0d04f40f9aef6b5b";
+       revision = "2";
+       editedCabalFile = "3931f513026c2190a6117df582f6ff72d06898b69fddfafe65c25d2d0460f140";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static ghc-prim hashable mtl network-transport random
@@ -64969,6 +65212,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "distributed-process-ekg" = callPackage
+    ({ mkDerivation, base, distributed-process, ekg-core, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "distributed-process-ekg";
+       version = "0.1.0.0";
+       sha256 = "ae61370b9268a2143930eac6cf3d397ed8c15fba5cb32e20f2bb194e3b4e6fdd";
+       libraryHaskellDepends = [
+         base distributed-process ekg-core text unordered-containers
+       ];
+       description = "Collect node stats for EKG";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "distributed-process-execution_0_1_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, bytestring
      , containers, data-accessor, deepseq, distributed-process
@@ -75722,8 +75980,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "filtrable";
-       version = "0.1.0.4";
-       sha256 = "85285317f86c6e4e7329d74bf6b2116ab203f810ac2b5ebde251f920c3098d53";
+       version = "0.1.0.5";
+       sha256 = "6d2a75d6b69f8d0f538e680923e9f68c17ee6feaed505a2d86d9baae4784ce7e";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/strake/filtrable.hs";
        description = "Class of filtrable containers";
@@ -76701,6 +76959,8 @@ self: {
        pname = "flock";
        version = "0.3.1.8";
        sha256 = "9634ce605c3b5579f4f1e53af7d93850ec23ffb2fd5b24e02974626af1712fbc";
+       revision = "2";
+       editedCabalFile = "29ece5230bb5ae45a09939ac9ba85e75bd81cf645634b952e6f89486f9325177";
        libraryHaskellDepends = [
          base lifted-base monad-control transformers unix
        ];
@@ -76903,8 +77163,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.4.0.2";
-       sha256 = "0ce62c0325a1ec7a9c782b0ead40cdfb3c60cc5f98c13f61f72e329214c06d17";
+       version = "0.4.0.5";
+       sha256 = "ba70bc386ff0393e762e29b183fd12d1fcf3c8329343cd81adcab3f1d30aab75";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -76920,8 +77180,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs-demos";
-       version = "0.0.0.3";
-       sha256 = "c39a9c8378857e4f4c7af7ab98516bb3deffce1e39742eb7f39ce4cf09c1f1b7";
+       version = "0.0.0.7";
+       sha256 = "4e78d6fc7e6983d53ed7a4f4625b6ff89e5c06eda116f64bd38ca360f6d83a7a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -76932,6 +77192,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "fltkhs-fluid-demos" = callPackage
+    ({ mkDerivation, base, bytestring, fltkhs }:
+     mkDerivation {
+       pname = "fltkhs-fluid-demos";
+       version = "0.0.0.6";
+       sha256 = "37b6276ba4897bea3520e3bfa72e51225e6f3409e533777d4ef2502a57925052";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base bytestring fltkhs ];
+       homepage = "http://github.com/deech/fltkhs-fluid-demos";
+       description = "Fltkhs Fluid Demos";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fltkhs-fluid-examples" = callPackage
     ({ mkDerivation, base, bytestring, fltkhs }:
      mkDerivation {
@@ -77441,8 +77715,8 @@ self: {
      }:
      mkDerivation {
        pname = "folds";
-       version = "0.7";
-       sha256 = "ec5090f3a11aa18973a239fd8285041e0766df73630864abf5ee3e14ee2ee762";
+       version = "0.7.1";
+       sha256 = "e07adf0c9834b5f78180250d7fec6a56ba84c752cbe4c991d52efc6c60b7d25a";
        configureFlags = [ "-f-test-hlint" ];
        libraryHaskellDepends = [
          adjunctions base bifunctors comonad constraints contravariant
@@ -78760,8 +79034,8 @@ self: {
      }:
      mkDerivation {
        pname = "freer";
-       version = "0.2.2.2";
-       sha256 = "3b5e9bdaeedd66f2a3c8b8128fc01b4e0939d95c3a185c256cc1b3b2729c63f3";
+       version = "0.2.2.4";
+       sha256 = "1af6b91d290eb3eea3e6c3a888e7b32a0a7a864de0ef33ddb7d3b7a169a1777d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -79183,8 +79457,8 @@ self: {
      }:
      mkDerivation {
        pname = "fswatcher";
-       version = "0.2.0";
-       sha256 = "dcaa449b48c5c767adeb5bce6fd250982dcc65049dfca9dc79bfc059b14d73bc";
+       version = "0.2.1";
+       sha256 = "bf6a6c68bb6bb677d1c079fed88688588fb2536273c2007c530a2509cb49a78a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -80549,8 +80823,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generic-deriving";
-       version = "1.10.2";
-       sha256 = "ac5c16be3ff2484bdc5b0051b5af8ed6e31fee8ede2977904a1535ad56b8d9b8";
+       version = "1.10.3";
+       sha256 = "fc1aed27f229434aaf2cd3d83c201a12108cd9a23023ff6edcb037c0775c0024";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -82914,8 +83188,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.1.2.0";
-       sha256 = "ab23b63975f0e6ea9819c303b73bb4633840ecf8fbcd9c4bd6746fed7c61e613";
+       version = "0.1.3.0";
+       sha256 = "445dc1d5e65d36a7e7d0cef19c2787da93910dfeb4db7496e9268af9ef176e9c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85353,8 +85627,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.1.4";
-       sha256 = "82aaaade8f41cbe7d2093db80186c7919f1786187739c8cc307864d1f2717987";
+       version = "0.1.5";
+       sha256 = "832993a18cb5561ec396061e6f1beeb206ea5e4b4103a34bef601f29f25cda96";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86976,8 +87250,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-glfw";
-       version = "1.1.0.0";
-       sha256 = "e953449a6d07626dddcd347e52d20610b82a89e3ff0eb6e70166dc3e098bb504";
+       version = "1.1.1.0";
+       sha256 = "b65482130fba543d369383ceb5b8033d72debba728ea848d07c9af02068d9d4c";
        libraryHaskellDepends = [
          base deepseq exceptions extra GLFW-b gore-and-ash hashable mtl
          transformers unordered-containers
@@ -90995,6 +91269,8 @@ self: {
        pname = "hackage-security";
        version = "0.5.0.2";
        sha256 = "4135221bb74e899fde71ff5e878d0401b8c274af6ade996ca7ac15d2b77dbd98";
+       revision = "1";
+       editedCabalFile = "8b92101ca8da9bb27668763565eaf3c2e461c9c0c429003b196b64dbbd5c0af0";
        libraryHaskellDepends = [
          base base64-bytestring bytestring Cabal containers cryptohash
          directory ed25519 filepath ghc-prim mtl network network-uri parsec
@@ -91464,18 +91740,18 @@ self: {
 
   "hadoop-rpc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, exceptions
-     , hashable, monad-loops, network, protobuf, random, socks, stm
-     , tasty, tasty-hunit, text, transformers, unix
+     , gsasl, hashable, monad-loops, network, protobuf, random, socks
+     , stm, tasty, tasty-hunit, text, transformers, unix
      , unordered-containers, uuid, vector, xmlhtml
      }:
      mkDerivation {
        pname = "hadoop-rpc";
-       version = "1.0.0.1";
-       sha256 = "21d2650d54b2696aed6b96641b896b8f225ab2560a75f4f0d2a7e819d6eba1da";
+       version = "1.1.0.0";
+       sha256 = "81de43a08f3aad3370fead1ac2f576425de3ea02913f0c854319c05c46defcf9";
        libraryHaskellDepends = [
-         attoparsec base bytestring cereal exceptions hashable monad-loops
-         network protobuf random socks stm text transformers unix
-         unordered-containers uuid vector xmlhtml
+         attoparsec base bytestring cereal exceptions gsasl hashable
+         monad-loops network protobuf random socks stm text transformers
+         unix unordered-containers uuid vector xmlhtml
        ];
        testHaskellDepends = [ base protobuf tasty tasty-hunit vector ];
        homepage = "http://github.com/jystic/hadoop-rpc";
@@ -91484,27 +91760,28 @@ self: {
      }) {};
 
   "hadoop-tools" = callPackage
-    ({ mkDerivation, attoparsec, base, boxes, bytestring, configurator
-     , exceptions, filepath, hadoop-rpc, old-locale
+    ({ mkDerivation, attoparsec, base, boxes, bytestring, clock
+     , configurator, exceptions, filepath, hadoop-rpc, old-locale
      , optparse-applicative, protobuf, regex-pcre-builtin, split, stm
      , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
      , unix, vector
      }:
      mkDerivation {
        pname = "hadoop-tools";
-       version = "0.7.2";
-       sha256 = "bb7448517d18a68c4aceed0e7d0ebc6f8510d206e19dbfbb43af65d58d883c3f";
+       version = "1.0.1";
+       sha256 = "1f911291ab75f3ec970d428c0d8335ec7891a0fffe4bcad6df4ba37f5c45a81b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         attoparsec base boxes bytestring configurator exceptions filepath
-         hadoop-rpc old-locale optparse-applicative protobuf
+         attoparsec base boxes bytestring clock configurator exceptions
+         filepath hadoop-rpc old-locale optparse-applicative protobuf
          regex-pcre-builtin split stm text time transformers unix vector
        ];
        testHaskellDepends = [
          attoparsec base bytestring hadoop-rpc tasty tasty-hunit
          tasty-quickcheck vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/jystic/hadoop-tools";
        description = "Fast command line tools for working with Hadoop";
        license = stdenv.lib.licenses.asl20;
@@ -91572,14 +91849,17 @@ self: {
      }) {};
 
   "hahp" = callPackage
-    ({ mkDerivation, base, containers, hmatrix, parallel, time }:
+    ({ mkDerivation, base, containers, hmatrix, parallel, random, time
+     }:
      mkDerivation {
        pname = "hahp";
-       version = "0.1.2";
-       sha256 = "8c13015c685d5abf70ec6fbb7e6b50304f8689bab332d078d53d815e66f9b7fa";
+       version = "0.1.3";
+       sha256 = "1f09efd95604fa3443a2e611d94f5362f9c8223e3dce77ceadea235ddb4d34cd";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers hmatrix parallel time ];
+       libraryHaskellDepends = [
+         base containers hmatrix parallel random time
+       ];
        executableHaskellDepends = [ base time ];
        description = "Analytic Hierarchy Process";
        license = stdenv.lib.licenses.agpl3;
@@ -93612,7 +93892,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "happstack-server" = callPackage
+  "happstack-server_7_4_6" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
      , containers, directory, exceptions, extensible-exceptions
      , filepath, hslogger, html, HUnit, monad-control, mtl, network
@@ -93639,6 +93919,36 @@ self: {
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "happstack-server" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
+     , containers, directory, exceptions, extensible-exceptions
+     , filepath, hslogger, html, HUnit, monad-control, mtl, network
+     , network-uri, old-locale, parsec, process, sendfile, syb
+     , system-filepath, template-haskell, text, threads, time
+     , time-compat, transformers, transformers-base, transformers-compat
+     , unix, utf8-string, xhtml, zlib
+     }:
+     mkDerivation {
+       pname = "happstack-server";
+       version = "7.4.6.1";
+       sha256 = "f4893c48b909b275d25a4061be85c637ebb6c5ee63f890c39b3bfefb8698ab9b";
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-html bytestring containers directory
+         exceptions extensible-exceptions filepath hslogger html
+         monad-control mtl network network-uri old-locale parsec process
+         sendfile syb system-filepath template-haskell text threads time
+         time-compat transformers transformers-base transformers-compat unix
+         utf8-string xhtml zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers HUnit parsec zlib
+       ];
+       homepage = "http://happstack.com";
+       description = "Web related tools and services";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "happstack-server-tls" = callPackage
@@ -95180,6 +95490,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-kubernetes" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, either
+     , http-types, lens, network-uri, QuickCheck, quickcheck-instances
+     , scientific, servant, servant-client, servant-mock, servant-server
+     , split, text, transformers, unordered-containers, vector, wai
+     , warp
+     }:
+     mkDerivation {
+       pname = "haskell-kubernetes";
+       version = "0.3.2";
+       sha256 = "9b45cedeab51c823a31e868096e889b72ea1f0c2035f52d17d12148892a79591";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers either http-types lens network-uri
+         QuickCheck quickcheck-instances scientific servant servant-client
+         servant-server split text unordered-containers vector wai
+       ];
+       executableHaskellDepends = [
+         base either network-uri QuickCheck servant servant-client
+         servant-mock servant-server split transformers warp
+       ];
+       homepage = "https://github.com/soundcloud/haskell-kubernetes";
+       description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "haskell-lexer" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -97522,29 +97859,27 @@ self: {
 
   "hasql" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
-     , contravariant, contravariant-extras, data-default-class, dlist
-     , either, hashable, hashtables, loch-th, mtl, placeholders
-     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
-     , quickcheck-instances, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
-     , uuid, vector
+     , bytestring-tree-builder, contravariant, contravariant-extras
+     , data-default-class, dlist, either, hashable, hashtables, loch-th
+     , mtl, placeholders, postgresql-binary, postgresql-libpq
+     , profunctors, QuickCheck, quickcheck-instances, rebase, scientific
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, text, time, transformers, uuid, vector
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.19.8";
-       sha256 = "34eaaa18216ba49621f7cf4ae5202299c8e2b57b460ac45a8dc161a159a564d1";
+       version = "0.19.9";
+       sha256 = "68543bf70d4a4336b75194402240cfd2b5ce70c2deae07076af3dc98b5b76bf9";
        libraryHaskellDepends = [
-         aeson attoparsec base base-prelude bytestring contravariant
-         contravariant-extras data-default-class dlist either hashable
-         hashtables loch-th mtl placeholders postgresql-binary
-         postgresql-libpq profunctors scientific text time transformers uuid
-         vector
+         aeson attoparsec base base-prelude bytestring
+         bytestring-tree-builder contravariant contravariant-extras
+         data-default-class dlist either hashable hashtables loch-th mtl
+         placeholders postgresql-binary postgresql-libpq profunctors
+         scientific semigroups text time transformers uuid vector
        ];
        testHaskellDepends = [
-         base base-prelude bytestring contravariant contravariant-extras
-         data-default-class dlist either hashable profunctors QuickCheck
-         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck text time transformers uuid vector
+         data-default-class QuickCheck quickcheck-instances rebase tasty
+         tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/hasql";
@@ -98062,8 +98397,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-transaction";
-       version = "0.4.2";
-       sha256 = "b8e6e62cae96802c7f74620106d0e7b17b3fdd8ad0b30f58c81f8c8550ddea49";
+       version = "0.4.3";
+       sha256 = "9b6a623cdfb83c648c18ac70d7ce548742115d0a9ce25d41a8ab2ff73f67f95e";
        libraryHaskellDepends = [
          base-prelude bytestring bytestring-tree-builder contravariant
          contravariant-extras either hasql mtl postgresql-error-codes
@@ -99806,13 +100141,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedis_0_7_1" = callPackage
+    ({ mkDerivation, attoparsec, base, BoundedChan, bytestring
+     , bytestring-lexing, deepseq, HUnit, mtl, network, resource-pool
+     , test-framework, test-framework-hunit, time, vector
+     }:
+     mkDerivation {
+       pname = "hedis";
+       version = "0.7.1";
+       sha256 = "741dce86d4a331c64f7720ad9650e5af77ccb8c0a3301266287ae07093f7a0a0";
+       libraryHaskellDepends = [
+         attoparsec base BoundedChan bytestring bytestring-lexing deepseq
+         mtl network resource-pool time vector
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit mtl test-framework test-framework-hunit time
+       ];
+       homepage = "https://github.com/informatikr/hedis";
+       description = "Client library for the Redis datastore: supports full command set, pipelining";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedis-config" = callPackage
-    ({ mkDerivation, aeson, base, hedis, scientific, text, time }:
+    ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
+     , time
+     }:
      mkDerivation {
        pname = "hedis-config";
-       version = "0.0.2";
-       sha256 = "62be34f977587d64588cf78e52390a6960a93655331a16d7f5bab1d71a1055c7";
-       libraryHaskellDepends = [ aeson base hedis scientific text time ];
+       version = "0.0.3";
+       sha256 = "4b5ca50be0cca3ec217d4305c61472944cd97705622d7298eca7a18f037ce858";
+       libraryHaskellDepends = [
+         aeson base bytestring hedis scientific text time
+       ];
        homepage = "https://bitbucket.org/s9gf4ult/hedis-config";
        description = "Easy trivial configuration for Redis";
        license = stdenv.lib.licenses.bsd3;
@@ -100488,26 +100849,30 @@ self: {
      }) {};
 
   "hermit" = callPackage
-    ({ mkDerivation, alex, ansi-terminal, array, base, base-compat
-     , containers, data-default-class, directory, ghc, happy, haskeline
-     , kure, marked-pretty, mtl, process, stm, temporary, terminfo
-     , transformers, transformers-compat
+    ({ mkDerivation, alex, ansi-terminal, array, base, containers
+     , data-default-class, directory, fail, filepath, ghc, ghc-paths
+     , happy, haskeline, kure, marked-pretty, mtl, process, semigroups
+     , stm, tasty, tasty-golden, temporary, terminal-size, transformers
      }:
      mkDerivation {
        pname = "hermit";
-       version = "1.0.0.0";
-       sha256 = "7b66b8d8c9d1f6eb2c7e37dfc932884f299e26e80b6dad163174f428c47d6dd4";
+       version = "1.0.1";
+       sha256 = "3fac7822e9de5b081bf18a087dcd61d2eab26aa7ec6570a785aadd0c3e909249";
        revision = "1";
-       editedCabalFile = "e16afd9af9b41f5d2f1e30625045865bb315f0c8daf469a0f5b491064323060d";
+       editedCabalFile = "113c7ce268a0d0c16da03dc2f160e33bd7fe55c0f4135236477f33e44de3059c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal array base base-compat containers data-default-class
-         directory ghc haskeline kure marked-pretty mtl process stm
-         temporary terminfo transformers transformers-compat
+         ansi-terminal array base containers data-default-class directory
+         fail ghc haskeline kure marked-pretty mtl process semigroups stm
+         temporary terminal-size transformers
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory filepath ghc ghc-paths process tasty tasty-golden
+         temporary
+       ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100627,6 +100992,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hesh" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, cartel, cmdtheline
+     , containers, cryptohash, directory, filemanip, filepath
+     , hackage-db, haskell-src-exts, parsec, process, template-haskell
+     , text, time, transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "hesh";
+       version = "1.0.0";
+       sha256 = "22244996bb3bd911aff18e8008454f9407034a8422ebddbe76736248e6955aab";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base filemanip parsec process template-haskell text transformers
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring Cabal cartel cmdtheline containers cryptohash
+         directory filepath hackage-db haskell-src-exts parsec process text
+         time uniplate
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/jekor/hesh";
+       description = "the Haskell Extensible Shell: Haskell for Bash-style scripts";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hesql" = callPackage
     ({ mkDerivation, base, filepath, haskell-src, HDBC, HDBC-postgresql
      , hssqlppp, parsec
@@ -102931,7 +103322,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hjsmin" = callPackage
+  "hjsmin_0_1_5_2" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , HUnit, language-javascript, optparse-applicative, QuickCheck
      , test-framework, test-framework-hunit, text
@@ -102957,6 +103348,35 @@ self: {
        homepage = "http://github.com/erikd/hjsmin";
        description = "Haskell implementation of a javascript minifier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hjsmin" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , HUnit, language-javascript, optparse-applicative, QuickCheck
+     , test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "hjsmin";
+       version = "0.1.5.3";
+       sha256 = "5d70536206315abc8b1c2af3d32059bc65db16f95a677b8d6df6184b36f4642e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers language-javascript text
+       ];
+       executableHaskellDepends = [
+         base blaze-builder bytestring containers language-javascript
+         optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers HUnit
+         language-javascript QuickCheck test-framework test-framework-hunit
+         text
+       ];
+       homepage = "http://github.com/erikd/hjsmin";
+       description = "Haskell implementation of a javascript minifier";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hjson" = callPackage
@@ -102981,6 +103401,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hjsonpointer_0_2_0_4" = callPackage
+    ({ mkDerivation, aeson, base, http-types, HUnit, test-framework
+     , test-framework-hunit, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hjsonpointer";
+       version = "0.2.0.4";
+       sha256 = "8ac317938cc885b01d1165f15671def24e6ceac971413bd494195e77fe0e45b0";
+       libraryHaskellDepends = [
+         aeson base text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base http-types HUnit test-framework test-framework-hunit
+         text unordered-containers vector
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/seagreen/hjsonpointer";
+       description = "JSON Pointer library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hjsonpointer" = callPackage
     ({ mkDerivation, aeson, base, http-types, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -104011,7 +104453,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hlint" = callPackage
+  "hlint_1_9_28" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
      , directory, extra, filepath, haskell-src-exts, hscolour, process
      , refact, transformers, uniplate
@@ -104031,6 +104473,29 @@ self: {
        homepage = "https://github.com/ndmitchell/hlint#readme";
        description = "Source code suggestions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hlint" = callPackage
+    ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
+     , directory, extra, filepath, haskell-src-exts, hscolour, process
+     , refact, transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "hlint";
+       version = "1.9.30";
+       sha256 = "f79ff542e7e92a6972c87431ef425222d4f081a83a5a916dc2750ee83376e35e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base cmdargs containers cpphs directory extra
+         filepath haskell-src-exts hscolour process refact transformers
+         uniplate
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/ndmitchell/hlint#readme";
+       description = "Source code suggestions";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hlogger" = callPackage
@@ -106701,7 +107166,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hourglass" = callPackage
+  "hourglass_0_2_9" = callPackage
     ({ mkDerivation, base, deepseq, mtl, old-locale, tasty, tasty-hunit
      , tasty-quickcheck, time
      }:
@@ -106716,6 +107181,24 @@ self: {
        homepage = "https://github.com/vincenthz/hs-hourglass";
        description = "simple performant time related library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hourglass" = callPackage
+    ({ mkDerivation, base, deepseq, mtl, old-locale, tasty, tasty-hunit
+     , tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "hourglass";
+       version = "0.2.10";
+       sha256 = "d553362d7a6f7df60d8ff99304aaad0995be81f9d302725ebe9441829a0f8d80";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
+         base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
+       ];
+       homepage = "https://github.com/vincenthz/hs-hourglass";
+       description = "simple performant time related library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hourglass-fuzzy-parsing" = callPackage
@@ -106830,8 +107313,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.9.0";
-       sha256 = "8f8f40556c84e949895c50253c2d84c758ac8d452921a6e3ddd5dd6daeadc8a2";
+       version = "0.9.1";
+       sha256 = "77ebb1ce3b6ab88582a22dcdcb3fd08bd7278e5024042ce909993f2fb033c6ee";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107083,13 +107566,13 @@ self: {
      }:
      mkDerivation {
        pname = "hpdft";
-       version = "0.1.0.1";
-       sha256 = "eef161524fb320b84fa9183c804a08bf2a3442308f226790f5b3f9c16055b5be";
+       version = "0.1.0.2";
+       sha256 = "fd302bfbb8e8632bb01d20b3232ca87006cda8c2e3ed3c33f9d0874b2f9662b7";
        libraryHaskellDepends = [
          base bytestring directory parsec text utf8-string zlib
        ];
        homepage = "https://github.com/k16shikano/hpdft";
-       description = "tools to poke pdf using haskell";
+       description = "A tool for looking through PDF file using Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -107795,8 +108278,8 @@ self: {
      }:
      mkDerivation {
        pname = "hs-duktape";
-       version = "0.1.1";
-       sha256 = "0fa193ba3ccd8e603fecf91624a2e02762f5f959370bfea829aecd245f4be906";
+       version = "0.1.2";
+       sha256 = "a735c4fd945bda52c72c2c82fbef3239c02d1897fc9ccc917f2b82917644dd23";
        libraryHaskellDepends = [
          aeson base bytestring text transformers unordered-containers vector
        ];
@@ -109053,8 +109536,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.6.3";
-       sha256 = "57e43ec24f607dee63ebf9655b30ceafe4c80967b88a5739da806a37633221ab";
+       version = "0.1.6.6";
+       sha256 = "9b4fa60291ad1e6f2d47ec2b90fd254a2df0224a346ad3099bf047d10526d523";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111513,8 +111996,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsqml";
-       version = "0.3.3.0";
-       sha256 = "bf4eb06cbc76386158786784c4c2e29f976758c8f1cc41372b040b1484400f54";
+       version = "0.3.4.0";
+       sha256 = "12a0e7dd484ee36b793cf20b3bd42efdba67dd85b7918b26917bc6f59c6f5c69";
        libraryHaskellDepends = [
          base containers filepath tagged text transformers
        ];
@@ -111523,7 +112006,6 @@ self: {
        testHaskellDepends = [
          base containers directory QuickCheck tagged text
        ];
-       jailbreak = true;
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
@@ -111604,8 +112086,8 @@ self: {
     ({ mkDerivation, base, hsqml, OpenGL, OpenGLRaw, text }:
      mkDerivation {
        pname = "hsqml-demo-samples";
-       version = "0.3.3.0";
-       sha256 = "4cf95f075e9f2283e4adb0785dc25b0d45d8d33de3ea28ec17194d6ed816531c";
+       version = "0.3.4.0";
+       sha256 = "225fa4100ae9842f014aff0b13b0e03e95947f81e7b5ea30f98c2c47be620279";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
@@ -111760,16 +112242,13 @@ self: {
      }) {};
 
   "hstats" = callPackage
-    ({ mkDerivation, base, haskell98 }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "hstats";
-       version = "0.3";
-       sha256 = "12266f4e5212f72826281346058c1667f28af8fdb5292aab4f115ca2e01b6013";
-       revision = "1";
-       editedCabalFile = "0dcd5745170aeea7a6970ad9042c1043cc073f4fe40403af5795af09f9a062bf";
-       libraryHaskellDepends = [ base haskell98 ];
-       jailbreak = true;
-       homepage = "http://github.com/unmarshal/hstats/";
+       version = "0.3.0.1";
+       sha256 = "3045b303073165a1a90bb369cd530012b625e3b7e4e815c14af9b4beecfa19a8";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/haas/hstats";
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113908,6 +114387,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "http-kinder" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, http-media, http-types, HUnit, QuickCheck, singletons
+     , tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck, text, time
+     , wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "http-kinder";
+       version = "0.2.0.0";
+       sha256 = "333a6e8bada98a8f027107aa10bff866b838f42bd2a0b10bed3702a17329fe26";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-media
+         http-types singletons text time
+       ];
+       testHaskellDepends = [
+         base HUnit QuickCheck tasty tasty-ant-xml tasty-hunit
+         tasty-quickcheck text wai wai-extra
+       ];
+       homepage = "http://github.com/tel/serv#readme";
+       description = "Generic kinds and types for working with HTTP";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "http-kit" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, hspec
      , http-types, QuickCheck, quickcheck-instances
@@ -114460,7 +114962,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http2" = callPackage
+  "http2_1_4_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
      , bytestring-builder, containers, directory, doctest, filepath
      , Glob, hex, hspec, psqueues, stm, text, unordered-containers
@@ -114488,6 +114990,37 @@ self: {
        ];
        description = "HTTP/2.0 library including frames and HPACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "http2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+     , bytestring-builder, containers, directory, doctest, filepath
+     , Glob, hex, hspec, psqueues, stm, text, unordered-containers
+     , vector, word8
+     }:
+     mkDerivation {
+       pname = "http2";
+       version = "1.5.1";
+       sha256 = "3beba1a59d5c533ef58c715a3b54a069b24f81170e80d662e6267a2ad218eb5d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring bytestring-builder containers psqueues stm
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty array base bytestring bytestring-builder
+         containers directory filepath hex text unordered-containers vector
+         word8
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty array base bytestring bytestring-builder
+         containers directory doctest filepath Glob hex hspec psqueues stm
+         text unordered-containers vector word8
+       ];
+       doCheck = false;
+       description = "HTTP/2.0 library including frames and HPACK";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "httpd-shed" = callPackage
@@ -115577,6 +116110,8 @@ self: {
        pname = "hxt-pickle-utils";
        version = "0.1.0.3";
        sha256 = "9ddba19f27d9d8c155012da4dd9598fb318cab862da10f14ee4bc3eb5321a9c5";
+       revision = "1";
+       editedCabalFile = "6e5b20a313d64274a19307afe4319e236b8547ef8e611ea1da54c945e41db099";
        libraryHaskellDepends = [ base hxt mtl ];
        homepage = "https://github.com/silkapp/hxt-pickle-utils";
        description = "Utility functions for using HXT picklers";
@@ -117449,8 +117984,8 @@ self: {
      }:
      mkDerivation {
        pname = "idris";
-       version = "0.10";
-       sha256 = "5593feca2cdd00ff819f37135da496111b3af06b664f4cd1f4aecba6ac6e6a10";
+       version = "0.10.2";
+       sha256 = "797f848d073b14772e20b13507272a2bf490644e005a978423c4bf057d021d19";
        configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
@@ -117467,7 +118002,10 @@ self: {
        executableHaskellDepends = [
          base directory filepath haskeline transformers
        ];
-       jailbreak = true;
+       testHaskellDepends = [
+         base containers directory filepath haskeline process time
+         transformers
+       ];
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
@@ -119397,8 +119935,8 @@ self: {
        pname = "instant-generics";
        version = "0.5";
        sha256 = "79d7cccead455f00637a182e0639cd7b8e6ef67e054d53098064772981dd8a9c";
-       revision = "1";
-       editedCabalFile = "c69a74fef28272e5e46a0e37711bb980ac07d2f3feeed3513da1cc572a1ab6bc";
+       revision = "2";
+       editedCabalFile = "c4a76fc7f7aebe8c003c9a80a127f627724d9444bd983bcacb2613d993295017";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
        description = "Generic programming library with a sum of products view";
@@ -120658,14 +121196,14 @@ self: {
     ({ mkDerivation, array, attoparsec, base, base64-bytestring
      , bytestring, config-value, connection, containers
      , data-default-class, deepseq, directory, filepath, free
-     , haskell-lexer, lens, network, old-locale, regex-tdfa, split, stm
-     , text, time, tls, transformers, vty, x509, x509-store, x509-system
+     , haskell-lexer, lens, network, regex-tdfa, split, stm, text, time
+     , tls, transformers, vty, x509, x509-store, x509-system
      , x509-validation
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "1.1.3";
-       sha256 = "62385b4372ea61aeb41b7e7bb808a89adf1bbbf4d9c7127a6eb019a8b75e7142";
+       version = "1.1.4";
+       sha256 = "2e2b60ec96966604d38860b58901bb2f652b801c3091c3dfeaf2d8ab745dcaa5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120675,8 +121213,8 @@ self: {
        executableHaskellDepends = [
          array base bytestring config-value connection containers
          data-default-class deepseq directory filepath haskell-lexer lens
-         network old-locale regex-tdfa split stm text time tls transformers
-         vty x509 x509-store x509-system x509-validation
+         network regex-tdfa split stm text time tls transformers vty x509
+         x509-store x509-system x509-validation
        ];
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
@@ -122339,7 +122877,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "js-jquery" = callPackage
+  "js-jquery_1_12_0" = callPackage
     ({ mkDerivation, base, HTTP }:
      mkDerivation {
        pname = "js-jquery";
@@ -122351,6 +122889,21 @@ self: {
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
        description = "Obtain minified jQuery code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "js-jquery" = callPackage
+    ({ mkDerivation, base, HTTP }:
+     mkDerivation {
+       pname = "js-jquery";
+       version = "1.12.1";
+       sha256 = "df723585d61ccf2bb00f6aa8942263f96e34c89a879898319314a37239e452a1";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base HTTP ];
+       doCheck = false;
+       homepage = "https://github.com/ndmitchell/js-jquery#readme";
+       description = "Obtain minified jQuery code";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "jsaddle" = callPackage
@@ -128326,28 +128879,29 @@ self: {
      }) {};
 
   "leksah" = callPackage
-    ({ mkDerivation, array, base, binary, binary-shared, blaze-html
-     , bytestring, Cabal, conduit, containers, cpphs, deepseq, directory
-     , executable-path, filepath, ghc, ghcjs-codemirror, ghcjs-dom, gio
-     , glib, gtk3, gtksourceview3, haskell-src-exts, hlint, hslogger
-     , jsaddle, leksah-server, lens, ltk, monad-loops, mtl, network
-     , network-uri, old-time, parsec, pretty, pretty-show, QuickCheck
-     , regex-base, regex-tdfa, regex-tdfa-text, shakespeare, stm, strict
-     , text, time, transformers, unix, utf8-string, vado, vcsgui
-     , vcswrapper, webkitgtk3, webkitgtk3-javascriptcore
+    ({ mkDerivation, array, base, base-compat, binary, binary-shared
+     , blaze-html, bytestring, Cabal, conduit, containers, cpphs
+     , deepseq, directory, executable-path, filepath, ghc
+     , ghcjs-codemirror, ghcjs-dom, gio, glib, gtk3, gtksourceview3
+     , haskell-src-exts, hlint, hslogger, jsaddle, leksah-server, lens
+     , ltk, monad-loops, mtl, network, network-uri, old-time, parsec
+     , pretty, pretty-show, QuickCheck, regex-base, regex-tdfa
+     , regex-tdfa-text, shakespeare, stm, strict, text, time
+     , transformers, unix, utf8-string, vado, vcsgui, vcswrapper
+     , webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.1.4";
-       sha256 = "85f60091febd593f996c90cb9fa0e2f2dd1bff1f18a443244be1111540ea30ad";
+       version = "0.15.2.0";
+       sha256 = "44be854eb7091fb383ddfbf497772d9a9b27c033a4e9ba9994c6a9b36d4e9606";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base binary binary-shared blaze-html bytestring Cabal conduit
-         containers cpphs deepseq directory executable-path filepath ghc
-         ghcjs-codemirror gio glib gtk3 gtksourceview3 haskell-src-exts
-         hlint hslogger jsaddle leksah-server lens ltk mtl network
-         network-uri old-time parsec pretty pretty-show QuickCheck
+         array base base-compat binary binary-shared blaze-html bytestring
+         Cabal conduit containers cpphs deepseq directory executable-path
+         filepath ghc ghcjs-codemirror gio glib gtk3 gtksourceview3
+         haskell-src-exts hlint hslogger jsaddle leksah-server lens ltk mtl
+         network network-uri old-time parsec pretty pretty-show QuickCheck
          regex-base regex-tdfa regex-tdfa-text shakespeare stm strict text
          time transformers unix utf8-string vado vcsgui vcswrapper
          webkitgtk3 webkitgtk3-javascriptcore
@@ -128361,45 +128915,43 @@ self: {
          leksah-server ltk monad-loops QuickCheck stm text transformers
          webkitgtk3
        ];
-       jailbreak = true;
        homepage = "http://www.leksah.org";
        description = "Haskell IDE written in Haskell";
        license = "GPL";
      }) {};
 
   "leksah-server" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-conduit, base
-     , bin-package-db, binary, binary-shared, bytestring, Cabal, conduit
-     , conduit-extra, containers, deepseq, directory, executable-path
-     , filepath, ghc, haddock-api, haddock-library, hslogger, HTTP
-     , HUnit, ltk, network, network-uri, parsec, pretty, process
-     , resourcet, strict, text, time, transformers, unix
+    ({ mkDerivation, attoparsec, base, bin-package-db, binary
+     , binary-shared, bytestring, Cabal, conduit, conduit-extra
+     , containers, deepseq, directory, executable-path, filepath, ghc
+     , haddock-api, haddock-library, hslogger, HTTP, HUnit, ltk, network
+     , network-uri, parsec, pretty, process, resourcet, strict, text
+     , time, transformers, unix
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.15.0.9";
-       sha256 = "78f2ee49b1a06fa12de242a35a9eeaaf3e8b90d7af8bffef3e1b20561826abe5";
+       version = "0.15.2.0";
+       sha256 = "62a6a781f60822273592f34b08da46afba214a337befb92764a08f54e2355241";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec attoparsec-conduit base bin-package-db binary
-         binary-shared bytestring Cabal conduit conduit-extra containers
-         deepseq directory executable-path filepath ghc haddock-api
-         haddock-library hslogger HTTP ltk network network-uri parsec pretty
-         process resourcet strict text time transformers unix
+         attoparsec base bin-package-db binary binary-shared bytestring
+         Cabal conduit conduit-extra containers deepseq directory
+         executable-path filepath ghc haddock-api haddock-library hslogger
+         HTTP ltk network network-uri parsec pretty process resourcet strict
+         text time transformers unix
        ];
        executableHaskellDepends = [
-         attoparsec attoparsec-conduit base bin-package-db binary
-         binary-shared bytestring Cabal conduit conduit-extra containers
-         deepseq directory executable-path filepath ghc haddock-api
-         haddock-library hslogger HTTP ltk network network-uri parsec pretty
-         process resourcet strict text time transformers unix
+         attoparsec base bin-package-db binary binary-shared bytestring
+         Cabal conduit conduit-extra containers deepseq directory
+         executable-path filepath ghc haddock-api haddock-library hslogger
+         HTTP ltk network network-uri parsec pretty process resourcet strict
+         text time transformers unix
        ];
        testHaskellDepends = [
          base conduit conduit-extra hslogger HUnit process resourcet
          transformers
        ];
-       jailbreak = true;
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
@@ -128573,7 +129125,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lens_4_13_2" = callPackage
+  "lens_4_13_2_1" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , comonad, containers, contravariant, deepseq, directory
      , distributive, doctest, exceptions, filepath, free
@@ -128586,8 +129138,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.13.2";
-       sha256 = "814b7b35949cc8a3ad1a35fc39b88fc3b78bbfb339097f3f3438627048155b78";
+       version = "4.13.2.1";
+       sha256 = "d48509a066f864c3c6a8944117e788bab80587d40b1799600c99da389ee249b6";
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -128986,7 +129538,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lentil" = callPackage
+  "lentil_0_1_9_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
      , filepath, hspec, natural-sort, optparse-applicative, parsec
      , regex-tdfa
@@ -129008,6 +129560,31 @@ self: {
        homepage = "http://www.ariis.it/static/articles/lentil/page.html";
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "lentil" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
+     , filepath, hspec, natural-sort, optparse-applicative, parsec
+     , regex-tdfa
+     }:
+     mkDerivation {
+       pname = "lentil";
+       version = "0.1.10.0";
+       sha256 = "caa32b2530415588e711df778394ea11f030a9829095013748b282c814cb1a25";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-wl-pprint base csv directory filemanip filepath natural-sort
+         optparse-applicative parsec regex-tdfa
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base csv directory filemanip filepath hspec
+         natural-sort optparse-applicative parsec regex-tdfa
+       ];
+       homepage = "http://www.ariis.it/static/articles/lentil/page.html";
+       description = "frugal issue tracker";
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "lenz" = callPackage
@@ -129541,12 +130118,12 @@ self: {
      }:
      mkDerivation {
        pname = "libjenkins";
-       version = "0.8.2";
-       sha256 = "206f7e82ee6496f408347dc0828aea8018b0e7269cae02fcfa7504c750f79ec9";
+       version = "0.8.3";
+       sha256 = "939379ae30f65d20d524d5735d6b6ec86b91ce295c64e089b1097161da1067cc";
        libraryHaskellDepends = [
          async attoparsec base bytestring conduit containers free
          http-client http-conduit http-types monad-control mtl network
-         network-uri profunctors resourcet text transformers
+         network-uri profunctors resourcet text
        ];
        testHaskellDepends = [
          async attoparsec base bytestring conduit containers directory
@@ -129902,6 +130479,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "libxls" = callPackage
+    ({ mkDerivation, base, bindings-DSL }:
+     mkDerivation {
+       pname = "libxls";
+       version = "0.2";
+       sha256 = "c6c1185ffd7981c459cd785b0ff3ad40b868a1d6cbf8eb8bd106ec2374aa740e";
+       libraryHaskellDepends = [ base bindings-DSL ];
+       description = "Bindings to libxls";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "libxml" = callPackage
     ({ mkDerivation, base, bytestring, libxml2, mtl }:
      mkDerivation {
@@ -131549,7 +132137,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "list-t" = callPackage
+  "list-t_0_4_6" = callPackage
     ({ mkDerivation, base-prelude, HTF, mmorph, monad-control, mtl
      , mtl-prelude, transformers, transformers-base
      }:
@@ -131566,6 +132154,26 @@ self: {
        homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "list-t" = callPackage
+    ({ mkDerivation, base-prelude, HTF, mmorph, monad-control, mtl
+     , mtl-prelude, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "list-t";
+       version = "0.4.6.1";
+       sha256 = "78c9cc7da0593571d4f0724df197ad23b467677573e1ac2714fd8fc6d7d1c00f";
+       libraryHaskellDepends = [
+         base-prelude mmorph monad-control mtl transformers
+         transformers-base
+       ];
+       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       doCheck = false;
+       homepage = "https://github.com/nikita-volkov/list-t";
+       description = "ListT done right";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "list-t-attoparsec" = callPackage
@@ -132771,7 +133379,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "logging-facade" = callPackage
+  "logging-facade_0_1_0" = callPackage
     ({ mkDerivation, base, hspec, template-haskell, transformers }:
      mkDerivation {
        pname = "logging-facade";
@@ -132781,6 +133389,19 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Simple logging abstraction that allows multiple back-ends";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "logging-facade" = callPackage
+    ({ mkDerivation, base, hspec, template-haskell, transformers }:
+     mkDerivation {
+       pname = "logging-facade";
+       version = "0.1.1";
+       sha256 = "60f9f29d54e9756825400f281101872ed87de55271e87571068838a7b3d98da2";
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [ base hspec ];
+       description = "Simple logging abstraction that allows multiple back-ends";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "logging-facade-journald" = callPackage
@@ -132872,8 +133493,8 @@ self: {
     ({ mkDerivation, base, logict, mtl, transformers }:
      mkDerivation {
        pname = "logict-state";
-       version = "0.1.0.0";
-       sha256 = "8b4ac063ffada947bfb853c5a4f9e144ad7aba0dbc1e3be3d662a83c19450ad8";
+       version = "0.1.0.1";
+       sha256 = "0d312387a11fab6441258732cfcb59bd12ac72471fd1379877f6da1928c60cbe";
        libraryHaskellDepends = [ base logict mtl transformers ];
        homepage = "https://github.com/atzedijkstra/logict-state";
        description = "Library for logic programming based on haskell package logict";
@@ -133436,8 +134057,8 @@ self: {
      }:
      mkDerivation {
        pname = "ltk";
-       version = "0.15.0.4";
-       sha256 = "6d39540a1aa73516d9390d8d49f1f9b8ec5f9cf15bede8cd51a25810ec345193";
+       version = "0.15.0.5";
+       sha256 = "44101ce43336e9746e295c14beda5cae1d2d4a9c67ca7d5ed1d51a90b3d8d1a2";
        libraryHaskellDepends = [
          base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
          transformers
@@ -133784,8 +134405,8 @@ self: {
      }:
      mkDerivation {
        pname = "luminance";
-       version = "0.10.0.2";
-       sha256 = "1892608cde96e81a748c608118f380e8b125f3653af1d743a9ee6ee9a8adb46e";
+       version = "0.11";
+       sha256 = "d29c8b29daba5fc5f563cac7c1ac32f876338ff62f3012bc18ed966d35a36378";
        libraryHaskellDepends = [
          base containers contravariant dlist gl linear mtl resourcet
          semigroups transformers vector void
@@ -133843,8 +134464,8 @@ self: {
      }:
      mkDerivation {
        pname = "luminance-samples";
-       version = "0.10";
-       sha256 = "c3f0fec69567be8d32c7a913c4dd9241908666447bfc492cdd24810d4b245d2a";
+       version = "0.11";
+       sha256 = "78fbff7bd81b35cbfd8a66d3cb1e88fe3598266cfb3ab9364af6b77f8f2e78f9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -136844,7 +137465,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "megaparsec" = callPackage
+  "megaparsec_4_3_0" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, mtl, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , text, transformers
@@ -136863,9 +137484,10 @@ self: {
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "megaparsec_4_4_0" = callPackage
+  "megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, fail, HUnit, mtl, QuickCheck
      , semigroups, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, transformers
@@ -136881,11 +137503,9 @@ self: {
          base HUnit mtl QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meldable-heap" = callPackage
@@ -136929,10 +137549,8 @@ self: {
      }:
      mkDerivation {
        pname = "memcache";
-       version = "0.1.0.0";
-       sha256 = "a592a3c154c8d64fb0e4335d13e8362e75a53fe3bbea8cc44f57802a00e254f4";
-       revision = "1";
-       editedCabalFile = "6e2508fa18aae99fee1c0aa41cc86e97d73ff504647b5265e54adf3566ca81e7";
+       version = "0.1.0.1";
+       sha256 = "d5394f0c6beaa8fff82de230c751d930426cce49a53bff841adc09c6c382140a";
        libraryHaskellDepends = [
          base binary blaze-builder bytestring hashable network resource-pool
          time vector vector-algorithms
@@ -138024,8 +138642,8 @@ self: {
      }:
      mkDerivation {
        pname = "mida";
-       version = "1.0.0";
-       sha256 = "3fff0b1ce7fcbe948b7ec3f20868cdd7f8737c7eec1355355e0a13bb2fb340e4";
+       version = "1.0.1";
+       sha256 = "97e76f04d0bad25eefc19fdb7df6f53ce351918fc52815bf9a163417b730b859";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142739,8 +143357,8 @@ self: {
      }:
      mkDerivation {
        pname = "multiaddr";
-       version = "0.2.0";
-       sha256 = "fd8537d3598b92cd662efe6a41554aa88e8bb8f74fff6c1be1df65745d66c46d";
+       version = "0.3.0";
+       sha256 = "0ac61e1b1cf1fc03c371f03481952ef5851d7843c9a7a5a0b182f12fc72cca4c";
        libraryHaskellDepends = [
          attoparsec base base58-bytestring bytestring cereal errors hashable
          text
@@ -143717,6 +144335,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        jailbreak = true;
+       doCheck = false;
        homepage = "https://github.com/bos/mwc-random";
        description = "Fast, high quality pseudo random number generation";
        license = stdenv.lib.licenses.bsd3;
@@ -143740,13 +144359,14 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        jailbreak = true;
+       doCheck = false;
        homepage = "https://github.com/bos/mwc-random";
        description = "Fast, high quality pseudo random number generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mwc-random" = callPackage
+  "mwc-random_0_13_3_2" = callPackage
     ({ mkDerivation, base, HUnit, primitive, QuickCheck, statistics
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , time, vector
@@ -143760,12 +144380,14 @@ self: {
          base HUnit QuickCheck statistics test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
+       doCheck = false;
        homepage = "https://github.com/bos/mwc-random";
        description = "Fast, high quality pseudo random number generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mwc-random_0_13_4_0" = callPackage
+  "mwc-random" = callPackage
     ({ mkDerivation, base, HUnit, primitive, QuickCheck, statistics
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , time, vector
@@ -143779,10 +144401,10 @@ self: {
          base HUnit QuickCheck statistics test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
+       doCheck = false;
        homepage = "https://github.com/bos/mwc-random";
        description = "Fast, high quality pseudo random number generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-random-monad" = callPackage
@@ -146578,6 +147200,7 @@ self: {
          base network network-transport network-transport-tests
        ];
        doHaddock = false;
+       jailbreak = true;
        doCheck = false;
        homepage = "http://haskell-distributed.github.com";
        description = "TCP instantiation of Network.Transport";
@@ -146585,7 +147208,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "network-transport-tcp" = callPackage
+  "network-transport-tcp_0_4_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , network, network-transport, network-transport-tests
      }:
@@ -146599,13 +147222,15 @@ self: {
        testHaskellDepends = [
          base network network-transport network-transport-tests
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://haskell-distributed.github.com";
        description = "TCP instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "network-transport-tcp_0_5_1" = callPackage
+  "network-transport-tcp" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , network, network-transport, network-transport-tests
      }:
@@ -146619,10 +147244,10 @@ self: {
        testHaskellDepends = [
          base network network-transport network-transport-tests
        ];
+       doCheck = false;
        homepage = "http://haskell-distributed.github.com";
        description = "TCP instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-transport-tests_0_2_1_0" = callPackage
@@ -147141,6 +147766,18 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "nist-beacon" = callPackage
+    ({ mkDerivation, base, bytestring, http-conduit, xml }:
+     mkDerivation {
+       pname = "nist-beacon";
+       version = "0.1.0.1";
+       sha256 = "00aeb52bcda5e0f3cd3519857d96af3697ca45cee87ee3cc7b521a282f4579e4";
+       libraryHaskellDepends = [ base bytestring http-conduit xml ];
+       homepage = "https://github.com/bstamour/haskell-nist-beacon";
+       description = "Haskell interface to the nist random beacon";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nitro" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -148424,24 +149061,25 @@ self: {
      }) {};
 
   "octane" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
+    ({ mkDerivation, base, binary, binary-bits, bytestring, containers
      , data-binary-ieee754, deepseq, tasty, tasty-hspec, text
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.4.0";
-       sha256 = "577f5a867e6ae3eabf00a77661bba48f5386908734728fc91e24d01e9fdd83d0";
+       version = "0.4.1";
+       sha256 = "52792d83198460ebf8de89cbd2b6d0519708a7358c936b09c0b698886d7e5496";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary bytestring containers data-binary-ieee754 deepseq text
+         base binary binary-bits bytestring containers data-binary-ieee754
+         deepseq text
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base binary bytestring containers tasty tasty-hspec
+         base binary binary-bits bytestring containers tasty tasty-hspec
        ];
-       homepage = "https://github.com/tfausak/octane";
-       description = "A Rocket League replay parser";
+       homepage = "https://github.com/tfausak/octane#readme";
+       description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -148520,6 +149158,22 @@ self: {
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; 
          inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;};
 
+  "oden-go-packages" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "oden-go-packages";
+       version = "0.1.0.3";
+       sha256 = "88d777451618822e9d754983da4a93705077a9136aba10187ca4e457e36e1989";
+       libraryHaskellDepends = [
+         aeson base bytestring containers text unordered-containers
+       ];
+       homepage = "http://oden-lang.org";
+       description = "Provides Go package metadata";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "oeis" = callPackage
     ({ mkDerivation, base, HTTP, HUnit, network, network-uri
      , test-framework, test-framework-hunit
@@ -148591,8 +149245,8 @@ self: {
     ({ mkDerivation, base, comonad, directory, filepath, parallel }:
      mkDerivation {
        pname = "oi";
-       version = "0.4.0";
-       sha256 = "2757014767b21d1938d8acaa4742514457482aa52c47b5fea4ba9e72ea810e32";
+       version = "0.4.0.1";
+       sha256 = "b010502da66dbefca57630b05cfe5827363ec2a79c2da634027213bb2b760e3d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -149098,8 +149752,8 @@ self: {
        pname = "opaleye";
        version = "0.4.2.0";
        sha256 = "b924c4d0fa7151c0dbaee5ddcd89adfa569614204a805392625752ea6dc13c20";
-       revision = "2";
-       editedCabalFile = "bf554e82c1ac3c72f9df13494052197f0e8f131d0f44487073443a180c51395a";
+       revision = "3";
+       editedCabalFile = "2d6a584a46565934f8408c72aaa3cd469d190799b8d071775b7190326c4c9e5e";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -149179,6 +149833,7 @@ self: {
        executableHaskellDepends = [
          base opaleye postgresql-simple product-profunctors
        ];
+       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "A monad transformer for Opaleye";
        license = stdenv.lib.licenses.bsd3;
@@ -149913,7 +150568,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "opml-conduit" = callPackage
+  "opml-conduit_0_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, conduit
      , conduit-combinators, conduit-parse, containers, data-default
      , exceptions, foldl, hlint, lens-simple, mono-traversable
@@ -149940,6 +150595,38 @@ self: {
          uri-bytestring xml-conduit-parse
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
+       description = "Streaming parser/renderer for the OPML 2.0 format.";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "opml-conduit" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, conduit
+     , conduit-combinators, conduit-parse, containers, data-default
+     , exceptions, foldl, hlint, lens-simple, mono-traversable
+     , monoid-subclasses, mtl, parsers, QuickCheck, quickcheck-instances
+     , resourcet, semigroups, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, timerep, uri-bytestring, xml-conduit, xml-conduit-parse
+     , xml-types
+     }:
+     mkDerivation {
+       pname = "opml-conduit";
+       version = "0.5.0.0";
+       sha256 = "de0792b940ff5337b0912842a51478a8bdb030bf916d9b97236a1253b89866a9";
+       libraryHaskellDepends = [
+         base case-insensitive conduit conduit-parse containers exceptions
+         foldl lens-simple mono-traversable monoid-subclasses parsers
+         semigroups text time timerep uri-bytestring xml-conduit
+         xml-conduit-parse xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators conduit-parse
+         containers data-default exceptions hlint lens-simple
+         mono-traversable mtl parsers QuickCheck quickcheck-instances
+         resourcet semigroups tasty tasty-hunit tasty-quickcheck text time
+         uri-bytestring xml-conduit-parse
+       ];
+       homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150222,6 +150909,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "optparse-generic" = callPackage
+    ({ mkDerivation, base, optparse-applicative, system-filepath, text
+     , transformers, void
+     }:
+     mkDerivation {
+       pname = "optparse-generic";
+       version = "1.0.0";
+       sha256 = "6e049b88706c35dca3d4b021fae26c664d46ef888a910647f269b851b3a59053";
+       libraryHaskellDepends = [
+         base optparse-applicative system-filepath text transformers void
+       ];
+       description = "Auto-generate a command-line parser for your datatype";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "optparse-simple_0_0_2" = callPackage
     ({ mkDerivation, base, either, gitrev, optparse-applicative
      , template-haskell, transformers
@@ -151842,8 +152544,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc-preamble";
-       version = "1.0.0";
-       sha256 = "1afb34f7aa93a22ab389ae934259a4bcc408708ee74676001eb6c89d5eef7be9";
+       version = "1.1.0";
+       sha256 = "2200bed5ca32cb6fd74b53dec3e913c0298ada8434154f97c34991a1e9fe568f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -153297,6 +153999,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path-io_1_0_1" = callPackage
+    ({ mkDerivation, base, directory, exceptions, filepath, hspec, path
+     , temporary, time, transformers
+     }:
+     mkDerivation {
+       pname = "path-io";
+       version = "1.0.1";
+       sha256 = "92e4763c88c21d46d009baedb14eb724699b583bc6675b4513bb35186f421336";
+       libraryHaskellDepends = [
+         base directory exceptions filepath path temporary time transformers
+       ];
+       testHaskellDepends = [ base exceptions hspec path ];
+       jailbreak = true;
+       homepage = "https://github.com/mrkkrp/path-io";
+       description = "Interface to ‘directory’ package for users of ‘path’";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "path-pieces_0_1_4" = callPackage
     ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
      mkDerivation {
@@ -156974,8 +157695,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinchot";
-       version = "0.10.0.0";
-       sha256 = "59a9e3b5e5eb323b11fba24d90d7f371e22653d46bf7a31b9676220a0e78a797";
+       version = "0.12.0.0";
+       sha256 = "5fbbb77f122dbb51fac0004b607b486e317df08b17dfcaccb8dd7d300f4980de";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -157364,7 +158085,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pipes-cacophony" = callPackage
+  "pipes-bzip" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib, pipes, pipes-bytestring
+     }:
+     mkDerivation {
+       pname = "pipes-bzip";
+       version = "0.1.0.0";
+       sha256 = "c294c8bad74a68a4cc31d613c9d6e0fd1ee4e57f6b69567f9760bf2ce1291c0d";
+       libraryHaskellDepends = [
+         base bytestring bzlib pipes pipes-bytestring
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/chemist/pipes-bzip#readme";
+       description = "Bzip2 compression and decompression for Pipes streams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "pipes-cacophony_0_1_3" = callPackage
     ({ mkDerivation, async, base, bytestring, cacophony, hlint, mtl
      , pipes, QuickCheck, tasty, tasty-quickcheck
      }:
@@ -157382,6 +158119,22 @@ self: {
        homepage = "https://github.com/centromere/pipes-cacophony";
        description = "Pipes for Noise-secured network connections";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pipes-cacophony" = callPackage
+    ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }:
+     mkDerivation {
+       pname = "pipes-cacophony";
+       version = "0.2.0";
+       sha256 = "1e6e6469df152cd540c4cee20cb5e82975f6c069a35931a0ebfc4bd3b5fb53be";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring cacophony pipes ];
+       testHaskellDepends = [ base hlint ];
+       homepage = "https://github.com/centromere/pipes-cacophony";
+       description = "Pipes for Noise-secured network connections";
+       license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "pipes-cellular" = callPackage
@@ -157753,6 +158506,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-key-value-csv" = callPackage
+    ({ mkDerivation, base, containers, contravariant
+     , data-default-class, lens, mtl, pipes, pipes-bytestring
+     , pipes-group, pipes-parse, pipes-safe, pipes-text, QuickCheck
+     , reflection, text, transformers, validation, vinyl, vinyl-utils
+     }:
+     mkDerivation {
+       pname = "pipes-key-value-csv";
+       version = "0.0.0.0";
+       sha256 = "5a6f09f41031bd66ceca26fed08c51784610b1c586d064a0e76d83cf8dd780c5";
+       libraryHaskellDepends = [
+         base containers data-default-class lens mtl pipes pipes-bytestring
+         pipes-group pipes-parse pipes-safe pipes-text reflection text
+         validation vinyl vinyl-utils
+       ];
+       testHaskellDepends = [
+         base contravariant data-default-class lens pipes pipes-text
+         QuickCheck reflection text transformers validation vinyl
+         vinyl-utils
+       ];
+       homepage = "https://github.com/marcinmrotek/key-value-csv";
+       description = "Streaming processing of CSV files preceded by key-value pairs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-mongodb" = callPackage
     ({ mkDerivation, base, monad-control, mongoDB, pipes, text }:
      mkDerivation {
@@ -158362,6 +159140,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "plan-b_0_2_0" = callPackage
+    ({ mkDerivation, base, exceptions, hspec, path, path-io
+     , transformers
+     }:
+     mkDerivation {
+       pname = "plan-b";
+       version = "0.2.0";
+       sha256 = "f1654b249a0ee36a5a6ed1a85d2ab4641405d9b28ebe57ded594b7c65180c769";
+       libraryHaskellDepends = [
+         base exceptions path path-io transformers
+       ];
+       testHaskellDepends = [ base hspec path path-io ];
+       jailbreak = true;
+       homepage = "https://github.com/mrkkrp/plan-b";
+       description = "Failure-tolerant file and directory editing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "planar-graph" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , containers, data-clist, deepseq
@@ -161352,6 +162149,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "pretty-compact_2_0" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "pretty-compact";
+       version = "2.0";
+       sha256 = "13b00817990086961672dc73818aa89bb9690a2ea0866399990f97b088e8de26";
+       libraryHaskellDepends = [ base containers ];
+       description = "Pretty-printing library";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pretty-error" = callPackage
     ({ mkDerivation, base, basic-prelude, bytestring, pretty-show }:
      mkDerivation {
@@ -162198,7 +163007,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "product-profunctors" = callPackage
+  "product-profunctors_0_6_3_1" = callPackage
     ({ mkDerivation, base, contravariant, profunctors, template-haskell
      }:
      mkDerivation {
@@ -162214,6 +163023,23 @@ self: {
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "product-profunctors" = callPackage
+    ({ mkDerivation, base, contravariant, profunctors, template-haskell
+     }:
+     mkDerivation {
+       pname = "product-profunctors";
+       version = "0.7.0.2";
+       sha256 = "3b74f8e72f5ed924802fe197e4688c1f96c52d58fb84bf40a31d9a56bd8846c1";
+       libraryHaskellDepends = [
+         base contravariant profunctors template-haskell
+       ];
+       testHaskellDepends = [ base profunctors ];
+       homepage = "https://github.com/tomjaguarpaw/product-profunctors";
+       description = "product-profunctors";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "prof2dot" = callPackage
@@ -162697,8 +163523,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.15.4";
-       sha256 = "1113810f1cd23c8d84b61bdd783359ec51000d030b6c25892548447f1e0edeb5";
+       version = "2.16.0";
+       sha256 = "d3779d3b521f7cbf015352a974f66d85f67a652a7a5d6c4b8819a6e9d77d5ee7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -163402,8 +164228,8 @@ self: {
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20160209";
-       sha256 = "60d856fc6d6d82ff96d742e253ecf638f625c4693b7d8be250501e9f334a2246";
+       version = "0.20160223";
+       sha256 = "7e14ff029a010b45aebb8343559df27640ea123ac15fca6d7eff28ef273f9ab0";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -166190,6 +167016,7 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
+       doCheck = false;
        homepage = "http://haskell-distributed.github.com";
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
@@ -166343,6 +167170,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ratel" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, http-client, http-client-tls, http-types, tasty
+     , tasty-hspec, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "0.1.0";
+       sha256 = "f8e5fb6d8cf3840b67bde9ceda4768405f50dcc3c1f60b003ae42332ffc6f735";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       homepage = "https://github.com/tfausak/ratel#readme";
+       description = "Notify Honeybadger about exceptions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "ratel-wai" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-client, ratel, wai
+     }:
+     mkDerivation {
+       pname = "ratel-wai";
+       version = "0.1.0";
+       sha256 = "3047004b1953bd0a7d1132144fd1aa13870ed9736c965ebf1b4f706e3202b429";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-client ratel wai
+       ];
+       homepage = "https://github.com/tfausak/ratel-wai#readme";
+       description = "Notify Honeybadger about exceptions via a WAI middleware";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ratio-int" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -168931,8 +169793,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.8.0.5";
-       sha256 = "1dae8b11ade66c4be1f1755fdef7483ba569f1eb900176cd96bc48d1f904cbd7";
+       version = "0.8.1.0";
+       sha256 = "9b84f39179751df082ad6706f388aa6cb340f000b6a01f8fae11138f9527fa62";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -169217,14 +170079,14 @@ self: {
      }) {};
 
   "renderable" = callPackage
-    ({ mkDerivation, base, containers, hashable }:
+    ({ mkDerivation, base, containers, hashable, transformers }:
      mkDerivation {
        pname = "renderable";
-       version = "0.1.0.0";
-       sha256 = "ca6b9f6b724b5e94b3d01d0848dbbbb7e8084ed5e0701a32c38ea08b02b45df5";
-       libraryHaskellDepends = [ base containers hashable ];
-       homepage = "http://zyghost.com";
-       description = "Provides a nice API for rendering data types that change over time";
+       version = "0.2.0.0";
+       sha256 = "8ba7f9e6f0cb9aa0b9b7e38b0280b41191d3f0303c94f44d40d60a6fca0c18f3";
+       libraryHaskellDepends = [ base containers hashable transformers ];
+       homepage = "https://github.com/schell/renderable";
+       description = "An API for managing renderable resources";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -172608,8 +173470,8 @@ self: {
      }:
      mkDerivation {
        pname = "roller";
-       version = "0.1.6";
-       sha256 = "47d5308161cf067474f8e65f73ad7292a777d4749f5132dd92daf3d7fb43bdb3";
+       version = "0.1.7";
+       sha256 = "eab7c05dd749e4953ef50ef12163ad36eba5aa131b7f9a340104de8afb40f193";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -176169,8 +177031,8 @@ self: {
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.10.0.2";
-       sha256 = "9a0a8851a4d12e2d7b1f84bb7af19a9118c206c24b65d06500f10ea718e88828";
+       version = "0.10.0.4";
+       sha256 = "00c5774b711f76530be05bd757249e944e61bda8292d10ee3ec463b9423ef801";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring binary BoundedChan bytestring
          clock conduit containers deepseq exceptions hashable hashtables
@@ -176183,7 +177045,7 @@ self: {
          lens network network-uri stm text transformers unordered-containers
        ];
        testToolDepends = [ cpphs ];
-       doCheck = false;
+       jailbreak = true;
        homepage = "https://www.httptwo.com/second-transfer/";
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
@@ -177262,28 +178124,41 @@ self: {
      }) {};
 
   "serv" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, http-media, http-types, HUnit, mtl, QuickCheck
-     , tagged, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck, text
-     , time, transformers, wai, wai-extra, warp
-     }:
+    ({ mkDerivation, base, containers, http-kinder, singletons, text }:
      mkDerivation {
        pname = "serv";
-       version = "0.1.0.0";
-       sha256 = "29d8124bcd00ae8ed28a37b6b7bcffa333cf4c30b845c9da725c71153274b371";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.0.0";
+       sha256 = "f2d67e80baba2120a7df88ca40d62705b60798214439a235947bce4c3ce783cf";
        libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-media
-         http-types mtl tagged text time transformers wai
+         base containers http-kinder singletons text
+       ];
+       homepage = "http://github.com/tel/serv#readme";
+       description = "Dependently typed API framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "serv-wai" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, http-kinder, http-media, http-types, HUnit, mmorph
+     , mtl, QuickCheck, serv, singletons, tagged, tasty, tasty-ant-xml
+     , tasty-hunit, tasty-quickcheck, text, time, transformers, vinyl
+     , wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "serv-wai";
+       version = "0.2.0.0";
+       sha256 = "fc3eb3411239e2c88d79e8f2a709081dd6b5568c95233045c24213bb953cc7b2";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-kinder
+         http-media http-types mmorph mtl serv singletons tagged text time
+         transformers vinyl wai
        ];
-       executableHaskellDepends = [ base text wai warp ];
        testHaskellDepends = [
-         base HUnit QuickCheck tasty tasty-ant-xml tasty-hunit
+         base HUnit QuickCheck serv tasty tasty-ant-xml tasty-hunit
          tasty-quickcheck text wai wai-extra
        ];
        homepage = "http://github.com/tel/serv#readme";
-       description = "Dependently typed API server framework";
+       description = "Dependently typed API servers with Serv";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -178874,7 +179749,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "set-extra" = callPackage
+  "set-extra_1_3_2" = callPackage
     ({ mkDerivation, base, containers, mtl, syb }:
      mkDerivation {
        pname = "set-extra";
@@ -178884,6 +179759,19 @@ self: {
        homepage = "https://github.com/ddssff/set-extra";
        description = "Functions that could be added to Data.Set";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "set-extra" = callPackage
+    ({ mkDerivation, base, containers, mtl, syb }:
+     mkDerivation {
+       pname = "set-extra";
+       version = "1.4";
+       sha256 = "29dbee21b011f259abbe6f3ee7cf65fd58c8b79ff5568bc6b09e613f45bc9733";
+       libraryHaskellDepends = [ base containers mtl syb ];
+       homepage = "https://github.com/ddssff/set-extra";
+       description = "Functions that could be added to Data.Set.";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "set-monad" = callPackage
@@ -185218,6 +186106,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "socketson" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
+     , crypto-api, data-default, DRBG, either, errors, http-types
+     , leveldb-haskell, lifted-base, mtl, network, text, transformers
+     , transformers-base, wai, wai-websockets, warp, websockets
+     }:
+     mkDerivation {
+       pname = "socketson";
+       version = "0.1.0.0";
+       sha256 = "7cff6662c11878b3e7a1f6cf7706534aee954a6504fa37da399d7c01ed76293c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cereal crypto-api
+         data-default DRBG either errors http-types leveldb-haskell
+         lifted-base mtl text transformers transformers-base wai
+         wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring either network text websockets
+       ];
+       homepage = "https://github.com/aphorisme/socketson";
+       description = "A small websocket backend provider";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "socks" = callPackage
     ({ mkDerivation, base, bytestring, cereal, network }:
      mkDerivation {
@@ -187641,7 +188555,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
-  "stack_1_0_4" = callPackage
+  "stack_1_0_4_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base
      , base16-bytestring, base64-bytestring, binary, binary-tagged
      , blaze-builder, byteable, bytestring, Cabal, conduit
@@ -187661,8 +188575,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.0.4";
-       sha256 = "f252c2f916b48d4b32722e2a4f3069ef55ac80454552316ce2dde0c5d486d85f";
+       version = "1.0.4.1";
+       sha256 = "660ce0c2126ddf2bb8c88a7b857571781dd09ac1953a3437522e123830dc537a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -198408,16 +199322,17 @@ self: {
   "th-typegraph" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
      , data-default, deepseq, ghc-prim, haskell-src-exts, hspec
-     , hspec-core, lens, mtl, mtl-unleashed, set-extra, syb
+     , hspec-core, lens, mtl, mtl-unleashed, pretty, set-extra, syb
      , template-haskell, text, th-desugar, th-orphans, th-reify-many
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "0.32";
-       sha256 = "a01b758d99f95fa012c8266bb3c083a77c022a95fc86bdfcde493888e4bea3c5";
+       version = "0.33.1";
+       sha256 = "4b9ba6823398c2ce042728c0358e670533ba146bfd7c5e72019069da1c594080";
        libraryHaskellDepends = [
          base base-compat containers data-default haskell-src-exts lens mtl
-         mtl-unleashed set-extra syb template-haskell th-desugar th-orphans
+         mtl-unleashed pretty set-extra syb template-haskell th-desugar
+         th-orphans
        ];
        testHaskellDepends = [
          array base bytestring containers data-default deepseq ghc-prim
@@ -202311,6 +203226,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle-options" = callPackage
+    ({ mkDerivation, base, optional-args, parsec, text, turtle }:
+     mkDerivation {
+       pname = "turtle-options";
+       version = "0.1.0.2";
+       sha256 = "6c1b02d67663d8849aa41c0e54ef824e013abbd6e89c71fb14c34aeb6434c8fd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base optional-args parsec text turtle ];
+       executableHaskellDepends = [ base turtle ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/githubuser/turtle-options#readme";
+       description = "Collection of command line options and parsers for these options";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tweak" = callPackage
     ({ mkDerivation, base, containers, lens, stm, transformers }:
      mkDerivation {
@@ -202896,8 +203827,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "ty";
-       version = "0.1.6";
-       sha256 = "1e4a77501ba2d11491de3c705f0f2e1bc3667f369dfc921f3ebf193792602844";
+       version = "0.1.7";
+       sha256 = "b546372bccf07824e58d71cf0cb3aeae62a1e588ce1f59049fb36e8053a6c95a";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/conal/ty";
        description = "Typed type representations and equality proofs";
@@ -205620,7 +206551,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "uri-bytestring" = callPackage
+  "uri-bytestring_0_1_9_2" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , derive, HUnit, lens, QuickCheck, quickcheck-instances, semigroups
      , tasty, tasty-hunit, tasty-quickcheck
@@ -205640,6 +206571,29 @@ self: {
        homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "uri-bytestring" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , derive, HUnit, lens-simple, QuickCheck, quickcheck-instances
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "uri-bytestring";
+       version = "0.2.0.0";
+       sha256 = "68089d1a35e60fade81520741b043f1d72b209c57e56a2fc197d31cf87cd5623";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring
+       ];
+       testHaskellDepends = [
+         attoparsec base blaze-builder bytestring derive HUnit lens-simple
+         QuickCheck quickcheck-instances semigroups tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/Soostone/uri-bytestring";
+       description = "Haskell URI parsing as ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "uri-conduit" = callPackage
@@ -206056,7 +207010,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "userid" = callPackage
+  "userid_0_1_2_4" = callPackage
     ({ mkDerivation, aeson, base, boomerang, lens, safecopy, web-routes
      , web-routes-th
      }:
@@ -206070,6 +207024,23 @@ self: {
        homepage = "http://www.github.com/Happstack/userid";
        description = "The UserId type and useful instances for web development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "userid" = callPackage
+    ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "userid";
+       version = "0.1.2.5";
+       sha256 = "1dd22293a0cd3f3ed06ce87b1160647c5bc143ca0b2be5465395eb2c1efca26c";
+       libraryHaskellDepends = [
+         aeson base boomerang safecopy web-routes web-routes-th
+       ];
+       homepage = "http://www.github.com/Happstack/userid";
+       description = "The UserId type and useful instances for web development";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "users_0_1_0_0" = callPackage
@@ -206100,7 +207071,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "users" = callPackage
+  "users_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }:
      mkDerivation {
        pname = "users";
@@ -206112,6 +207083,21 @@ self: {
        homepage = "https://github.com/agrafix/users";
        description = "A library simplifying user management for web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "users" = callPackage
+    ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }:
+     mkDerivation {
+       pname = "users";
+       version = "0.5.0.0";
+       sha256 = "6761ac937b0d4c13c5158239a0c51199c394facb72cc734ada90a391f01e53d4";
+       libraryHaskellDepends = [
+         aeson base bcrypt path-pieces text time
+       ];
+       homepage = "https://github.com/agrafix/users";
+       description = "A library simplifying user management for web applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "users-persistent_0_3_0_0" = callPackage
@@ -206137,7 +207123,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "users-persistent" = callPackage
+  "users-persistent_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, monad-logger, mtl
      , persistent, persistent-sqlite, persistent-template, temporary
      , text, time, transformers, users, users-test, uuid
@@ -206157,6 +207143,28 @@ self: {
        homepage = "https://github.com/agrafix/users";
        description = "A persistent backend for the users package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "users-persistent" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, monad-logger, mtl
+     , persistent, persistent-sqlite, persistent-template, temporary
+     , text, time, transformers, users, users-test, uuid
+     }:
+     mkDerivation {
+       pname = "users-persistent";
+       version = "0.5.0.1";
+       sha256 = "59107ccbc443ecc37f8539eca28c0717a45d902bf07f47fddadc704a0c701ba2";
+       libraryHaskellDepends = [
+         base bytestring mtl persistent persistent-template text time
+         transformers users uuid
+       ];
+       testHaskellDepends = [
+         base hspec monad-logger persistent-sqlite temporary text users-test
+       ];
+       homepage = "https://github.com/agrafix/users";
+       description = "A persistent backend for the users package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "users-postgresql-simple_0_1_0_1" = callPackage
@@ -206197,7 +207205,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "users-postgresql-simple" = callPackage
+  "users-postgresql-simple_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, mtl
      , postgresql-simple, text, time, users, users-test, uuid
      }:
@@ -206213,6 +207221,25 @@ self: {
        homepage = "https://github.com/agrafix/users";
        description = "A PostgreSQL backend for the users package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "users-postgresql-simple" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, mtl, postgresql-simple
+     , text, time, users, users-test, uuid
+     }:
+     mkDerivation {
+       pname = "users-postgresql-simple";
+       version = "0.5.0.1";
+       sha256 = "bac279ce4e93c71581e9aa890170d5acea262b1c4fddb8b5c7df5ea9807d9905";
+       libraryHaskellDepends = [
+         base bytestring mtl postgresql-simple text time users uuid
+       ];
+       testHaskellDepends = [ base hspec postgresql-simple users-test ];
+       doCheck = false;
+       homepage = "https://github.com/agrafix/users";
+       description = "A PostgreSQL backend for the users package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "users-test_0_1_0_0" = callPackage
@@ -206241,7 +207268,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "users-test" = callPackage
+  "users-test_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, hspec, text, users }:
      mkDerivation {
        pname = "users-test";
@@ -206251,6 +207278,19 @@ self: {
        homepage = "https://github.com/agrafix/users";
        description = "Library to test backends for the users library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "users-test" = callPackage
+    ({ mkDerivation, base, hspec, text, users }:
+     mkDerivation {
+       pname = "users-test";
+       version = "0.5.0.0";
+       sha256 = "d3cee7db30b5fe19ca4d822f5f03484eda82090a5060ef6493befe0324d15643";
+       libraryHaskellDepends = [ base hspec text users ];
+       homepage = "https://github.com/agrafix/users";
+       description = "Library to test backends for the users library";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "utc" = callPackage
@@ -208441,7 +209481,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vinyl" = callPackage
+  "vinyl_0_5_1" = callPackage
     ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }:
      mkDerivation {
        pname = "vinyl";
@@ -208453,6 +209493,19 @@ self: {
        testHaskellDepends = [ base doctest lens singletons ];
        description = "Extensible Records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "vinyl" = callPackage
+    ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }:
+     mkDerivation {
+       pname = "vinyl";
+       version = "0.5.2";
+       sha256 = "93ac95aada665057df04bd1316c6eb5bef72479420199ebf34715684afe6a70b";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base doctest lens singletons ];
+       description = "Extensible Records";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "vinyl-gl" = callPackage
@@ -208499,10 +209552,9 @@ self: {
     ({ mkDerivation, base, contravariant, transformers, vinyl }:
      mkDerivation {
        pname = "vinyl-utils";
-       version = "0.2.0.2";
-       sha256 = "e38f74e57ef29514c3e655f9ae6415e6005c971a46504c1859b5ba602672297c";
+       version = "0.2.0.3";
+       sha256 = "870e5f5fb312fd3ff37f56eb06d28518571b085a5257852b652cde31e9abc08c";
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
-       jailbreak = true;
        homepage = "https://github.com/marcinmrotek/vinyl-utils";
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
@@ -208522,6 +209574,7 @@ self: {
          base bytestring constraints data-default primitive template-haskell
          text vector vinyl
        ];
+       jailbreak = true;
        homepage = "http://github.com/andrewthad/vinyl-vectors";
        description = "Vectors for vinyl vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -208927,6 +209980,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vulkan" = callPackage
+    ({ mkDerivation, base, fixed-vector }:
+     mkDerivation {
+       pname = "vulkan";
+       version = "1.0.0.0";
+       sha256 = "9449a0ae1ba4d3d322e35b2948a5dae576bd6e59bdcb75917d79ab1436d432c4";
+       libraryHaskellDepends = [ base fixed-vector ];
+       jailbreak = true;
+       homepage = "http://github.com/expipiplus1/vulkan#readme";
+       description = "Bindings to the Vulkan graphics API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "waddle" = callPackage
     ({ mkDerivation, base, binary, bytestring, case-insensitive
      , containers, directory, JuicyPixels
@@ -211354,8 +212420,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-request-spec";
-       version = "0.10.2.0";
-       sha256 = "a5789b5995628b72eec33b5ca462e23f506a01c4dcd8d37116ce76b491753497";
+       version = "0.10.2.1";
+       sha256 = "48b04912b04bb045c6e103adea8f20c50af7705e802e706b9c67249ee6a5f57b";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types text wai
        ];
@@ -212831,7 +213897,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "warp" = callPackage
+  "warp_3_2_2" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, containers
      , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
@@ -212857,6 +213923,40 @@ self: {
          streaming-commons text time transformers unix unix-compat vault wai
          word8
        ];
+       jailbreak = true;
+       doCheck = false;
+       homepage = "http://github.com/yesodweb/wai";
+       description = "A fast, light-weight web server for WAI applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "warp" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
+     , http-types, http2, HUnit, iproute, lifted-base, network, process
+     , QuickCheck, simple-sendfile, stm, streaming-commons, text, time
+     , transformers, unix, unix-compat, vault, wai, word8
+     }:
+     mkDerivation {
+       pname = "warp";
+       version = "3.2.3";
+       sha256 = "3a218d436cd77d41a157e67721ac59892e70f09fcd39594fc4707dabec760ee8";
+       libraryHaskellDepends = [
+         array auto-update base blaze-builder bytestring bytestring-builder
+         case-insensitive containers ghc-prim hashable http-date http-types
+         http2 iproute network simple-sendfile stm streaming-commons text
+         unix unix-compat vault wai word8
+       ];
+       testHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         bytestring-builder case-insensitive containers directory doctest
+         ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
+         iproute lifted-base network process QuickCheck simple-sendfile stm
+         streaming-commons text time transformers unix unix-compat vault wai
+         word8
+       ];
        doCheck = false;
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
@@ -213208,7 +214308,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "warp-tls" = callPackage
+  "warp-tls_3_2_0" = callPackage
     ({ mkDerivation, base, bytestring, cprng-aes, data-default-class
      , network, streaming-commons, tls, wai, warp
      }:
@@ -213223,6 +214323,24 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "warp-tls" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, network
+     , streaming-commons, tls, wai, warp
+     }:
+     mkDerivation {
+       pname = "warp-tls";
+       version = "3.2.1";
+       sha256 = "aca7dd3d4b0cb996debd501a70bd29e556e9bc5e90c67a5c9626ad96feac483e";
+       libraryHaskellDepends = [
+         base bytestring data-default-class network streaming-commons tls
+         wai warp
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "HTTP over TLS support for Warp via the TLS package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "warp-tls-uid" = callPackage
@@ -214668,13 +215786,13 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "0.4.6.0";
-       sha256 = "9ee65c21f4310c81dbde660482680bb73a5d8423436b844d9c4402aa511f2118";
+       version = "0.4.7.0";
+       sha256 = "83a134b6aa52b80b9b32d5c0c98cd1db4b37f9427926dd29b1555b92853f7994";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base containers directory extra filepath lens MonadRandom mtl
-         random-shuffle text transformers
+         aeson base containers directory extra filepath lens mtl text
+         transformers
        ];
        executableHaskellDepends = [
          aeson base directory extra filepath lens MonadRandom mtl
@@ -217160,7 +218278,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xlsx" = callPackage
+  "xlsx_0_2_0" = callPackage
     ({ mkDerivation, base, binary-search, bytestring, conduit
      , containers, data-default, digest, HUnit, lens, mtl, old-locale
      , smallcheck, tasty, tasty-hunit, tasty-smallcheck, text, time
@@ -217193,6 +218311,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "xlsx" = callPackage
+    ({ mkDerivation, base, binary-search, bytestring, conduit
+     , containers, data-default, digest, HUnit, lens, mtl, old-locale
+     , smallcheck, tasty, tasty-hunit, tasty-smallcheck, text, time
+     , transformers, utf8-string, vector, xml-conduit, xml-types
+     , zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "xlsx";
+       version = "0.2.1";
+       sha256 = "5026e7654118dc4e86d265b340a668fbcd3610546fd8fb4820c8e4140bf76a78";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary-search bytestring conduit containers data-default
+         digest lens mtl old-locale text time transformers utf8-string
+         vector xml-conduit xml-types zip-archive zlib
+       ];
+       executableHaskellDepends = [
+         base binary-search bytestring conduit containers data-default
+         digest lens old-locale text time transformers utf8-string vector
+         xml-conduit xml-types zip-archive zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers HUnit lens smallcheck tasty tasty-hunit
+         tasty-smallcheck time vector xml-conduit
+       ];
+       homepage = "https://github.com/qrilka/xlsx";
+       description = "Simple and incomplete Excel file parser/writer";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xlsx-templater" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers
      , data-default, parsec, text, time, transformers, xlsx
@@ -225938,6 +227089,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zip;};
 
+  "zip-archive_0_3" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , digest, directory, filepath, HUnit, mtl, old-time, pretty
+     , process, text, time, unix, zip, zlib
+     }:
+     mkDerivation {
+       pname = "zip-archive";
+       version = "0.3";
+       sha256 = "ecbfa2c983094242e17d4dfb7aaabe891345510dd3cfc37743bfc479c794fd8b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers digest directory filepath
+         mtl old-time pretty text time unix zlib
+       ];
+       executableHaskellDepends = [ base bytestring directory ];
+       testHaskellDepends = [
+         base bytestring directory HUnit old-time process time unix
+       ];
+       testToolDepends = [ zip ];
+       homepage = "http://github.com/jgm/zip-archive";
+       description = "Library for creating and modifying zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zip;};
+
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
      , digest, directory, filepath, hpc, HUnit, mtl, old-time, resourcet
@@ -225948,6 +227125,8 @@ self: {
        pname = "zip-conduit";
        version = "0.2.2.2";
        sha256 = "1b1c83eeae0755fa03744d0ef0c1643259caa0d125862172fe1c335ec332eb6a";
+       revision = "1";
+       editedCabalFile = "bded40e095b3842e349207e728410c3759fb2707ec15b8f9d475f1eff3cefcba";
        libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra digest directory
          filepath mtl old-time resourcet time transformers utf8-string
@@ -225956,7 +227135,6 @@ self: {
          base bytestring conduit directory filepath hpc HUnit mtl resourcet
          temporary test-framework test-framework-hunit time
        ];
-       jailbreak = true;
        homepage = "https://github.com/tymmym/zip-conduit";
        description = "Working with zip archives via conduits";
        license = stdenv.lib.licenses.bsd3;

From 073dd0c1baa9738652adea52b8ee42f18e12888e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Feb 2016 10:12:15 +0100
Subject: [PATCH 071/338] Add LTS Haskell 5.4.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 86628cc503f..928541cd9df 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -356,7 +356,10 @@ rec {
     lts-5_3 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.3.nix { };
     };
-    lts-5 = packages.lts-5_3;
+    lts-5_4 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.4.nix { };
+    };
+    lts-5 = packages.lts-5_4;
 
     lts = packages.lts-5;
   };

From 4ee5a8865d699e619d8e0452802e6be01df1e839 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Feb 2016 10:01:54 +0100
Subject: [PATCH 072/338] mwc-random: drop obsolete overrides

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 998cc151e1c..2858a63b897 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -35,9 +35,6 @@ self: super: {
   hspec-expectations = dontCheck super.hspec-expectations;
   hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; };
   HTTP = dontCheck super.HTTP;
-  mwc-random_0_13_2_2 = dontCheck super.mwc-random_0_13_2_2;
-  mwc-random_0_13_3_0 = dontCheck super.mwc-random_0_13_3_0;
-  mwc-random = dontCheck super.mwc-random;
   nanospec_0_2_0 = dontCheck super.nanospec_0_2_0;
   nanospec = dontCheck super.nanospec;
   options_1_2_1 = dontCheck super.options_1_2_1;

From 08a02a84dec0d7456c494db027f3f53a17d15dac Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 25 Feb 2016 06:01:20 -0500
Subject: [PATCH 073/338] Make sure an older version of hjsonpointer is
 included

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 6fd1a0471c2..7368f639c72 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -45,6 +45,7 @@ extra-packages:
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
   - haddock-api < 2.16                  # required on GHC 7.8.x
   - haskell-src-exts < 1.16             # required for structured-haskell-mode-1.0.8
+  - hjsonpointer == 0.2.0.4             # required for hjsonschema-0.8.0.1
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3

From 3844206366b9ef9dee7c0eb3d3c057e2f9d2b2d6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 25 Feb 2016 06:11:29 -0500
Subject: [PATCH 074/338] Make sure we use the older version of hjsonpointer

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2858a63b897..1b2a82f3dcb 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -323,7 +323,7 @@ self: super: {
   github-types = dontCheck super.github-types;          # http://hydra.cryp.to/build/1114046/nixlog/1/raw
   hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw
   hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
-  hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
+  hjsonschema = overrideCabal (super.hjsonschema.override { hjsonpointer = pkgs.hjsonpointer_0_2_0_4; }) (drv: { testTarget = "local"; });
   hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; });
   marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
   network-transport-tcp = dontCheck super.network-transport-tcp;

From b871649530d8bab430066c0fa1cd3fe293837ca5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 28 Feb 2016 12:09:22 +0100
Subject: [PATCH 075/338] quicktun: init at 2.2.4

---
 pkgs/tools/networking/quicktun/default.nix | 34 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/networking/quicktun/default.nix

diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
new file mode 100644
index 00000000000..f07cfe4d072
--- /dev/null
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, libsodium }:
+
+stdenv.mkDerivation rec {
+  name = "quicktun-${version}";
+  version = "2.2.4";
+
+  src = fetchFromGitHub {
+    owner = "UCIS";
+    repo = "QuickTun";
+    rev = "980fe1b8c718d6df82af1d57b56140c0e541dbe0";
+    sha256 = "0m7gvlgs1mhyw3c8s2dg05j7r7hz8kjpb0sk245m61ir9dmwlf8i";
+  };
+
+  CFLAGS = "-fPIE -fPIC -pie -fstack-protector-all -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro,-z,now";
+
+  buildInputs = [ libsodium ];
+
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+  buildPhase = "bash build.sh";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    rm out/quicktun*tgz
+    cp -v out/quicktun* $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Very simple, yet secure VPN software";
+    homepage = "http://wiki.ucis.nl/QuickTun";
+    maintainers = [ maintainers.fpletz ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de648bc16f6..08517163ebc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3011,6 +3011,8 @@ let
 
   qshowdiff = callPackage ../tools/text/qshowdiff { };
 
+  quicktun = callPackage ../tools/networking/quicktun { };
+
   quilt = callPackage ../development/tools/quilt { };
 
   radamsa = callPackage ../tools/security/radamsa { };

From 69ce5cb656fb9670307e02859e0a8fc5dce11062 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 28 Feb 2016 12:07:42 +0000
Subject: [PATCH 076/338] use the sourceforge mirrors everywhere

    find pkgs -name "*.nix" -exec sed -r \
    "s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
---
 pkgs/applications/audio/QmidiNet/default.nix           |  2 +-
 pkgs/applications/audio/eq10q/default.nix              |  2 +-
 pkgs/applications/audio/faust/faust1.nix               |  2 +-
 pkgs/applications/audio/faust/faust2.nix               |  2 +-
 pkgs/applications/audio/gjay/default.nix               |  2 +-
 pkgs/applications/audio/kid3/default.nix               |  2 +-
 pkgs/applications/audio/mp3gain/default.nix            |  2 +-
 pkgs/applications/audio/pd-plugins/cyclone/default.nix |  2 +-
 pkgs/applications/audio/pd-plugins/maxlib/default.nix  |  2 +-
 pkgs/applications/editors/bviplus/default.nix          |  2 +-
 pkgs/applications/editors/heme/default.nix             |  2 +-
 pkgs/applications/gis/saga/default.nix                 |  2 +-
 pkgs/applications/misc/galculator/default.nix          |  2 +-
 pkgs/applications/misc/lxappearance/default.nix        |  2 +-
 pkgs/applications/misc/quicksynergy/default.nix        |  2 +-
 pkgs/applications/misc/roxterm/default.nix             |  2 +-
 pkgs/applications/misc/vym/default.nix                 |  2 +-
 pkgs/applications/misc/xiphos/default.nix              |  2 +-
 .../networking/instant-messengers/choqok/default.nix   |  2 +-
 pkgs/applications/video/wxcam/default.nix              |  2 +-
 pkgs/applications/virtualization/bochs/default.nix     |  2 +-
 pkgs/development/libraries/biblesync/default.nix       |  2 +-
 pkgs/development/libraries/cimg/default.nix            |  2 +-
 pkgs/development/libraries/cpptest/default.nix         |  2 +-
 pkgs/development/libraries/gtkspellmm/default.nix      |  2 +-
 pkgs/development/libraries/uriparser/default.nix       |  2 +-
 pkgs/development/ocaml-modules/ocamlsdl/default.nix    |  2 +-
 pkgs/development/ocaml-modules/ssl/default.nix         |  2 +-
 pkgs/development/tools/analysis/coan/default.nix       |  2 +-
 .../tools/literate-programming/eweb/default.nix        |  2 +-
 .../tools/literate-programming/nuweb/default.nix       |  2 +-
 pkgs/development/tools/misc/premake/3.nix              |  2 +-
 pkgs/games/instead/default.nix                         |  2 +-
 pkgs/games/odamex/default.nix                          |  2 +-
 pkgs/games/vassal/default.nix                          |  2 +-
 pkgs/misc/emulators/cdemu/base.nix                     |  2 +-
 pkgs/misc/emulators/cdemu/vhba.nix                     |  2 +-
 pkgs/misc/emulators/desmume/default.nix                |  2 +-
 pkgs/misc/emulators/stella/default.nix                 |  2 +-
 pkgs/servers/dict/dictd-db.nix                         | 10 +++++-----
 pkgs/servers/ums/default.nix                           |  2 +-
 pkgs/tools/bootloaders/refind/default.nix              |  2 +-
 pkgs/tools/networking/traceroute/default.nix           |  2 +-
 pkgs/tools/typesetting/pdfgrep/default.nix             |  2 +-
 pkgs/tools/typesetting/tex/pgf/3.x.nix                 |  2 +-
 45 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/pkgs/applications/audio/QmidiNet/default.nix b/pkgs/applications/audio/QmidiNet/default.nix
index 4e89f125dd9..d8d8945db92 100644
--- a/pkgs/applications/audio/QmidiNet/default.nix
+++ b/pkgs/applications/audio/QmidiNet/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "qmidinet-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/qmidinet/${name}.tar.gz";
+    url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
     sha256 = "1a1pj4w74wj1gcfv4a0vzcglmr5sw0xp0y56w8rk3ig4k11xi8sa";
   };
 
diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix
index 5d5b70a5898..e2adf9e131c 100644
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
   name = "eq10q-2-${version}";
   version = "beta7.1";
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/eq10q/${name}.tar.gz";
+    url = "mirror://sourceforge/project/eq10q/${name}.tar.gz";
     sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi";
   };
 
diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index 4e03b26c036..56f7ac50227 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -12,7 +12,7 @@ let
   version = "0.9.73";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.tgz";
+    url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz";
     sha256 = "0x2scxkwvvjx7b7smj5xb8kr269qakf49z3fxpasd9g7025q44k5";
   };
 
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 91e9fb66659..4759f228e35 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -19,7 +19,7 @@ let
   version = "2.0-a41";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/faudiostream/faust-2.0.a41.tgz";
+    url = "mirror://sourceforge/project/faudiostream/faust-2.0.a41.tgz";
     sha256 = "1cq4x1cax0lswrcqv0limx5mjdi3187zlmh7cj2pndr0xq6b96cm";
   };
 
diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix
index 9f023f34291..f08de9d080a 100644
--- a/pkgs/applications/audio/gjay/default.nix
+++ b/pkgs/applications/audio/gjay/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   name = "gjay-0.3.2";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/gjay/gjay-0.3.2.tar.gz";
+    url = "mirror://sourceforge/project/gjay/gjay-0.3.2.tar.gz";
     sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8";
   };
 
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index 0b2e4e7977b..4d79c3ebecf 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "kid3-${meta.version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/kid3/kid3/${meta.version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/kid3/kid3/${meta.version}/${name}.tar.gz";
     sha256 = "12sa54mg1b3wkagmh5yi20ski8km9d199lk0a1yfxy0ffjfld7js";
   };
 
diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix
index 3fef8398e9c..907d4b8be16 100644
--- a/pkgs/applications/audio/mp3gain/default.nix
+++ b/pkgs/applications/audio/mp3gain/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mp3gain-1.5.2";
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/mp3gain/mp3gain-1_5_2-src.zip";
+    url = "mirror://sourceforge/mp3gain/mp3gain-1_5_2-src.zip";
     sha256 = "1jkgry59m8cnnfq05b9y1h4x4wpy3iq8j68slb9qffwa3ajcgbfv";
   };
 
diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix
index b90c6a0ea36..2331944db01 100644
--- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix
+++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.1-alpha55";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/pure-data/libraries/cyclone/${name}.tar.gz";
+    url = "mirror://sourceforge/project/pure-data/libraries/cyclone/${name}.tar.gz";
     sha256 = "1yys9xrlz09xgnqk2gqdl8vw6xj6l9d7km2lkihidgjql0jx5b5i";
   };
 
diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix
index dc4d0375961..c5732387b50 100644
--- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix
+++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.5.5";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/pure-data/libraries/maxlib/${name}.tar.gz";
+    url = "mirror://sourceforge/project/pure-data/libraries/maxlib/${name}.tar.gz";
     sha256 = "0vxl9s815dnay5r0067rxsfh8f6jbk61f0nxrydzjydfycza7p1w";
   };
 
diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix
index 0a8d7081b23..5adb0dad26c 100644
--- a/pkgs/applications/editors/bviplus/default.nix
+++ b/pkgs/applications/editors/bviplus/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "bviplus-${version}";
   version = "0.9.4";
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/bviplus/bviplus/${version}/bviplus-${version}.tgz";
+    url = "mirror://sourceforge/project/bviplus/bviplus/${version}/bviplus-${version}.tgz";
     sha256 = "10x6fbn8v6i0y0m40ja30pwpyqksnn8k2vqd290vxxlvlhzah4zb";
   };
   buildInputs = [
diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
index d377e5cb36f..69ba674d2d4 100644
--- a/pkgs/applications/editors/heme/default.nix
+++ b/pkgs/applications/editors/heme/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "heme-${version}";
   version = "0.4.2";
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/heme/heme/heme-${version}/heme-${version}.tar.gz";
+    url = "mirror://sourceforge/project/heme/heme/heme-${version}/heme-${version}.tar.gz";
     sha256 = "0wsrnj5mrlazgqs4252k30aw8m86qw0z9dmrsli9zdxl7j4cg99v";
   };
   postPatch = ''
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 200d091b64a..b7b4d299efc 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/saga-gis/SAGA%20-%202.2/SAGA%202.2.2/saga-2.2.2.tar.gz";
+    url = "mirror://sourceforge/project/saga-gis/SAGA%20-%202.2/SAGA%202.2.2/saga-2.2.2.tar.gz";
     sha256 = "031cd70b7ec248f32f955a9316aefc7f7ab283c5129c49aa4bd748717d20357e";
   };
 
diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix
index 5dcee439ef9..5d5f83a2370 100644
--- a/pkgs/applications/misc/galculator/default.nix
+++ b/pkgs/applications/misc/galculator/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "2.1.3";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/galculator/${name}.tar.gz";
+    url = "mirror://sourceforge/galculator/${name}.tar.gz";
     sha256 = "12m7dldjk10lpkdxk7zpk98n32ci65zmxidghihb7n1m3rhp3q17";
   };
 
diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/applications/misc/lxappearance/default.nix
index 8db606fd6d5..b6e59613b3c 100644
--- a/pkgs/applications/misc/lxappearance/default.nix
+++ b/pkgs/applications/misc/lxappearance/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "lxappearance-0.6.1";
   src = fetchurl{
-    url = "http://downloads.sourceforge.net/project/lxde/LXAppearance/${name}.tar.xz";
+    url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz";
     sha256 = "1phnv1b2jdj2vlibjyc9z01izcf3k5zxj8glsaf0i3vh77zqmqq9";
   };
   buildInputs = [ intltool libX11 pkgconfig gtk ];
diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix
index 90737a344ca..3c9bdcada15 100644
--- a/pkgs/applications/misc/quicksynergy/default.nix
+++ b/pkgs/applications/misc/quicksynergy/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "quicksynergy-${version}";
   version = "0.9.0";
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz";
+    url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz";
     sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix";
   };
   buildInputs = [
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 60322c2b911..ad7de90cad6 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
   name = "roxterm-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/roxterm/${name}.tar.bz2";
+    url = "mirror://sourceforge/roxterm/${name}.tar.bz2";
     sha256 = "0djfiwfmnqqp6930kswzr2rss0mh40vglcdybwpxrijcw4n8j21x";
   };
 
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index b1cfbd5d9ac..62f741f9eea 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.2.4";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/vym/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/vym/${version}/${name}.tar.bz2";
     sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs";
   };
 
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index dbc5e84e67b..a9f786a2a08 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "4.0.3-20150806";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz";
+    url = "mirror://sourceforge/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz";
     sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/choqok/default.nix b/pkgs/applications/networking/instant-messengers/choqok/default.nix
index 9b16404b620..a50779f53dd 100644
--- a/pkgs/applications/networking/instant-messengers/choqok/default.nix
+++ b/pkgs/applications/networking/instant-messengers/choqok/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "${pn}-${v}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/choqok/Choqok/choqok-1.5.tar.xz";
+    url = "mirror://sourceforge/project/choqok/Choqok/choqok-1.5.tar.xz";
     sha256 = "5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4";
   };
 
diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix
index 561ab151682..24e99d78c48 100644
--- a/pkgs/applications/video/wxcam/default.nix
+++ b/pkgs/applications/video/wxcam/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   version = "1.1";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/wxcam/wxcam/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${name}.tar.gz";
     sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859";
   };
 
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index b876403d632..9a75a3ddfd4 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   version = "2.6.8";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz";
     sha256 = "1kl5cmbz6qgg33j5vv9898nzdppp1rqgy24r5pv762aaj7q0ww3r";
   };
 
diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix
index 4b7be5ca3d4..d7b82764fc0 100644
--- a/pkgs/development/libraries/biblesync/default.nix
+++ b/pkgs/development/libraries/biblesync/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec{
   version = "1.1.2";
 
   src = fetchurl{
-    url = "http://downloads.sourceforge.net/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz";
+    url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz";
     sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8";
   };
 
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index cd679183650..dc397adf491 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "1.5.9";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/cimg/CImg-${version}.zip";
+    url = "mirror://sourceforge/project/cimg/CImg-${version}.zip";
     sha256 = "1xn20643gcbl76kvy9ajhwbyjjb73mg65q32ma8mdkwn1qhn7f7c";
   };
 
diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix
index 8bffeebd024..e5aab430829 100644
--- a/pkgs/development/libraries/cpptest/default.nix
+++ b/pkgs/development/libraries/cpptest/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "cpptest-1.1.2";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/cpptest/cpptest/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/cpptest/cpptest/${name}/${name}.tar.gz";
     sha256 = "09v070a9dv6zq6hgj4v67i31zsis3s96psrnhlq9g4vhdcaxykwy";
   };
 
diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix
index d24ec46d905..44bb8051ea6 100644
--- a/pkgs/development/libraries/gtkspellmm/default.nix
+++ b/pkgs/development/libraries/gtkspellmm/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "gtkspellmm-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/gtkspell/gtkspellmm/" +
+    url = "mirror://sourceforge/project/gtkspell/gtkspellmm/" +
           "${name}.tar.gz";
     sha256 = "f9dcc0991621c08e7a972f33487afd6b37491468f0b654f50c741a7e6d810624";
   };
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index 76aec25a792..9089889f4dd 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "uriparser-0.8.2";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/uriparser/Sources/0.8.2/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/uriparser/Sources/0.8.2/${name}.tar.bz2";
     sha256 = "13sh7slys3y5gfscc40g2r3hkjjywjvxlcqr77ifjrazc6q6cvkd";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix
index 51af8d99d69..8f2ffcaa9bc 100644
--- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl { 
-    url = "http://downloads.sourceforge.net/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz";
+    url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz";
     sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f";
   };
 
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index f80675f88d2..6e3ded0b0f2 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "ocaml-ssl-${version}";
 
   src = fetchurl {
-  url = "http://downloads.sourceforge.net/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz";
+  url = "mirror://sourceforge/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz";
 
     sha256 = "0341rm8aqrckmhag1lrqfnl17v6n4ci8ibda62ahkkn5cxd58cpp";
   };
diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix
index bf749b694a2..3ce5f23f645 100644
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/pkgs/development/tools/analysis/coan/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "coan-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/coan2/v${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/coan2/v${version}/${name}.tar.gz";
     sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
   };
 
diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/development/tools/literate-programming/eweb/default.nix
index f996c567fcb..17a7731896e 100644
--- a/pkgs/development/tools/literate-programming/eweb/default.nix
+++ b/pkgs/development/tools/literate-programming/eweb/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec{
   name = "eweb-${meta.version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/eweb/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/eweb/${name}.tar.bz2";
     sha256 = "1xy7vm2sj5q6s620fm25klmnwnz9xkrxmx4q2f8h6c85ydisayd5";
   };
 
diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix
index 54c2125a08c..5930d4789a4 100644
--- a/pkgs/development/tools/literate-programming/nuweb/default.nix
+++ b/pkgs/development/tools/literate-programming/nuweb/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec{
   version = "1.58";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/nuweb/${name}.tar.gz";
+    url = "mirror://sourceforge/project/nuweb/${name}.tar.gz";
     sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y";
   };
 
diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix
index 94a2880e134..59ce43bf891 100644
--- a/pkgs/development/tools/misc/premake/3.nix
+++ b/pkgs/development/tools/misc/premake/3.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/sourceforge/premake/${baseName}-src-${version}.zip";
+    url = "mirror://sourceforge/sourceforge/premake/${baseName}-src-${version}.zip";
     sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
   };
 
diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index 194feb58083..6d55f2a2d5c 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   name = "instead-" + version;
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/instead/instead/${version}/instead_${version}.tar.gz";
+    url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
     sha256 = "1ldisjkmmcpnmv4vsd25dc1sfiwbr9fcn3hxhl78i4jwlyqgrms8";
   };
 
diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix
index f24e6155ec6..abc19adf72a 100644
--- a/pkgs/games/odamex/default.nix
+++ b/pkgs/games/odamex/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "odamex-0.7.0";
   src = fetchurl {
-    url = http://downloads.sourceforge.net/odamex/odamex-src-0.7.0.tar.bz2;
+    url = mirror://sourceforge/odamex/odamex-src-0.7.0.tar.bz2;
     sha256 = "0cb6p58yv55kdyfj7s9n9xcwpvxrj8nyc6brw9jvwlc5n4y3cd5a";
   };
 
diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
index 319453c8019..8961dfdce3c 100644
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "VASSAL-3.2.15";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/vassalengine/${name}-linux.tar.bz2";
+    url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2";
     sha256 = "10ng571nxr5zc2nlviyrk5bci8my67kq3qvhfn9bifzkxmjlqmk9";
   };
 
diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix
index d7c91169ed3..cfd2ad37cad 100644
--- a/pkgs/misc/emulators/cdemu/base.nix
+++ b/pkgs/misc/emulators/cdemu/base.nix
@@ -4,7 +4,7 @@ let name = "${pkgName}-${version}";
 in stdenv.mkDerivation ({
   inherit name buildInputs;
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/cdemu/${name}.tar.bz2";
+    url = "mirror://sourceforge/cdemu/${name}.tar.bz2";
     sha256 = pkgSha256;
   };
   nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index d4596be03a6..2e163af1d5e 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -3,7 +3,7 @@ let version = "20140928";
 in stdenv.mkDerivation {
   name = "vhba-${version}";
   src  = fetchurl {
-    url = "http://downloads.sourceforge.net/cdemu/vhba-module-${version}.tar.bz2";
+    url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2";
     sha256 = "18jmpg2kpx87f32b8aprr1pxla9dlhf901rkj1sp3ammf94nxxa5";
   };
   preBuild = ''
diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix
index f322a96905f..97cd6a9ca79 100644
--- a/pkgs/misc/emulators/desmume/default.nix
+++ b/pkgs/misc/emulators/desmume/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   version = "0.9.11";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/desmume/desmume/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/desmume/desmume/${version}/${name}.tar.gz";
     sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs";
   };
 
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index 04976a2bb83..be872250d03 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "4.6.1";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/stella/stella/${version}/${name}-src.tar.gz";
+    url = "mirror://sourceforge/project/stella/stella/${version}/${name}-src.tar.gz";
     sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1";
   };
 
diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index 5f109c58e6e..fda81b0ff81 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -39,23 +39,23 @@ rec {
 		sha256 = "1vhw81pphb64fzsjvpzsnnyr34ka2fxizfwilnxyjcmpn9360h07";
 	}) "nld-eng" "nl_NL";
 	eng2nld =  makeDictdDBFreedict (fetchurl {
-		url = http://downloads.sourceforge.net/freedict/eng-nld.tar.gz;
+		url = mirror://sourceforge/freedict/eng-nld.tar.gz;
 		sha256 = "0rcg28ldykv0w2mpxc6g4rqmfs33q7pbvf68ssy1q9gpf6mz7vcl";
 	}) "eng-nld" "en_UK";
 	eng2rus = makeDictdDBFreedict (fetchurl {
-		url = http://downloads.sourceforge.net/freedict/eng-rus.tar.gz;
+		url = mirror://sourceforge/freedict/eng-rus.tar.gz;
 		sha256 = "15409ivhww1wsfjr05083pv6mg10bak8v5pg1wkiqybk7ck61rry";
 	}) "eng-rus" "en_UK";
 	fra2eng = makeDictdDBFreedict (fetchurl {
-		url = http://downloads.sourceforge.net/freedict/fra-eng.tar.gz;
+		url = mirror://sourceforge/freedict/fra-eng.tar.gz;
 		sha256 = "0sdd88s2zs5whiwdf3hd0s4pzzv75sdsccsrm1wxc87l3hjm85z3";
 	}) "fra-eng" "fr_FR";
 	eng2fra = makeDictdDBFreedict (fetchurl {
-		url = http://downloads.sourceforge.net/freedict/eng-fra.tar.gz;
+		url = mirror://sourceforge/freedict/eng-fra.tar.gz;
 		sha256 = "0fi6rrnbqnhc6lq8d0nmn30zdqkibrah0mxfg27hsn9z7alwbj3m";
 	}) "eng-fra" "en_UK";
 	mueller_eng2rus_pkg = makeDictdDB (fetchurl {
-		url = http://downloads.sourceforge.net/mueller-dict/mueller-dict-3.1.tar.gz;
+		url = mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz;
 		sha256 = "04r5xxznvmcb8hkxqbjgfh2gxvbdd87jnhqn5gmgvxxw53zpwfmq";
 	}) "mueller-eng-rus" "mueller-dict-*/dict" "en_UK";
 	mueller_enru_abbr = {
diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix
index 12816702c8f..c51aadf0d19 100644
--- a/pkgs/servers/ums/default.nix
+++ b/pkgs/servers/ums/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "5.4.0";
   
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz";
+    url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz";
     sha256 = "0ryp26h7pyqing8pyg0xjrp1wm77wwgya4a7d00wczh885pk16kq";
     name = "${name}.tgz";
   };
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 7a57225ce8e..110e00976e8 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   srcName = "refind-src-${meta.version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/refind/${meta.version}/${srcName}.zip";
+    url = "mirror://sourceforge/project/refind/${meta.version}/${srcName}.zip";
     sha256 = "0ai150rzx20sfl92j6y1p6qnyy0wbmazrlp2fg19acs98qyxl8lh";
   };
 
diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix
index 2ce8d1cde3e..d98c9996882 100644
--- a/pkgs/tools/networking/traceroute/default.nix
+++ b/pkgs/tools/networking/traceroute/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.0.21";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/traceroute/${name}.tar.gz";
+    url = "mirror://sourceforge/traceroute/${name}.tar.gz";
     sha256 = "1q4n9s42nfcc4fmnwmrsiabvqrcaagiagmmqj9r5hfmi63pr7b7p";
   };
 
diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix
index ff3bad12bc5..e6c63e02956 100644
--- a/pkgs/tools/typesetting/pdfgrep/default.nix
+++ b/pkgs/tools/typesetting/pdfgrep/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.3.1";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/pdfgrep/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/pdfgrep/${version}/${name}.tar.gz";
     sha256 = "6e8bcaf8b219e1ad733c97257a97286a94124694958c27506b2ea7fc8e532437";
   };
 
diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix
index 5c0c387a340..32c73c4a43c 100644
--- a/pkgs/tools/typesetting/tex/pgf/3.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pgf-3.00";
 
   src = fetchurl {
-    url = http://downloads.sourceforge.net/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip;
+    url = mirror://sourceforge/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip;
     sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7";
   };
 

From c08f18df639dcd8944f6f3feb808aeb46a528d99 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 26 Feb 2016 14:34:19 +0000
Subject: [PATCH 077/338] cide: 0.8.1 -> 0.9.0

---
 .../continuous-integration/cide/Gemfile.lock  |  2 +-
 .../continuous-integration/cide/default.nix   |  6 ++---
 .../continuous-integration/cide/gemset.nix    | 24 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/cide/Gemfile.lock b/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
index 7db1b9db9b3..736b2bfca1a 100644
--- a/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
+++ b/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
@@ -11,7 +11,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    cide (0.8.1)
+    cide (0.9.0)
       thor (~> 0.19)
       virtus (~> 1.0)
     coercible (1.0.0)
diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix
index c8c35330e30..4a64d8bf303 100644
--- a/pkgs/development/tools/continuous-integration/cide/default.nix
+++ b/pkgs/development/tools/continuous-integration/cide/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, bundlerEnv, makeWrapper, docker, git }:
+{ stdenv, lib, bundlerEnv, makeWrapper, docker, git, gnutar, gzip }:
 
 stdenv.mkDerivation rec {
   name = "cide-${version}";
-  version = "0.8.1";
+  version = "0.9.0";
 
   env = bundlerEnv {
     name = "${name}-gems";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     makeWrapper ${env}/bin/cide $out/bin/cide \
-      --set PATH ${docker}/bin:${git}/bin
+      --set PATH ${docker}/bin:${git}/bin:${gnutar}/bin:${gzip}/bin
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/tools/continuous-integration/cide/gemset.nix b/pkgs/development/tools/continuous-integration/cide/gemset.nix
index 2d5df24bb45..df8f7c9f208 100644
--- a/pkgs/development/tools/continuous-integration/cide/gemset.nix
+++ b/pkgs/development/tools/continuous-integration/cide/gemset.nix
@@ -22,20 +22,20 @@
     version = "0.19.1";
   };
   jmespath = {
-    version = "1.1.3";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "0vpvd61kc60f98jn28kw7x7vi82qrwgglam42nvzh98i43yxwsfb";
+      type = "gem";
     };
+    version = "1.1.3";
   };
   ice_nine = {
-    version = "0.11.2";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
+      type = "gem";
     };
+    version = "0.11.2";
   };
   equalizer = {
     source = {
@@ -61,11 +61,11 @@
     version = "1.0.0";
   };
   cide = {
-    version = "0.8.1";
+    version = "0.9.0";
     source = {
       type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "1vsa7smab5dj6mcf0csl9wm18x95h6yphm7x18is53bv5hrzgill";
+      sha256 = "1wykwv0jnrh49jm9zsy1cb5wddv65iw4ixh072hr242wb83dcyl0";
     };
   };
   axiom-types = {
@@ -77,27 +77,27 @@
     version = "0.1.1";
   };
   aws-sdk-resources = {
-    version = "2.2.17";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "0vdnpjmil99n9d1fpk1w6ssgvmzx4wfmrqcij8nyd0iqdaacx3fj";
+      type = "gem";
     };
+    version = "2.2.17";
   };
   aws-sdk-core = {
-    version = "2.2.17";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "1vq7ny5n3rdfzkdqdm76r48slmp2a5v7565llrl4bw5hb5k4p75z";
+      type = "gem";
     };
+    version = "2.2.17";
   };
   aws-sdk = {
-    version = "2.2.17";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "1cwycrdk21blzjzf8fj1wlmdix94rj9aixj6phx6lwbqykn2dzx9";
+      type = "gem";
     };
+    version = "2.2.17";
   };
 }
\ No newline at end of file

From 1af8a3498cdc9c2441b20475e39123855b543cf8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 28 Feb 2016 15:46:39 +0300
Subject: [PATCH 078/338] apitrace: add qapitrace and backtracing support

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

diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index f54628e0b8d..e130b23a8aa 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, qtbase }:
+{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, libdwarf, qtbase, qtwebkit }:
 
 stdenv.mkDerivation rec {
   name = "apitrace-${version}";
@@ -11,13 +11,11 @@ stdenv.mkDerivation rec {
     owner = "apitrace";
   };
 
-  buildInputs = [ libX11 procps python qtbase ];
-  nativeBuildInputs = [ cmake ];
+  # LD_PRELOAD wrappers need to be statically linked to work against all kinds
+  # of games -- so it's fine to use e.g. bundled snappy.
+  buildInputs = [ libX11 procps python libdwarf qtbase qtwebkit ];
 
-  buildPhase = ''
-    cmake
-    make
-  '';
+  nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
     homepage = https://apitrace.github.io;

From a91161aa57f7cfe447a551bafc2d7c6c6bbbe44b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 27 Feb 2016 06:16:42 -0600
Subject: [PATCH 079/338] nixos: remove qtPlugins and gtkPlugins

Both Qt and GTK load plugins from the active profiles
automatically, so it is sufficient to install input methods
system-wide. Overriding the plugin paths may interfere with correct
operation of other plugins.
---
 nixos/modules/config/gtk-exe-env.nix     | 41 ------------------------
 nixos/modules/config/qt-plugin-env.nix   | 37 ---------------------
 nixos/modules/i18n/inputMethod/fcitx.nix |  2 --
 nixos/modules/i18n/inputMethod/nabi.nix  |  1 -
 nixos/modules/i18n/inputMethod/uim.nix   |  2 --
 nixos/modules/module-list.nix            |  2 --
 6 files changed, 85 deletions(-)
 delete mode 100644 nixos/modules/config/gtk-exe-env.nix
 delete mode 100644 nixos/modules/config/qt-plugin-env.nix

diff --git a/nixos/modules/config/gtk-exe-env.nix b/nixos/modules/config/gtk-exe-env.nix
deleted file mode 100644
index b565072e3a7..00000000000
--- a/nixos/modules/config/gtk-exe-env.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-  ];
-
-  options = {
-    gtkPlugins = lib.mkOption {
-      type = lib.types.listOf lib.types.path;
-      default = [];
-      description = ''
-        Plugin packages for GTK+ such as input methods.
-      '';
-    };
-  };
-
-  config = {
-    environment.variables = if builtins.length config.gtkPlugins > 0
-      then
-        let
-          paths = [ pkgs.gtk2 pkgs.gtk3 ] ++ config.gtkPlugins;
-          env = pkgs.buildEnv {
-            name = "gtk-exe-env";
-
-            inherit paths;
-
-            postBuild = lib.concatStringsSep "\n"
-              (map (d: d.gtkExeEnvPostBuild or "") paths);
-
-            ignoreCollisions = true;
-          };
-        in {
-          GTK_EXE_PREFIX = builtins.toString env;
-          GTK_PATH = [
-            "${env}/lib/gtk-2.0"
-            "${env}/lib/gtk-3.0"
-          ];
-        }
-      else {};
-  };
-}
diff --git a/nixos/modules/config/qt-plugin-env.nix b/nixos/modules/config/qt-plugin-env.nix
deleted file mode 100644
index c5986560416..00000000000
--- a/nixos/modules/config/qt-plugin-env.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-  ];
-
-  options = {
-    qtPlugins = lib.mkOption {
-      type = lib.types.listOf lib.types.path;
-      default = [];
-      description = ''
-        Plugin packages for Qt such as input methods.
-      '';
-    };
-  };
-
-  config = {
-    environment.variables = if builtins.length config.qtPlugins > 0
-      then
-        let
-          paths = [ pkgs.qt48 ] ++ config.qtPlugins;
-          env = pkgs.buildEnv {
-            name = "qt-plugin-env";
-
-            inherit paths;
-
-            postBuild = lib.concatStringsSep "\n"
-              (map (d: d.qtPluginEnvPostBuild or "") paths);
-
-            ignoreCollisions = true;
-          };
-        in {
-          QT_PLUGIN_PATH = [ (builtins.toString env) ];
-        }
-      else {};
-  };
-}
diff --git a/nixos/modules/i18n/inputMethod/fcitx.nix b/nixos/modules/i18n/inputMethod/fcitx.nix
index f168f445170..f73554b3edd 100644
--- a/nixos/modules/i18n/inputMethod/fcitx.nix
+++ b/nixos/modules/i18n/inputMethod/fcitx.nix
@@ -29,8 +29,6 @@ in
 
   config = mkIf (config.i18n.inputMethod.enabled == "fcitx") {
     environment.systemPackages = [ fcitxPackage ];
-    gtkPlugins = [ fcitxPackage ];
-    qtPlugins  = [ fcitxPackage ];
 
     environment.variables = {
       GTK_IM_MODULE = "fcitx";
diff --git a/nixos/modules/i18n/inputMethod/nabi.nix b/nixos/modules/i18n/inputMethod/nabi.nix
index 8c396595513..c6708365eff 100644
--- a/nixos/modules/i18n/inputMethod/nabi.nix
+++ b/nixos/modules/i18n/inputMethod/nabi.nix
@@ -4,7 +4,6 @@ with lib;
 {
   config = mkIf (config.i18n.inputMethod.enabled == "nabi") {
     environment.systemPackages = [ pkgs.nabi ];
-    qtPlugins  = [ pkgs.nabi ];
 
     environment.variables = {
       GTK_IM_MODULE = "nabi";
diff --git a/nixos/modules/i18n/inputMethod/uim.nix b/nixos/modules/i18n/inputMethod/uim.nix
index 401e1932f70..f8a3e560656 100644
--- a/nixos/modules/i18n/inputMethod/uim.nix
+++ b/nixos/modules/i18n/inputMethod/uim.nix
@@ -23,8 +23,6 @@ in
 
   config = mkIf (config.i18n.inputMethod.enabled == "uim") {
     environment.systemPackages = [ pkgs.uim ];
-    gtkPlugins = [ pkgs.uim ];
-    qtPlugins  = [ pkgs.uim ];
 
     environment.variables = {
       GTK_IM_MODULE = "uim";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a50b17068f6..738b52854de 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -7,7 +7,6 @@
   ./config/fonts/fonts.nix
   ./config/fonts/ghostscript.nix
   ./config/gnu.nix
-  ./config/gtk-exe-env.nix
   ./config/i18n.nix
   ./config/krb5.nix
   ./config/ldap.nix
@@ -16,7 +15,6 @@
   ./config/nsswitch.nix
   ./config/power-management.nix
   ./config/pulseaudio.nix
-  ./config/qt-plugin-env.nix
   ./config/shells-environment.nix
   ./config/swap.nix
   ./config/sysctl.nix

From efad7bd47d3e2864ba2c28c2fd5ec0bd22dd9200 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 27 Feb 2016 06:20:19 -0600
Subject: [PATCH 080/338] fcitx: show available engines in module description

---
 nixos/modules/i18n/inputMethod/fcitx.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/i18n/inputMethod/fcitx.nix b/nixos/modules/i18n/inputMethod/fcitx.nix
index f73554b3edd..8e31743504f 100644
--- a/nixos/modules/i18n/inputMethod/fcitx.nix
+++ b/nixos/modules/i18n/inputMethod/fcitx.nix
@@ -18,10 +18,14 @@ in
         type    = with types; listOf fcitxEngine;
         default = [];
         example = literalExample "with pkgs.fcitx-engines; [ mozc hangul ]";
-        description = ''
-          Enabled Fcitx engines.
-          Available engines can be found by running `nix-env "&lt;nixpkgs&gt;" . -qaP -A fcitx-engines`.
-        '';
+        description =
+          let
+            engines =
+              lib.concatStringsSep ", "
+              (map (name: "<literal>${name}</literal>")
+               (lib.attrNames pkgs.fcitx-engines));
+          in
+            "Enabled Fcitx engines. Available engines are: ${engines}.";
       };
     };
 

From 3a8a887cfd4b62e24353e29f173e0272a3ca6f3a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 27 Feb 2016 06:30:04 -0600
Subject: [PATCH 081/338] ibus-with-plugins: replace ibus wrappers

---
 pkgs/tools/inputmethods/ibus/wrapper.nix | 13 ++++++++++---
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix
index 3bccad1cc0c..72fbaef6604 100644
--- a/pkgs/tools/inputmethods/ibus/wrapper.nix
+++ b/pkgs/tools/inputmethods/ibus/wrapper.nix
@@ -1,11 +1,15 @@
-{ stdenv, runCommand, ibus, lndir, makeWrapper, plugins, hicolor_icon_theme }:
+{ stdenv, runCommand, makeWrapper, lndir
+, dconf, hicolor_icon_theme, ibus, plugins
+}:
 
 let
   name = "ibus-with-plugins-" + (builtins.parseDrvName ibus.name).version;
   env = {
+    buildInputs = [ ibus ] ++ plugins;
     nativeBuildInputs = [ lndir makeWrapper ];
     propagatedUserEnvPackages = [ hicolor_icon_theme ];
     paths = [ ibus ] ++ plugins;
+    inherit (ibus) meta;
   };
   command = ''
     for dir in bin etc lib libexec share; do
@@ -19,7 +23,8 @@ let
 
     for prog in ibus ibus-daemon ibus-setup; do
         wrapProgram "$out/bin/$prog" \
-          --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \
+          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
+          --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
           --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \
           --set IBUS_DATAROOTDIR "$out/share" \
           --set IBUS_LIBEXECDIR "$out/libexec" \
@@ -29,7 +34,9 @@ let
           --set IBUS_TABLE_DATA_DIR "$out/share" \
           --set IBUS_TABLE_LIB_LOCATION "$out/libexec" \
           --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \
-          --set IBUS_TABLE_DEBUG_LEVEL 1
+          --prefix PYTHONPATH : "$PYTHONPATH" \
+          --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
+          --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share"
     done
   '';
 in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08517163ebc..75565c0f5e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1198,6 +1198,7 @@ let
   };
 
   ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix {
+    inherit (gnome3) dconf;
     plugins = [ ];
   };
 

From c62bf00442fa2af30feb50eafd3cf19c10077203 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 27 Feb 2016 07:47:37 -0600
Subject: [PATCH 082/338] nixos: remove top-level uim option

---
 nixos/modules/module-list.nix  |  1 -
 nixos/modules/programs/uim.nix | 31 -------------------------------
 2 files changed, 32 deletions(-)
 delete mode 100644 nixos/modules/programs/uim.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 738b52854de..ad1636e002d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -77,7 +77,6 @@
   ./programs/shell.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
-  ./programs/uim.nix
   ./programs/venus.nix
   ./programs/wvdial.nix
   ./programs/xfs_quota.nix
diff --git a/nixos/modules/programs/uim.nix b/nixos/modules/programs/uim.nix
deleted file mode 100644
index 4bf2f9a1757..00000000000
--- a/nixos/modules/programs/uim.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.uim;
-in
-{
-  options = {
-
-    uim = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
-        description = "Enable UIM input method";
-      };
-    };
-
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.uim ];
-    gtkPlugins = [ pkgs.uim ];
-    qtPlugins = [ pkgs.uim ];
-    environment.variables.GTK_IM_MODULE = "uim";
-    environment.variables.QT_IM_MODULE = "uim";
-    environment.variables.XMODIFIERS = "@im=uim";
-    services.xserver.displayManager.sessionCommands = "uim-xim &";
-  };
-}

From 41204574bed6a304e41ad61f18338d83df2cdd2f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 28 Feb 2016 07:10:11 -0600
Subject: [PATCH 083/338] ibus-m17n: use Python 3

---
 .../ibus-engines/ibus-m17n/default.nix             | 14 +++++++++-----
 pkgs/top-level/all-packages.nix                    |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index c6c43d05898..81bfffb2546 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchFromGitHub, ibus, m17n_lib, m17n_db, automake, autoconf,
-  gettext, libtool, pkgconfig, python, pythonPackages }:
+{ stdenv, fetchFromGitHub
+, automake, autoconf, libtool, pkgconfig
+, ibus, m17n_lib, m17n_db, gettext, python3, pygobject3
+}:
 
 stdenv.mkDerivation rec {
   name = "ibus-m17n-${version}";
@@ -12,11 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "1n0bvgc4jyksgvzrw5zs2pxcpxcn3gcc0j2kasbznm34fpv3frsr";
   };
 
-  buildInputs = [ 
-    ibus m17n_lib m17n_db automake autoconf gettext 
-    libtool pkgconfig python pythonPackages.pygobject3 
+  buildInputs = [
+    ibus m17n_lib m17n_db gettext
+    python3 pygobject3
   ];
 
+  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
+
   preConfigure = ''
     autoreconf --verbose --force --install
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75565c0f5e0..ef6dc1f6f3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1180,7 +1180,9 @@ let
       inherit (python3Packages) pygobject3;
     };
 
-    m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
+    m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n {
+      inherit (python3Packages) pygobject3;
+    };
 
     mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
       inherit (pythonPackages) gyp;

From fde23a01b4778bd5e044e8e80458ed4dd8c29dca Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 28 Feb 2016 14:54:25 +0100
Subject: [PATCH 084/338] nixos/collectd: Fix package option

Commit ed979124cad7596de539188e86664b3784c363ca was missing some code.
---
 nixos/modules/services/monitoring/collectd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix
index a3280b08bd0..3c3d83c66ed 100644
--- a/nixos/modules/services/monitoring/collectd.nix
+++ b/nixos/modules/services/monitoring/collectd.nix
@@ -100,7 +100,7 @@ in {
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
-        ExecStart = "${pkgs.collectd}/sbin/collectd -C ${conf} -P ${cfg.pidFile}";
+        ExecStart = "${cfg.package}/sbin/collectd -C ${conf} -P ${cfg.pidFile}";
         Type = "forking";
         PIDFile = cfg.pidFile;
         User = optional (cfg.user!="root") cfg.user;

From 070dccae7bbb61166fabd7b1cea15c46894ac3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 28 Feb 2016 13:31:35 +0100
Subject: [PATCH 085/338] gitstats: init at 2016-01-08

Upstream does not make releases, using latest commit from master branch.
---
 .../version-management/gitstats/default.nix   | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/version-management/gitstats/default.nix

diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix
new file mode 100644
index 00000000000..64b6e2107f6
--- /dev/null
+++ b/pkgs/applications/version-management/gitstats/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }:
+
+stdenv.mkDerivation rec {
+  name = "gitstats-${version}";
+  version = "2016-01-08";
+
+  # upstream does not make releases
+  src = fetchzip {
+    url = "https://github.com/hoxu/gitstats/archive/55c5c285558c410bb35ebf421245d320ab9ee9fa.zip";
+    sha256 = "1bfcwhksylrpm88vyp33qjby4js31zcxy7w368dzjv4il3fh2i59";
+    name = name + "-src";
+  };
+
+  buildInputs = [ perl python ];
+
+  postPatch = ''
+    sed -e "s|gnuplot_cmd = .*|gnuplot_cmd = '${gnuplot}/bin/gnuplot'|" \
+        -e "s|\<wc\>|${coreutils}/bin/wc|g" \
+        -e "s|\<grep\>|${gnugrep}/bin/grep|g" \
+        -i gitstats
+  '';
+
+  buildPhase = ''
+    make man VERSION="${version}"
+  '';
+
+  installPhase = ''
+    make install PREFIX="$out" VERSION="${version}"
+    install -Dm644 doc/gitstats.1 "$out"/share/man/man1/gitstats.1
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://gitstats.sourceforge.net/;
+    description = "Git history statistics generator";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef6dc1f6f3b..414fd2ae30a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1730,6 +1730,8 @@ let
 
   gitlab-workhorse = callPackage ../applications/version-management/gitlab-workhorse { };
 
+  gitstats = callPackage ../applications/version-management/gitstats { };
+
   git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
 
   glusterfs = callPackage ../tools/filesystems/glusterfs { };

From 75e96d2c30cf0a138e98d5611aa80465d92d9e43 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Sun, 28 Feb 2016 16:03:47 +0100
Subject: [PATCH 086/338] avahi: fix test

Reflects module changes made by cdd7310a503481e3c40266be45b6b8256d95ecbd
---
 nixos/tests/avahi.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index a8369a6d1f8..976a770e887 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -5,18 +5,21 @@ import ./make-test.nix ({ pkgs, ... } : {
     maintainers = [ eelco chaoflow ];
   };
 
-  nodes = {
-    one =
-      { config, pkgs, ... }: {
-        services.avahi.enable = true;
-        services.avahi.nssmdns = true;
-      };
-
-    two =
-      { config, pkgs, ... }: {
-        services.avahi.enable = true;
-        services.avahi.nssmdns = true;
+  nodes = let
+    cfg = { config, pkgs, ... }: {
+      services.avahi = {
+        enable = true;
+        nssmdns = true;
+        publish.addresses = true;
+        publish.domain = true;
+        publish.enable = true;
+        publish.userServices = true;
+        publish.workstation = true;
       };
+    };
+  in {
+    one = cfg;
+    two = cfg;
   };
 
   testScript =

From ab746ec90238fe1b0c47054adef199c7a22d28c1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 28 Feb 2016 09:30:09 -0600
Subject: [PATCH 087/338] ibus: consolidate wrappers

---
 .../ibus-engines/ibus-anthy/default.nix       | 25 ++++++-----------
 .../ibus-engines/ibus-hangul/default.nix      | 15 +++--------
 .../ibus-engines/ibus-table/default.nix       | 27 +++----------------
 pkgs/tools/inputmethods/ibus/wrapper.nix      |  3 ++-
 4 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 2494c75a06c..50059e9477a 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchFromGitHub, makeWrapper, ibus, anthy, intltool
-, pkgconfig, glib, gobjectIntrospection
-, python3, pygobject3, gtk3, libtool, automake, autoconf
+{ stdenv, fetchurl, intltool, pkgconfig
+, anthy, ibus, glib, gobjectIntrospection, gtk3, python3, pygobject3
 }:
 
 stdenv.mkDerivation rec {
@@ -16,28 +15,20 @@ stdenv.mkDerivation rec {
     maintainers  = with maintainers; [ gebner ericsagnes ];
   };
 
-  preConfigure = "./autogen.sh --prefix=$out";
-
   configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t";
 
   buildInputs = [
-    makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection
-    python3 pygobject3 gtk3 libtool automake autoconf
+    anthy glib gobjectIntrospection gtk3 ibus python3 pygobject3
   ];
 
+  nativeBuildInputs = [ intltool pkgconfig ];
+
   postFixup = ''
     substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out
-    for file in "$out"/libexec/*; do # */
-      wrapProgram "$file" \
-        --prefix PYTHONPATH : $PYTHONPATH \
-        --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH:$out/lib/girepository-1.0
-    done
   '';
 
-  src = fetchFromGitHub {
-    owner  = "ibus";
-    repo   = "ibus-anthy";
-    rev    = version;
-    sha256 = "1laxwpnhgihv4dz5cgcz6d0a0880r93n7039ciz1m53hdzapwi4a";
+  src = fetchurl {
+    url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
+    sha256 = "1aj7vnfky7izl23xyjky78z3qas3q72l3kr8dnql2lnivsrb8q1y";
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index a5732f2a88b..1ada62580db 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, makeWrapper
-, intltool, pkgconfig
+{ stdenv, fetchurl, intltool, pkgconfig
 , gtk3, ibus, libhangul, librsvg, python3, pygobject3
 }:
 
@@ -9,20 +8,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz";
-    sha256 = null;
+    sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2";
   };
 
   buildInputs = [ gtk3 ibus libhangul python3 pygobject3 ];
 
-  nativeBuildInputs = [ intltool makeWrapper pkgconfig ];
-
-  postInstall = ''
-    wrapProgram $out/bin/ibus-setup-hangul \
-      --prefix PYTHONPATH : $PYTHONPATH \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
-      --prefix LD_LIBRARY_PATH : ${libhangul}/lib
-  '';
+  nativeBuildInputs = [ intltool pkgconfig ];
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 3d78a8ec69e..b44bea9119a 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, makeWrapper, ibus, pkgconfig, python3, pygobject3
-, gtk3, atk, dconf, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig
+, gtk3, dconf, gobjectIntrospection, ibus, python3, pygobject3 }:
 
 stdenv.mkDerivation rec {
   name = "ibus-table-${version}";
@@ -25,29 +25,10 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    gtk3 dconf gobjectIntrospection
-    ibus
-    pkgconfig
-    python3 pygobject3
+    dconf gtk3 gobjectIntrospection ibus python3 pygobject3
   ];
 
-  nativeBuildInputs = [ makeWrapper ];
-
-  preFixup = ''
-    for prog in "$out/bin"/*; do #*/
-      wrapProgram "$prog" \
-        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-        --prefix PYTHONPATH : "$PYTHONPATH" \
-        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
-        --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
-    done
-
-    for prog in "$out/libexec"/*; do #*/
-      wrapProgram "$prog" \
-        --prefix PYTHONPATH : "$PYTHONPATH" \
-        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0"
-    done
-  '';
+  nativeBuildInputs = [ pkgconfig ];
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix
index 72fbaef6604..632f46f81e9 100644
--- a/pkgs/tools/inputmethods/ibus/wrapper.nix
+++ b/pkgs/tools/inputmethods/ibus/wrapper.nix
@@ -1,5 +1,5 @@
 { stdenv, runCommand, makeWrapper, lndir
-, dconf, hicolor_icon_theme, ibus, plugins
+, dconf, hicolor_icon_theme, ibus, librsvg, plugins
 }:
 
 let
@@ -23,6 +23,7 @@ let
 
     for prog in ibus ibus-daemon ibus-setup; do
         wrapProgram "$out/bin/$prog" \
+          --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
           --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
           --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
           --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \

From 3a6b06f1be55fa7b3ea79c81898921d6c0a5e6bc Mon Sep 17 00:00:00 2001
From: Ozan Sener <ozan@ozansener.com>
Date: Sun, 28 Feb 2016 17:45:53 +0200
Subject: [PATCH 088/338] wring: init at 1.0.0

---
 pkgs/tools/text/wring/default.nix        | 26 ++++++++++++++++++++++++
 pkgs/tools/text/wring/node-packages.json |  1 +
 pkgs/tools/text/wring/node-packages.nix  | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 4 files changed, 53 insertions(+)
 create mode 100644 pkgs/tools/text/wring/default.nix
 create mode 100644 pkgs/tools/text/wring/node-packages.json
 create mode 100644 pkgs/tools/text/wring/node-packages.nix

diff --git a/pkgs/tools/text/wring/default.nix b/pkgs/tools/text/wring/default.nix
new file mode 100644
index 00000000000..038456f82c5
--- /dev/null
+++ b/pkgs/tools/text/wring/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, callPackage, makeWrapper, nodejs, phantomjs2 }:
+
+let
+  self = (
+    callPackage ../../../top-level/node-packages.nix {
+      generated = callPackage ./node-packages.nix { inherit self; };
+      overrides = {
+        "wring" = {
+          buildInputs = [ makeWrapper phantomjs2 ];
+
+          postInstall = ''
+            wrapProgram "$out/bin/wring" \
+              --prefix PATH : ${phantomjs2}/bin
+          '';
+
+          meta = with stdenv.lib; {
+            description = "Command-line tool for extracting content from webpages using CSS Selectors, XPath, and JS expressions";
+            homepage = https://github.com/osener/wring;
+            license = licenses.mit;
+            platforms = platforms.darwin ++ platforms.linux;
+            maintainers = [ maintainers.osener ];
+          };
+        };
+      };
+    });
+in self.wring
diff --git a/pkgs/tools/text/wring/node-packages.json b/pkgs/tools/text/wring/node-packages.json
new file mode 100644
index 00000000000..9c0e1712928
--- /dev/null
+++ b/pkgs/tools/text/wring/node-packages.json
@@ -0,0 +1 @@
+[ "wring" ]
diff --git a/pkgs/tools/text/wring/node-packages.nix b/pkgs/tools/text/wring/node-packages.nix
new file mode 100644
index 00000000000..b3761bd33cb
--- /dev/null
+++ b/pkgs/tools/text/wring/node-packages.nix
@@ -0,0 +1,24 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."wring"."*" =
+    self.by-version."wring"."1.0.0";
+  by-version."wring"."1.0.0" = self.buildNodePackage {
+    name = "wring-1.0.0";
+    version = "1.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wring/-/wring-1.0.0.tgz";
+      name = "wring-1.0.0.tgz";
+      sha1 = "3d8ebe894545bf0b42946fdc84c61e37ae657ce1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "wring" = self.by-version."wring"."1.0.0";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 414fd2ae30a..a91f320949a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3774,6 +3774,8 @@ let
 
   wml = callPackage ../development/web/wml { };
 
+  wring = callPackage ../tools/text/wring { };
+
   wrk = callPackage ../tools/networking/wrk { };
 
   wv = callPackage ../tools/misc/wv { };

From 850a1a332353e73cb624ce5574fa80e424eb6da1 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Sun, 28 Feb 2016 18:37:51 +0100
Subject: [PATCH 089/338] Fix "nix" stdenv (close #13554)

Broken by changes introduced in d96893647de5c519c458c1254f043f2d67d9b29c
---
 pkgs/stdenv/nix/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index 75e1c3814ed..30ac92837cb 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -18,10 +18,9 @@ import ../generic rec {
     nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr";
     nativeLibc = true;
     inherit stdenv;
-    binutils = pkgs.binutils;
+    inherit (pkgs) binutils coreutils gnugrep;
     cc = pkgs.gcc.cc;
     isGNU = true;
-    coreutils = pkgs.coreutils;
     shell = pkgs.bash + "/bin/sh";
   };
 

From 3747aef768dcb5f16351880daa4f086e88998da6 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 28 Feb 2016 19:11:34 +0000
Subject: [PATCH 090/338] linux-testing: 4.5-rc5 -> 4.5-rc6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 4b5cd20e831..9b0ec5c355a 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.5-rc5";
-  modDirVersion = "4.5.0-rc5";
+  version = "4.5-rc6";
+  modDirVersion = "4.5.0-rc6";
   extraMeta.branch = "4.5";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "06qlypnrlkckxhf3clq6l2d3kps7rwfw811sxapjbnhzjd75fcx8";
+    sha256 = "1cpbg6w0mzlxrc6crgqh5n4c8wxxr4yyikmk0bkpgsbr6qk3bydk";
   };
 
   features.iwlwifi = true;

From fe09260465f74ac9d8143b2773f66a89e9e1c9cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 19:17:52 +0000
Subject: [PATCH 091/338] travis-ci: fix /etc/nix/nix.conf population

---
 maintainers/scripts/travis-nox-review-pr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index 99cf769fcd7..157ccc08f62 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -11,7 +11,7 @@ if [[ $1 == nix ]]; then
 
     # Make sure we can use hydra's binary cache
     sudo mkdir /etc/nix
-    sudo echo "build-max-jobs = 4" > /etc/nix/nix.conf
+    sudo sh -c 'echo "build-max-jobs = 4" > /etc/nix/nix.conf'
 
     # Verify evaluation
     echo "=== Verifying that nixpkgs evaluates..."

From 5e5cd7c93c54c92783394c5b720f616113c77a37 Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS)" <kovirobi@gmail.com>
Date: Sun, 28 Feb 2016 13:48:54 +0000
Subject: [PATCH 092/338] inferno: 645 -> 785

---
 pkgs/applications/inferno/default.nix | 46 +++++++++++----------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix
index a0e2796a302..1a720f00300 100644
--- a/pkgs/applications/inferno/default.nix
+++ b/pkgs/applications/inferno/default.nix
@@ -1,55 +1,47 @@
-{ fetchurl, fetchhg, stdenv, xorg, gcc46, makeWrapper }:
+{ fetchurl, fetchhg, stdenv, xorg, makeWrapper }:
 
 stdenv.mkDerivation rec {
   # Inferno is a rolling release from a mercurial repository. For the verison number
   # of the package I'm using the mercurial commit number.
-  version = "645";
-  name = "inferno-${version}";
-
-  # The mercurial repository does not contain all the components needed for the
-  # runtime system. The 'base' package contains these. For this package I download
-  # the base, extract the elements required from that, and add them to the source
-  # pulled from the mercurial repository.
-  srcBase = fetchurl {
-    url = "http://www.vitanuova.com/dist/4e/inferno-20100120.tgz";
-    sha256 = "0msvy3iwl4n5k0ry0xiyysjkq0qsawmwn3hvg67hbi5y8g7f7l88";
-  };
+  rev = "785";
+  name = "inferno-${rev}";
+  host = "Linux";
+  objtype = "386";
 
   src = fetchhg {
-    url    = "https://inferno-os.googlecode.com/hg";
-    rev    = "7ab390b860ca";
-    sha256 = "09y0iclb3yy10gw1p0182sddg64xh60q2fx4ai7lxyfb65i76qbh";
+    url    = "https://bitbucket.org/inferno-os/inferno-os";
+    sha256 = "1b428ma9fi5skvfrxp91dr43a62kax89wmx7950ahc1cxyx90k7x";
   };
 
-  # Fails with gcc48 due to inferno triggering an optimisation issue with floating point.
-  buildInputs = [ gcc46 xorg.libX11 xorg.libXpm xorg.libXext xorg.xextproto makeWrapper ];
+  buildInputs = [ makeWrapper ] ++ (with xorg; [ libX11 libXpm libXext xextproto ]);
 
   infernoWrapper = ./inferno;
 
   configurePhase = ''
-    tar --strip-components=1 -xvf $srcBase inferno/fonts inferno/Mkdirs inferno/empties
-    sed -e 's@^ROOT=.*$@ROOT='"$out"'/share/inferno@g' -e 's@^OBJTYPE=.*$@OBJTYPE=386@g' -e 's@^SYSHOST=.*$@SYSHOST=Linux@g' -i mkconfig
-    mkdir prof
-    sh Mkdirs
+    sed -e 's@^ROOT=.*$@ROOT='"$out"'/share/inferno@g' \
+        -e 's@^OBJTYPE=.*$@OBJTYPE=${objtype}@g' \
+        -e 's@^SYSHOST=.*$@SYSHOST=${host}@g' \
+        -i mkconfig
+    # Get rid of an annoying warning
+    sed -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' \
+        -i ${host}/${objtype}/include/lib9.h
   '';
 
   buildPhase = ''
-    export PATH=$PATH:$out/share/inferno/Linux/386/bin
     mkdir -p $out/share/inferno
     cp -r . $out/share/inferno
     ./makemk.sh
+    export PATH=$PATH:$out/share/inferno/Linux/386/bin
     mk nuke
     mk
   '';
 
   installPhase = ''
+    # Installs executables in $out/share/inferno/${host}/${objtype}/bin
     mk install
     mkdir -p $out/bin
-    makeWrapper $out/share/inferno/Linux/386/bin/emu $out/bin/emu \
-      --suffix LD_LIBRARY_PATH ':' "${gcc46.cc}/lib" \
-      --suffix PATH ':' "$out/share/inferno/Linux/386/bin"
+    # Install start-up script
     makeWrapper $infernoWrapper $out/bin/inferno \
-      --suffix LD_LIBRARY_PATH ':' "${gcc46.cc}/lib" \
       --suffix PATH ':' "$out/share/inferno/Linux/386/bin" \
       --set INFERNO_ROOT "$out/share/inferno"
   '';
@@ -58,7 +50,7 @@ stdenv.mkDerivation rec {
     description = "A compact distributed operating system for building cross-platform distributed systems";
     homepage = "http://inferno-os.org/";
     license = stdenv.lib.licenses.gpl2;
-    maintainers = [ "Chris Double <chris.double@double.co.nz>" ];
+    maintainers = with stdenv.lib.maintainers; [ doublec kovirobi ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

From 29852f9d24e9368faad2a6c6709f66c32d706e4f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 28 Feb 2016 23:45:53 +0300
Subject: [PATCH 093/338] samba: fix evaluation

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09c707060b8..d014ba39340 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9848,7 +9848,6 @@ let
   });
 
   samba4Full = lowPrio (samba4.override {
-    enableKerberos  = true;
     enableInfiniband = true;
     enableLDAP = true;
     enablePrinting = true;

From b3faef0d9328446cf819fa897116aff28c10a9f9 Mon Sep 17 00:00:00 2001
From: Michael Ekstrand <md@ekstrandom.net>
Date: Sat, 27 Feb 2016 20:01:34 -0600
Subject: [PATCH 094/338] nano: build info manual (close #13527)

Make nano depend use texinfo, so that the built packages include the
info manual, and put it into a separate output.
---
 pkgs/applications/editors/nano/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 9c8238244ff..61818561f74 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl
 , ncurses
+, texinfo
 , gettext ? null
 , enableNls ? true
 , enableTiny ? false
@@ -16,7 +17,8 @@ stdenv.mkDerivation rec {
     url = "mirror://gnu/nano/${name}.tar.gz";
     sha256 = "1vl9bim56k1b4zwc3icxp46w6pn6gb042j1h4jlz1jklxxpkwcpz";
   };
-  buildInputs = [ ncurses ] ++ optional enableNls gettext;
+  buildInputs = [ ncurses texinfo ] ++ optional enableNls gettext;
+  outputs = [ "out" "info" ];
   configureFlags = ''
     --sysconfdir=/etc
     ${optionalString (!enableNls) "--disable-nls"}

From a93a2e23609dcc3fc20c84415219a872222d881f Mon Sep 17 00:00:00 2001
From: Scott Olson <scott@solson.me>
Date: Fri, 26 Feb 2016 23:22:34 -0600
Subject: [PATCH 095/338] fish: remove kbd dependency on Darwin

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

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 11eeb18661c..88754fd95a1 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -22,8 +22,10 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     sed -e "s|expr|${coreutils}/bin/expr|" \
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
         -e "s|if which unicode_start|if true|" \
         -e "s|unicode_start|${kbd}/bin/unicode_start|" \
+  '' + ''
         -i "$out/etc/fish/config.fish"
     sed -e "s|bc|${bc}/bin/bc|" \
         -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \

From da1f465b9472d448ce62ac46fce9f95cfe3f2575 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Mon, 22 Feb 2016 16:25:01 +0100
Subject: [PATCH 096/338] fish: fix hidden dependency on utillinux on Linux

---
 pkgs/shells/fish/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 11eeb18661c..510a9b6f44f 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, nettools, python, which, groff, gettext, man_db,
-  bc, libiconv, coreutils, gnused, kbd }:
+  bc, libiconv, coreutils, gnused, kbd, utillinux }:
 
 stdenv.mkDerivation rec {
   name = "fish-${version}";
@@ -43,6 +43,9 @@ stdenv.mkDerivation rec {
            "$out/share/fish/functions/prompt_pwd.fish"
     substituteInPlace "$out/share/fish/functions/fish_default_key_bindings.fish" \
       --replace "clear;" "${ncurses}/bin/clear;"
+  '' + stdenv.lib.optionalString stdenv.isLinux ''
+    substituteInPlace "$out/share/fish/functions/__fish_print_help.fish" \
+      --replace "| ul" "| ${utillinux}/bin/ul" 
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish"
     sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"

From 010271d47ac86e3a11117c6d5266d2cc77db9b47 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Sun, 28 Feb 2016 22:26:42 +0100
Subject: [PATCH 097/338] fish: fix hidden dependency on ${glibc}/bin/getent on
 Linux

---
 pkgs/shells/fish/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 510a9b6f44f..83c8e3c5816 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, nettools, python, which, groff, gettext, man_db,
-  bc, libiconv, coreutils, gnused, kbd, utillinux }:
+  bc, libiconv, coreutils, gnused, kbd, utillinux, glibc }:
 
 stdenv.mkDerivation rec {
   name = "fish-${version}";
@@ -46,6 +46,10 @@ stdenv.mkDerivation rec {
   '' + stdenv.lib.optionalString stdenv.isLinux ''
     substituteInPlace "$out/share/fish/functions/__fish_print_help.fish" \
       --replace "| ul" "| ${utillinux}/bin/ul" 
+
+    for cur in $out/share/fish/functions/*.fish; do
+      substituteInPlace "$cur" --replace "/usr/bin/getent" "${glibc}/bin/getent" 
+    done
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish"
     sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"

From baeedda1a5bef874362af879e0211a225b090670 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Sun, 28 Feb 2016 15:13:23 +0000
Subject: [PATCH 098/338] wtforms: Update to 2.1, make work on python3, disable
 tests for now.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 19c4ce2baab..23f2affa9c2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8935,15 +8935,19 @@ in modules // {
   };
 
   wtforms = buildPythonPackage rec {
-    version = "2.0.2";
+    version = "2.1";
     name = "wtforms-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/W/WTForms/WTForms-${version}.zip";
-      md5 = "613cf723ab40537705bec02733c78d95";
+      sha256 = "0vyl26y9cg409cfyj8rhqxazsdnd0jipgjw06civhrd53yyi1pzz";
     };
 
-    propagatedBuildInputs = with self; [ ordereddict Babel ];
+    # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet."
+    # This is fixed in master I believe but not yet in 2.1;
+    doCheck = false;
+
+    propagatedBuildInputs = with self; ([ Babel ] ++ (optionals isPy26 [ ordereddict ]));
 
     meta = {
       homepage = https://github.com/wtforms/wtforms;

From e1338ad121a636ed45c13a83a74ed5b35fb39b95 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sun, 28 Feb 2016 14:28:38 -0800
Subject: [PATCH 099/338] plexpass: 0.9.15.5.1712 -> 0.9.15.6.1714

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

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index aa27f6dd532..27cca6653b9 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -5,9 +5,9 @@
 
 let
   plexpkg = if enablePlexPass then {
-    version = "0.9.15.5.1712";
-    vsnHash = "ba5070a";
-    sha256 = "0nwcjlfbs8dacp6wzmga75hkx16ngyaqrmdhcx8vqvgwm8l31rxs";
+    version = "0.9.15.6.1714";
+    vsnHash = "7be11e1";
+    sha256 = "1kyk41qnbm8w5bvnisp3d99cf0r72wvlggfi9h4np7sq4p8ksa0g";
   } else {
     version = "0.9.15.3.1674";
     vsnHash = "f46e7e6";

From f91f3a4c5a7672ead2d9a414acb1415a8bfb8260 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sun, 28 Feb 2016 14:29:01 -0800
Subject: [PATCH 100/338] plex: 0.9.15.3.1674 -> 0.9.15.6.1714

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

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 27cca6653b9..799fea0fe50 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -9,9 +9,9 @@ let
     vsnHash = "7be11e1";
     sha256 = "1kyk41qnbm8w5bvnisp3d99cf0r72wvlggfi9h4np7sq4p8ksa0g";
   } else {
-    version = "0.9.15.3.1674";
-    vsnHash = "f46e7e6";
-    sha256 = "086njnjcmknmbn90mmvf60ls7q73g2m955yk621jjdngs4ybvm19";
+    version = "0.9.15.6.1714";
+    vsnHash = "7be11e1";
+    sha256 = "1kyk41qnbm8w5bvnisp3d99cf0r72wvlggfi9h4np7sq4p8ksa0g";
   };
 
 in stdenv.mkDerivation rec {

From edb8991a2cbc1339471353531f5e393997491d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 22:33:43 +0000
Subject: [PATCH 101/338] nixos: bump to 16.09

---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 1c1d9713015..8c9a730caf3 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-16.03
\ No newline at end of file
+16.09

From c483224c82c8e94324c03576e64c5dfbf16bd2f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 23:39:38 +0000
Subject: [PATCH 102/338] as always, no newline in .version

---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 8c9a730caf3..18fc8443eec 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-16.09
+16.09
\ No newline at end of file

From cad8957eabcbf73062226d28366fd446c15c8737 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sat, 20 Feb 2016 01:47:01 +0100
Subject: [PATCH 103/338] Add the tool "nixos-typecheck" that can check an
 option declaration to:

 - Enforce that an option declaration has a "defaultText" if and only if the
   type of the option derives from "package", "packageSet" or "nixpkgsConfig"
   and if a "default" attribute is defined.

 - Enforce that the value of the "example" attribute is wrapped with "literalExample"
   if the type of the option derives from "package", "packageSet" or "nixpkgsConfig".

 - Warn if a "defaultText" is defined in an option declaration if the type of
   the option does not derive from "package", "packageSet" or "nixpkgsConfig".

 - Warn if no "type" is defined in an option declaration.
---
 lib/modules.nix                               |  99 ++++++--
 lib/options.nix                               | 145 ++++++++++--
 lib/types.nix                                 | 221 ++++++++++++++----
 nixos/default.nix                             |   2 +
 nixos/doc/manual/default.nix                  |   6 +-
 .../development/option-declarations.xml       | 106 ++++++++-
 nixos/lib/eval-config.nix                     |  15 +-
 nixos/lib/typechecker.nix                     |  91 ++++++++
 nixos/modules/config/i18n.nix                 |   1 +
 nixos/modules/config/sysctl.nix               |   1 +
 nixos/modules/installer/tools/nixos-option.sh |   4 +-
 .../installer/tools/nixos-typecheck.sh        |  52 +++++
 nixos/modules/installer/tools/tools.nix       |   8 +-
 nixos/modules/misc/meta.nix                   |   1 +
 nixos/modules/misc/nixpkgs.nix                |  51 ++--
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/misc/gitlab.nix        |   3 +
 nixos/modules/services/misc/ihaskell.nix      |   4 +
 nixos/modules/services/misc/nixos-manual.nix  |   5 +-
 .../web-servers/apache-httpd/default.nix      |   3 +-
 .../services/x11/window-managers/xmonad.nix   |   3 +
 nixos/modules/system/boot/kernel.nix          |   1 +
 .../system/boot/systemd-unit-options.nix      |   5 +-
 nixos/release.nix                             |   2 +
 24 files changed, 703 insertions(+), 127 deletions(-)
 create mode 100644 nixos/lib/typechecker.nix
 create mode 100644 nixos/modules/installer/tools/nixos-typecheck.sh

diff --git a/lib/modules.nix b/lib/modules.nix
index 12ec7004d1e..d08dc9f85a2 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -23,8 +23,6 @@ rec {
                   specialArgs ? {}
                 , # This would be remove in the future, Prefer _module.args option instead.
                   args ? {}
-                , # This would be remove in the future, Prefer _module.check option instead.
-                  check ? true
                 }:
     let
       # This internal module declare internal options under the `_module'
@@ -45,9 +43,22 @@ rec {
           _module.check = mkOption {
             type = types.bool;
             internal = true;
-            default = check;
+            default = true;
             description = "Whether to check whether all option definitions have matching declarations.";
           };
+
+          _module.typeInference = mkOption {
+            type = types.nullOr types.str;
+            internal = true;
+            default = null; # TODO: Move away from 'null' after enough testing.
+            description = ''
+              Mode of type inferencing. Possible values are:
+              null = Disable type inferencing completely. Use 'types.unspecified' for every option without type definition.
+              "silent" = Try to infer type of option without type definition, but do not print anything.
+              "printUnspecified" = Try to infer type of option without type definition and print options for which no full type could be inferred.
+              "printAll" = Try to infer type of option without type definition and print all options without type definition.
+            '';
+          };
         };
 
         config = {
@@ -60,7 +71,7 @@ rec {
       # Note: the list of modules is reversed to maintain backward
       # compatibility with the old module system.  Not sure if this is
       # the most sensible policy.
-      options = mergeModules prefix (reverseList closed);
+      options = mergeModules (config._module) prefix (reverseList closed);
 
       # Traverse options and extract the option values into the final
       # config set.  At the same time, check whether all option
@@ -170,11 +181,11 @@ rec {
      At the same time, for each option declaration, it will merge the
      corresponding option definitions in all machines, returning them
      in the ‘value’ attribute of each option. */
-  mergeModules = prefix: modules:
-    mergeModules' prefix modules
+  mergeModules = _module: prefix: modules:
+    mergeModules' _module prefix modules
       (concatMap (m: map (config: { inherit (m) file; inherit config; }) (pushDownProperties m.config)) modules);
 
-  mergeModules' = prefix: options: configs:
+  mergeModules' = _module: prefix: options: configs:
     listToAttrs (map (name: {
       # We're descending into attribute ‘name’.
       inherit name;
@@ -200,8 +211,8 @@ rec {
             (filter (m: m.config ? ${name}) configs);
         in
           if nrOptions == length decls then
-            let opt = fixupOptionType loc (mergeOptionDecls loc decls);
-            in evalOptionValue loc opt defns'
+            let opt = fixupOptionType _module.typeInference loc (mergeOptionDecls loc decls);
+            in evalOptionValue _module loc opt defns'
           else if nrOptions != 0 then
             let
               firstOption = findFirst (m: isOption m.options) "" decls;
@@ -209,7 +220,7 @@ rec {
             in
               throw "The option `${showOption loc}' in `${firstOption.file}' is a prefix of options in `${firstNonOption.file}'."
           else
-            mergeModules' loc decls defns;
+            mergeModules' _module loc decls defns;
     }) (concatMap (m: attrNames m.options) options))
     // { _definedNames = map (m: { inherit (m) file; names = attrNames m.config; }) configs; };
 
@@ -258,7 +269,7 @@ rec {
 
   /* Merge all the definitions of an option to produce the final
      config value. */
-  evalOptionValue = loc: opt: defs:
+  evalOptionValue = _module: loc: opt: defs:
     let
       # Add in the default value for this option, if any.
       defs' =
@@ -270,7 +281,7 @@ rec {
         if opt.readOnly or false && length defs' > 1 then
           throw "The option `${showOption loc}' is read-only, but it's set multiple times."
         else
-          mergeDefinitions loc opt.type defs';
+          mergeDefinitions _module loc opt.type defs';
 
       # Check whether the option is defined, and apply the ‘apply’
       # function to the merged value.  This allows options to yield a
@@ -291,7 +302,7 @@ rec {
       };
 
   # Merge definitions of a value of a given type.
-  mergeDefinitions = loc: type: defs: rec {
+  mergeDefinitions = _module: loc: type: defs: rec {
     defsFinal =
       let
         # Process mkMerge and mkIf properties.
@@ -314,7 +325,7 @@ rec {
     mergedValue = foldl' (res: def:
       if type.check def.value then res
       else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.")
-      (type.merge loc defsFinal) defsFinal;
+      (type.merge _module loc defsFinal) defsFinal;
 
     isDefined = defsFinal != [];
 
@@ -412,7 +423,7 @@ rec {
   /* Hack for backward compatibility: convert options of type
      optionSet to options of type submodule.  FIXME: remove
      eventually. */
-  fixupOptionType = loc: opt:
+  fixupOptionType = typeInference: loc: opt:
     let
       options = opt.options or
         (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}.");
@@ -424,12 +435,66 @@ rec {
         else if tp.name == "list of option sets" then types.listOf (types.submodule options)
         else if tp.name == "null or option set" then types.nullOr (types.submodule options)
         else tp;
+
     in
       if opt.type.getSubModules or null == null
-      then opt // { type = f (opt.type or types.unspecified); }
+      then opt // { type = f (opt.type or (inferType typeInference loc opt)); }
       else opt // { type = opt.type.substSubModules opt.options; options = []; };
 
 
+  /* Function that tries to infer the type of an option from the default value of the option. */
+  inferType = mode: loc: opt:
+    let
+      doc = x: elemAt x 0;
+      type = x: elemAt x 1;
+      containsUnspecified = x: elemAt x 2;
+      inferType' = def:
+        if isDerivation def then [ "package" types.package false ]
+        else if isBool def then [ "bool" types.bool false ]
+        else if builtins.isString def then [ "str" types.str false ]
+        else if isInt def then [ "int" types.int false ]
+        else if isFunction def then [ "functionTo unspecified" (types.functionTo types.unspecified) true ]
+        else if isList def then
+                let nestedType = if (length def > 0) && (all (x: (type (inferType' x)) == (type (inferType' (head def)))) def)
+                                 then inferType' (head def)
+                                 else [ "unspecified" types.unspecified true ];
+                in [ "listOf ${doc nestedType}" (types.listOf (type nestedType)) (containsUnspecified nestedType) ]
+        else if isAttrs def then
+                let list = mapAttrsToList (_: v: v) (removeAttrs def ["_args"]);
+                    nestedType = if (length list > 0) && (all (x: (type (inferType' x)) == (type (inferType' (head list)))) list)
+                                 then inferType' (head list)
+                                 else [ "unspecified" types.unspecified true ];
+                in [ "attrsOf ${doc nestedType}" (types.attrsOf (type nestedType)) (containsUnspecified nestedType) ]
+        else [ "unspecified" types.unspecified true ];
+
+      inferDoc = x: ''
+        Inferring the type of "${showOption loc}" to "${doc x}".
+        Please verify the inferred type and define the type explicitely in ${showFiles opt.declarations}!
+      '';
+
+      inferredType = printMode:
+        let inferred = inferType' opt.default;
+        in if printMode == "silent" then type inferred
+           else if printMode == "printAll" then builtins.trace (inferDoc inferred) (type inferred)
+           else if printMode == "printUnspecified" && (containsUnspecified inferred) then builtins.trace (inferDoc inferred) (type inferred)
+           else type inferred;
+
+      noInferDoc = ''
+        Could not infer a type for "${showOption loc}", using "unspecified" instead.
+        Please define the type explicitely in ${showFiles opt.declarations}!
+      '';
+
+      hasDefault = (opt ? default) && !(opt ? defaultText);
+      isExternalVisible = (opt.visible or true) && !(opt.internal or false);
+    in
+
+    if isNull mode || !isExternalVisible
+    then types.unspecified
+    else if hasDefault
+         then inferredType mode /* Set to 'true' to see every type that is being inferred, not just those types that result in 'unspecified'. */
+         else if mode != "silent" then builtins.trace noInferDoc types.unspecified else types.unspecified;
+
+
   /* Properties. */
 
   mkIf = condition: content:
@@ -497,7 +562,7 @@ rec {
 
 
   /* Compatibility. */
-  fixMergeModules = modules: args: evalModules { inherit modules args; check = false; };
+  fixMergeModules = modules: args: evalModules { inherit args; modules = (modules ++ [{ _module.check = false; }]); };
 
 
   /* Return a module that causes a warning to be shown if the
diff --git a/lib/options.nix b/lib/options.nix
index 444ec37e6ea..d6876e18fe4 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -6,6 +6,7 @@ with import ./trivial.nix;
 with import ./lists.nix;
 with import ./attrsets.nix;
 with import ./strings.nix;
+with {inherit (import ./types.nix) types; };
 
 rec {
 
@@ -42,16 +43,17 @@ rec {
     description = "Sink for option definitions.";
     type = mkOptionType {
       name = "sink";
+      typerep = "(sink)";
       check = x: true;
-      merge = loc: defs: false;
+      merge = config: loc: defs: false;
     };
     apply = x: throw "Option value is not readable because the option is not declared.";
   } // attrs);
 
-  mergeDefaultOption = loc: defs:
+  mergeDefaultOption = config: loc: defs:
     let list = getValues defs; in
     if length list == 1 then head list
-    else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list)
+    else if all isFunction list then x: mergeDefaultOption config loc (map (f: f x) list)
     else if all isList list then concatLists list
     else if all isAttrs list then foldl' lib.mergeAttrs {} list
     else if all isBool list then foldl' lib.or false list
@@ -59,14 +61,14 @@ rec {
     else if all isInt list && all (x: x == head list) list then head list
     else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}.";
 
-  mergeOneOption = loc: defs:
+  mergeOneOption = config: loc: defs:
     if defs == [] then abort "This case should never happen."
     else if length defs != 1 then
       throw "The unique option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
     else (head defs).value;
 
   /* "Merge" option definitions by checking that they all have the same value. */
-  mergeEqualOption = loc: defs:
+  mergeEqualOption = config: loc: defs:
     if defs == [] then abort "This case should never happen."
     else foldl' (val: def:
       if def.value != val then
@@ -77,53 +79,154 @@ rec {
   getValues = map (x: x.value);
   getFiles = map (x: x.file);
 
-
   # Generate documentation template from the list of option declaration like
   # the set generated with filterOptionSets.
   optionAttrSetToDocList = optionAttrSetToDocList' [];
 
-  optionAttrSetToDocList' = prefix: options:
+  optionAttrSetToDocList' = prefix: internalModuleConfig: options:
     concatMap (opt:
       let
+        decls = filter (x: x != unknownModule) opt.declarations;
         docOption = rec {
           name = showOption opt.loc;
           description = opt.description or (throw "Option `${name}' has no description.");
-          declarations = filter (x: x != unknownModule) opt.declarations;
+          declarations = decls;
           internal = opt.internal or false;
           visible = opt.visible or true;
           readOnly = opt.readOnly or false;
           type = opt.type.name or null;
         }
-        // (if opt ? example then { example = scrubOptionValue opt.example; } else {})
-        // (if opt ? default then { default = scrubOptionValue opt.default; } else {})
+        // (if opt ? example then { example = detectDerivation decls opt.example; } else {})
+        // (if opt ? default then { default = detectDerivation decls opt.default; } else {})
         // (if opt ? defaultText then { default = opt.defaultText; } else {});
 
         subOptions =
-          let ss = opt.type.getSubOptions opt.loc;
-          in if ss != {} then optionAttrSetToDocList' opt.loc ss else [];
+          let ss = opt.type.getSubOptionsPrefixed opt.loc;
+          in if ss != {} then optionAttrSetToDocList' opt.loc internalModuleConfig (ss internalModuleConfig) else [];
       in
         [ docOption ] ++ subOptions) (collect isOption options);
 
+  # TODO: Use "extractOptionAttrSet" instead of "optionAttrSetToDocList'" to reduce the code size.
+  #       It should be a drop-in-replacement. But first, examine the impact on the evaluation time.
+  # optionAttrSetToDocList = extractOptionAttrSet true [];
 
-  /* This function recursively removes all derivation attributes from
-     `x' except for the `name' attribute.  This is to make the
-     generation of `options.xml' much more efficient: the XML
-     representation of derivations is very large (on the order of
-     megabytes) and is not actually used by the manual generator. */
-  scrubOptionValue = x:
+  # Generate a machine readable specification of the list of option declarations.
+  optionAttrSetToParseableSpecifications = extractOptionAttrSet false [];
+
+  extractOptionAttrSet = toDoc: prefix: internalModuleConfig: options:
+    concatMap (opt:
+      let
+        optionName = showOption opt.loc;
+
+        # Check if a type contains derivations, that is check if a type nests
+        # a 'package', 'packageSet' or 'nixpkgsConfig' type.
+        hasDerivation = any (t: elem t opt.type.nestedTypes) ((map (x: x.typerep) (with types; [package packageSet])) ++ ["(nixpkgsConfig)"]);
+
+        # Check if type is 'path' which can potentially contain a derivation.
+        maybeHiddenDerivation = any (t: elem t opt.type.nestedTypes) (map (x: x.typerep) (with types; [path]));
+
+        isDefaultValue = elem opt.default opt.type.defaultValues;
+
+        /* Enforce that the example attribute is wrapped with 'literalExample'
+           for every type that contains derivations. */
+        example =
+          if opt ? example
+          then (if hasDerivation
+                then (if isLiteralExample opt.example
+                      then { example = detectDerivation decls opt.example; }
+                      else throw "The attribute ${optionName}.example must be wrapped with 'literalExample' in ${concatStringsSep " and " decls}!")
+                else { example = detectDerivation decls opt.example; })
+          else {};
+
+        /* Enforce that the 'defaultText' attribute is defined for every option
+           that has a 'default' attribute that contains derivations. */
+        default =
+          if opt ? default
+          then (if hasDerivation
+                then (if isDefaultValue
+                      then { default = opt.default; }
+                      else (if opt ? defaultText
+                            then { default = literalExample (detectDerivation decls opt.defaultText); }
+                            else throw "The option ${optionName} requires a 'defaultText' attribute in ${concatStringsSep " and " decls}!"))
+                else (if opt ? defaultText
+                      then (if maybeHiddenDerivation
+                            then (if (let eval = builtins.tryEval (findDerivation opt.default); in eval.success && !eval.value)
+                                  then builtins.trace
+                                       "The attribute ${optionName}.defaultText might not be necessary in ${concatStringsSep " and " decls}!"
+                                       { default = literalExample (detectDerivation decls opt.defaultText); }
+                                  else { default = literalExample (detectDerivation decls opt.defaultText); })
+                            else builtins.trace
+                                 "The attribute ${optionName}.defaultText is not used and can be removed in ${concatStringsSep " and " decls}!"
+                                 { default = detectDerivation decls opt.default; })
+                      else { default = detectDerivation decls opt.default; }))
+          else {};
+
+        decls = filter (x: x != unknownModule) opt.declarations;
+
+        docOption = {
+          name = optionName;
+          description = opt.description or (throw "Option `${optionName}' has no description.");
+          declarations = decls;
+          internal = opt.internal or false;
+          visible = opt.visible or true;
+          readOnly = opt.readOnly or false;
+        } // example // default // subOptions // typeKeys;
+
+        typeKeys = if toDoc then { type = opt.type.name or null; } else { type = opt.type.typerep; keys = opt.loc; };
+
+        subOptions =
+          if toDoc
+          then {}
+          else let ss = opt.type.getSubOptions;
+               in if ss != {} then { suboptions = (extractOptionAttrSet false [] internalModuleConfig (ss internalModuleConfig)); } else {};
+
+        subOptionsDoc =
+          if toDoc
+          then let ss = opt.type.getSubOptionsPrefixed opt.loc;
+               in if ss != {} then extractOptionAttrSet true opt.loc internalModuleConfig (ss internalModuleConfig) else []
+          else [];
+      in
+        [ docOption ]  ++ subOptionsDoc )
+          (filter (opt: (opt.visible or true) && !(opt.internal or false)) (collect isOption options));
+
+
+  /* This function recursively checks for derivations within an
+     an expression, and throws an error if a derivation or a
+     store path is found. The function is used to ensure that no
+     derivation leaks from the 'default' or 'example' attributes
+     of an option.
+     This makes the generation of `options.xml' much more efficient:
+     the XML representation of derivations is very large (on the
+     order of megabytes) and is not actually used by the manual
+     generator. */
+  detectDerivation = decl: x:
     if isDerivation x then
-      { type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; }
-    else if isList x then map scrubOptionValue x
-    else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x ["_args"])
+      throw "Found unexpected derivation in '${x.name}' in '${concatStringsSep " and " decl}'!"
+    else if isString x && isStorePath x then
+      throw "Found unexpected store path in '${x.name}' in '${concatStringsSep " and " decl}'!"
+    else if isList x then map (detectDerivation decl) x
+    else if isAttrs x then mapAttrs (n: v: (detectDerivation decl) v) (removeAttrs x ["_args"])
     else x;
 
+  /* Same as detectDerivation, but returns a boolean instead of
+     throwing an exception. */
+  findDerivation = x:
+    if (isString x && isStorePath x) || isDerivation x then true
+    else if isList x then any findDerivation x
+    else if isAttrs x then any findDerivation (mapAttrsToList (_: v: v) (removeAttrs x ["_args"]))
+    else false;
+
+
 
   /* For use in the ‘example’ option attribute.  It causes the given
      text to be included verbatim in documentation.  This is necessary
      for example values that are not simple values, e.g.,
      functions. */
+  # TODO: A more general name would probably be "literalNix".
   literalExample = text: { _type = "literalExample"; inherit text; };
 
+  isLiteralExample = x: isAttrs x && hasAttr "_type" x && x._type == "literalExample";
+
 
   /* Helper functions. */
   showOption = concatStringsSep ".";
diff --git a/lib/types.nix b/lib/types.nix
index b4d29ac84d2..385103d4214 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -1,6 +1,8 @@
 # Definitions related to run-time type checking.  Used in particular
 # to type-check NixOS configurations.
 
+let lib = import ./default.nix; in
+
 with import ./lists.nix;
 with import ./attrsets.nix;
 with import ./options.nix;
@@ -21,6 +23,8 @@ rec {
   mkOptionType =
     { # Human-readable representation of the type.
       name
+    , # Parseable representation of the type.
+      typerep
     , # Function applied to each definition that should return true if
       # its type-correct, false otherwise.
       check ? (x: true)
@@ -31,40 +35,59 @@ rec {
       # definition values and locations (e.g. [ { file = "/foo.nix";
       # value = 1; } { file = "/bar.nix"; value = 2 } ]).
       merge ? mergeDefaultOption
-    , # Return a flat list of sub-options.  Used to generate
-      # documentation.
-      getSubOptions ? prefix: {}
+    , # Return list of sub-options.
+      getSubOptions ? {}
+    , # Same as 'getSubOptions', but with extra information about the
+      # location of the option which is used to generate documentation.
+      getSubOptionsPrefixed ? null
     , # List of modules if any, or null if none.
       getSubModules ? null
     , # Function for building the same option type  with a different list of
       # modules.
       substSubModules ? m: null
+    , # List of type representations (typerep) of all the elementary types
+      # that are nested within the type. For an elementary type the list is
+      # a singleton of the typerep of itself.
+      # NOTE: Must be specified for every container type!
+      nestedTypes ? null
+    , # List of all default values, and an empty list if no default value exists.
+      defaultValues ? []
     }:
     { _type = "option-type";
-      inherit name check merge getSubOptions getSubModules substSubModules;
+      inherit name typerep check merge getSubOptions getSubModules substSubModules defaultValues;
+      nestedTypes = if (isNull nestedTypes) then (singleton typerep) else nestedTypes;
+      getSubOptionsPrefixed = if (isNull getSubOptionsPrefixed) then (prefix: getSubOptions) else getSubOptionsPrefixed;
     };
 
 
   types = rec {
 
+    #
+    # Elementary types
+    #
+
     unspecified = mkOptionType {
       name = "unspecified";
+      typerep = "(unspecified)";
     };
 
     bool = mkOptionType {
       name = "boolean";
+      typerep = "(boolean)";
       check = isBool;
       merge = mergeEqualOption;
     };
 
     int = mkOptionType {
       name = "integer";
+      typerep = "(integer)";
       check = isInt;
       merge = mergeOneOption;
     };
 
     str = mkOptionType {
       name = "string";
+      typerep = "(string)";
       check = isString;
       merge = mergeOneOption;
     };
@@ -72,73 +95,111 @@ rec {
     # Merge multiple definitions by concatenating them (with the given
     # separator between the values).
     separatedString = sep: mkOptionType {
-      name = "string";
+      name = "string" + (optionalString (sep != "") " separated by ${sep}");
+      typerep = "(separatedString(${escape ["(" ")"] sep}))";
       check = isString;
-      merge = loc: defs: concatStringsSep sep (getValues defs);
+      merge = _module: loc: defs: concatStringsSep sep (getValues defs);
     };
 
-    lines = separatedString "\n";
-    commas = separatedString ",";
-    envVar = separatedString ":";
+    lines = separatedString "\n" // { typerep = "(lines)"; };
+    commas = separatedString "," // { typerep = "(commas)"; };
+    envVar = separatedString ":" // { typerep = "(envVar)"; };
 
     # Deprecated; should not be used because it quietly concatenates
     # strings, which is usually not what you want.
-    string = separatedString "";
+    string = separatedString "" // { typerep = "(string)"; };
 
     attrs = mkOptionType {
       name = "attribute set";
+      typerep = "(attrs)";
       check = isAttrs;
-      merge = loc: foldl' (res: def: mergeAttrs res def.value) {};
+      merge = _module: loc: foldl' (res: def: mergeAttrs res def.value) {};
     };
 
     # derivation is a reserved keyword.
     package = mkOptionType {
       name = "package";
+      typerep = "(package)";
       check = x: isDerivation x || isStorePath x;
-      merge = loc: defs:
-        let res = mergeOneOption loc defs;
+      merge = _module: loc: defs:
+        let res = mergeOneOption _module loc defs;
         in if isDerivation res then res else toDerivation res;
     };
 
+    # The correct type of packageSet would be:
+    # packageSet = attrsOf (either package packageSet)
+    # (Not sure if nix would allow to define a recursive type.)
+    # However, currently it is not possible to check that a packageSet actually
+    # contains packages (that is derivations). The check 'isDerivation' is too
+    # eager for the current implementation of the assertion mechanism and of the
+    # licenses control mechanism. That means it is not generally possible to go
+    # into the attribute set of packages to check that every attribute would
+    # evaluate to a derivation if the package would actually be evaluated. Maybe
+    # that restriction can be lifted in the future, but for now the content of
+    # the packageSet is not checked.
+    # TODO: The 'merge' function is copied from 'mergeDefaultOption' to keep
+    # backwards compatibility with the 'unspecified' type that was used for
+    # package sets previously. Maybe review if the merge function has to change.
+    packageSet = mkOptionType {
+      name = "derivation set";
+      typerep = "(packageSet)";
+      check = isAttrs;
+      merge = _module: loc: defs: foldl' mergeAttrs {} (map (x: x.value) defs);
+    };
+
     path = mkOptionType {
       name = "path";
+      typerep = "(path)";
       # Hacky: there is no ‘isPath’ primop.
       check = x: builtins.substring 0 1 (toString x) == "/";
       merge = mergeOneOption;
     };
 
+
+    #
+    # Container types
+    #
+
     # drop this in the future:
     list = builtins.trace "`types.list' is deprecated; use `types.listOf' instead" types.listOf;
 
     listOf = elemType: mkOptionType {
       name = "list of ${elemType.name}s";
+      typerep = "(listOf${elemType.typerep})";
       check = isList;
-      merge = loc: defs:
+      merge = _module: loc: defs:
         map (x: x.value) (filter (x: x ? value) (concatLists (imap (n: def: imap (m: def':
-            (mergeDefinitions
+            (mergeDefinitions _module
               (loc ++ ["[definition ${toString n}-entry ${toString m}]"])
               elemType
               [{ inherit (def) file; value = def'; }]
             ).optionalValue
           ) def.value) defs)));
-      getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
+      getSubOptions = elemType.getSubOptions;
+      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed (prefix ++ ["*"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: listOf (elemType.substSubModules m);
+      nestedTypes = elemType.nestedTypes;
+      defaultValues = [[]];
     };
 
     attrsOf = elemType: mkOptionType {
       name = "attribute set of ${elemType.name}s";
+      typerep = "(attrsOf${elemType.typerep})";
       check = isAttrs;
-      merge = loc: defs:
+      merge = _module: loc: defs:
         mapAttrs (n: v: v.value) (filterAttrs (n: v: v ? value) (zipAttrsWith (name: defs:
-            (mergeDefinitions (loc ++ [name]) elemType defs).optionalValue
+            (mergeDefinitions _module (loc ++ [name]) elemType defs).optionalValue
           )
           # Push down position info.
           (map (def: listToAttrs (mapAttrsToList (n: def':
             { name = n; value = { inherit (def) file; value = def'; }; }) def.value)) defs)));
-      getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]);
+      getSubOptions = elemType.getSubOptions;
+      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed (prefix ++ ["<name>"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: attrsOf (elemType.substSubModules m);
+      nestedTypes = elemType.nestedTypes;
+      defaultValues = [{}];
     };
 
     # List or attribute set of ...
@@ -159,18 +220,23 @@ rec {
         attrOnly = attrsOf elemType;
       in mkOptionType {
         name = "list or attribute set of ${elemType.name}s";
+        typerep = "(loaOf${elemType.typerep})";
         check = x: isList x || isAttrs x;
-        merge = loc: defs: attrOnly.merge loc (imap convertIfList defs);
-        getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);
+        merge = _module: loc: defs: attrOnly.merge _module loc (imap convertIfList defs);
+        getSubOptions = elemType.getSubOptions;
+        getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed (prefix ++ ["<name?>"]);
         getSubModules = elemType.getSubModules;
         substSubModules = m: loaOf (elemType.substSubModules m);
+        nestedTypes = elemType.nestedTypes;
+        defaultValues = [{} []];
       };
 
     # List or element of ...
     loeOf = elemType: mkOptionType {
       name = "element or list of ${elemType.name}s";
+      typerep = "(loeOf${elemType.typerep})";
       check = x: isList x || elemType.check x;
-      merge = loc: defs:
+      merge = _module: loc: defs:
         let
           defs' = filterOverrides defs;
           res = (head defs').value;
@@ -181,55 +247,41 @@ rec {
         else if !isString res then
           throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
         else res;
+      nestedTypes = elemType.nestedTypes;
+      defaultValues = [[]] ++ elemType.defaultValues;
     };
 
     uniq = elemType: mkOptionType {
-      inherit (elemType) name check;
+      inherit (elemType) check;
+      name = "unique ${elemType.name}";
+      typerep = "(uniq${elemType.typerep})";
       merge = mergeOneOption;
       getSubOptions = elemType.getSubOptions;
+      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed prefix;
       getSubModules = elemType.getSubModules;
       substSubModules = m: uniq (elemType.substSubModules m);
+      nestedTypes = elemType.nestedTypes;
+      defaultValues = elemType.defaultValues;
     };
 
     nullOr = elemType: mkOptionType {
       name = "null or ${elemType.name}";
+      typerep = "(nullOr${elemType.typerep})";
       check = x: x == null || elemType.check x;
-      merge = loc: defs:
+      merge = _module: loc: defs:
         let nrNulls = count (def: def.value == null) defs; in
         if nrNulls == length defs then null
         else if nrNulls != 0 then
           throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}."
-        else elemType.merge loc defs;
+        else elemType.merge _module loc defs;
       getSubOptions = elemType.getSubOptions;
+      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed prefix;
       getSubModules = elemType.getSubModules;
       substSubModules = m: nullOr (elemType.substSubModules m);
+      nestedTypes = elemType.nestedTypes;
+      defaultValues = [null] ++ elemType.defaultValues;
     };
 
-    submodule = opts:
-      let
-        opts' = toList opts;
-        inherit (import ./modules.nix) evalModules;
-      in
-      mkOptionType rec {
-        name = "submodule";
-        check = x: isAttrs x || isFunction x;
-        merge = loc: defs:
-          let
-            coerce = def: if isFunction def then def else { config = def; };
-            modules = opts' ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
-          in (evalModules {
-            inherit modules;
-            args.name = last loc;
-            prefix = loc;
-          }).config;
-        getSubOptions = prefix: (evalModules
-          { modules = opts'; inherit prefix;
-            # FIXME: hack to get shit to evaluate.
-            args = { name = ""; }; }).options;
-        getSubModules = opts';
-        substSubModules = m: submodule m;
-      };
-
     enum = values:
       let
         show = v:
@@ -239,23 +291,92 @@ rec {
       in
       mkOptionType {
         name = "one of ${concatMapStringsSep ", " show values}";
+        typerep = "(enum${concatMapStrings (x: "(${escape ["(" ")"] (builtins.toString x)})") values})";
         check = flip elem values;
         merge = mergeOneOption;
+        nestedTypes = [];
       };
 
     either = t1: t2: mkOptionType {
       name = "${t1.name} or ${t2.name}";
+      typerep = "(either${t1.typerep}${t2.typerep})";
       check = x: t1.check x || t2.check x;
       merge = mergeOneOption;
+      nestedTypes = t1.nestedTypes ++ t2.nestedTypes;
+      defaultValues = t1.defaultValues ++ t2.defaultValues;
     };
 
+
+    #
+    # Complex types
+    #
+
+    submodule = opts:
+      let
+        opts' = toList opts;
+        inherit (import ./modules.nix) evalModules;
+        filterVisible = filter (opt: (if opt ? visible then opt.visible else true) && (if opt ? internal then !opt.internal else true));
+      in
+      mkOptionType rec {
+        name = "submodule";
+        typerep = "(submodule)";
+        check = x: isAttrs x || isFunction x;
+        merge = _module: loc: defs:
+          let
+            internalModule = [ { inherit _module; } { _module.args.name = lib.mkForce (last loc); } ];
+            coerce = def: if isFunction def then def else { config = def; };
+            modules = opts' ++ internalModule ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
+          in (evalModules {
+            inherit modules;
+            prefix = loc;
+          }).config;
+        getSubOptions = getSubOptionsPrefixed [];
+        getSubOptionsPrefixed = prefix: _module:
+          let
+            # FIXME: hack to get shit to evaluate.
+            internalModule = [ { inherit _module; } { _module.args.name = lib.mkForce ""; } ];
+          in (evalModules {
+            modules = opts' ++ internalModule;
+            inherit prefix;
+          }).options;
+        getSubModules = opts';
+        substSubModules = m: submodule m;
+        nestedTypes = concatMap (opt: opt.type.nestedTypes) (collect (lib.isType "option") (getSubOptions {}));
+        defaultValues = [{}];
+      };
+
+
+
+    #
+    # Legacy types
+    #
+
     # Obsolete alternative to configOf.  It takes its option
     # declarations from the ‘options’ attribute of containing option
     # declaration.
     optionSet = mkOptionType {
       name = /* builtins.trace "types.optionSet is deprecated; use types.submodule instead" */ "option set";
+      typerep = "(optionSet)";
     };
 
+
+    # Try to remove module options of that type wherever possible.
+    # A module option taking a function can not be introspected and documented properly.
+    functionTo = resultType:
+      mkOptionType {
+        name = "function to ${resultType.name}";
+        typerep = "(function${resultType.typerep})";
+        check = builtins.isFunction;
+        merge = mergeOneOption;
+        nestedTypes = resultType.nestedTypes;
+        defaultValues = map (x: {...}:x) resultType.nestedTypes; # INFO: It seems as nix can't compare functions, yet.
+      };
+
+
+    #
+    # misc
+    #
+
     # Augment the given type with an additional type check function.
     addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; };
 
diff --git a/nixos/default.nix b/nixos/default.nix
index 5d69b79e13a..117a7b5d603 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -34,6 +34,8 @@ in
 
   system = eval.config.system.build.toplevel;
 
+  typechecker = eval.config.system.build.typechecker;
+
   vm = vmConfig.system.build.vm;
 
   vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 4ce6ea1c111..ea860149736 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, options, version, revision, extraSources ? [] }:
+{ pkgs, options, internalModule, version, revision, extraSources ? [] }:
 
 with pkgs;
 with pkgs.lib;
@@ -6,8 +6,10 @@ with pkgs.lib;
 let
 
   # Remove invisible and internal options.
-  optionsList = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList options);
+  optionsList = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList internalModule options);
 
+  # INFO: Please add 'defaultText' or 'literalExample' to the option
+  #       definition to avoid this substitution!
   # Replace functions by the string <function>
   substFunction = x:
     if builtins.isAttrs x then mapAttrs (name: substFunction) x
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index ea5d1241876..08bde4a275d 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -8,7 +8,7 @@
 
 <para>An option declaration specifies the name, type and description
 of a NixOS configuration option.  It is illegal to define an option
-that hasn’t been declared in any module.  A option declaration
+that has not been declared in any module. A option declaration
 generally looks like this:
 
 <programlisting>
@@ -145,6 +145,108 @@ options = {
 
 You can also create new types using the function
 <varname>mkOptionType</varname>.  See
-<filename>lib/types.nix</filename> in Nixpkgs for details.</para>
+<filename>lib/types.nix</filename> in Nixpkgs for details.
+
+An option declaration must follow the following rules:
+<itemizedlist mark='bullet'>
+
+  <listitem>
+    <para>A <varname>defaultText</varname> must be defined if and only if the type of the option
+    derives from <varname>package</varname>, <varname>packageSet</varname> or <varname>nixpkgsConfig
+    </varname>, and if and only if a <varname>default</varname> attribute is defined and if and only if
+    the value of the <varname>default</varname> attribute is not the default of the type of the
+    option declaration.
+
+    For example, a <varname>defaultText</varname> must be defined for
+<programlisting>
+type = types.listOf types.package;
+default = [ pkgs.foo; ];
+defaultText = "[ pkgs.foo; ]";
+</programlisting>.
+
+    But no <varname>defaultText</varname> must be defined for
+<programlisting>
+type = types.listOf types.package;
+default = [];
+</programlisting>,
+    as <varname>[]</varname> is the default of <varname>types.listOf types.package</varname>.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>A <varname>defaultText</varname> can be defined if the type of the option derives from
+    <varname>path</varname> and if a <varname>default</varname> attribute is defined.</para>
+  </listitem>
+
+  <listitem>
+    <para>The value of the <varname>example</varname> attribute must be wrapped with <varname>
+    literalExample</varname> if the type of the option derives from <varname>package</varname>,
+    <varname>packageSet</varname> or <varname>nixpkgsConfig</varname>.</para>
+  </listitem>
+
+  <listitem>
+    <para>The value of <varname>defaultText</varname> and <varname>literalExample</varname> must
+    be a string which contains a valid nix expression. The nix expression has to evaluate in
+    <code>{pkgs}: <replaceable>value</replaceable></code>.
+    For example:
+    <itemizedlist>
+      <listitem>
+	<para>A <varname>defaultText</varname> could, e.g., be:
+<programlisting>
+type = types.package;
+default = pkgs.foo;
+defaultText = "pkgs.foo";
+</programlisting>
+        But not <code>defaultText = "pkgs.foo;";</code>, as that
+        corresponds to <code>{pkgs}: pkgs.foo;</code>, which is an
+	invalid nix expression due to the ending with <varname>;</varname>.</para>
+      </listitem>
+    
+      <listitem>
+	<para>A <varname>literalExample</varname> could be used as, e.g.:
+<programlisting>
+type = types.path;
+example = literalExample "\"\${pkgs.bar}/bin/bar\"";
+</programlisting>
+        But not <code>literalExample "\${pkgs.bar}/bin/bar";</code>, as that corresponds
+	to <code>{pkgs}: ${pkgs.bar}/bin/bar</code>, which is an invalid nix expression
+	as the <varname>path</varname> is not a <varname>string</varname> anymore.</para>
+      </listitem>
+    </itemizedlist></para>
+  </listitem>
+
+  <listitem>
+    <para>The <varname>type</varname> attribute must be defined for every option declaration.</para>
+  </listitem>
+
+</itemizedlist>
+
+NixOS ships the tool <varname>nixos-typecheck</varname> that can check an option declaration to:
+
+<itemizedlist mark='bullet'>
+
+  <listitem>
+    <para>Enforce that an option declaration has a <varname>defaultText</varname> if and only if the
+    type of the option derives from <varname>package</varname>, <varname>packageSet</varname> or
+    <varname>nixpkgsConfig</varname> and if a <varname>default</varname> attribute is defined.</para>
+  </listitem>
+
+  <listitem>
+    <para>Enforce that the value of the <varname>example</varname> attribute is wrapped with <varname>
+    literalExample</varname> if the type of the option derives from <varname>package</varname>,
+    <varname>packageSet</varname> or <varname>nixpkgsConfig</varname>.</para>
+  </listitem>
+
+  <listitem>
+    <para>Warn if a <varname>defaultText</varname> is defined in an option declaration if the type of
+    the option does not derive from <varname>package</varname>, <varname>packageSet</varname> or
+    <varname>nixpkgsConfig</varname>.</para>
+  </listitem>
+
+  <listitem>
+    <para>Warn if no <varname>type</varname> is defined in an option declaration.</para>
+  </listitem>
+
+</itemizedlist></para>
 
 </section>
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index a87b285c5b7..79890e0add7 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -20,8 +20,13 @@
 , # !!! See comment about args in lib/modules.nix
   specialArgs ? {}
 , modules
+, # Pass through a configuration of the internal modules declared
+  # in lib/modules.nix.
+  _module ? {}
+, # !!! See comment about typeInference in lib/modules.nix
+  typeInference ? null
 , # !!! See comment about check in lib/modules.nix
-  check ? true
+  check ? null
 , prefix ? []
 , lib ? import ../../lib
 }:
@@ -41,13 +46,17 @@ let
     };
   };
 
+  internalModule = { _module = (_module
+                     // (if isNull check then {} else { inherit check; })
+                     // (if isNull typeInference then {} else { inherit typeInference; })); };
+
 in rec {
 
   # Merge the option definitions in all modules, forming the full
   # system configuration.
   inherit (lib.evalModules {
-    inherit prefix check;
-    modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
+    inherit prefix;
+    modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ] ++ [ internalModule ];
     args = extraArgs;
     specialArgs = { modulesPath = ../modules; } // specialArgs;
   }) config options;
diff --git a/nixos/lib/typechecker.nix b/nixos/lib/typechecker.nix
new file mode 100644
index 00000000000..b4d8277f8fe
--- /dev/null
+++ b/nixos/lib/typechecker.nix
@@ -0,0 +1,91 @@
+{ config, lib, pkgs, baseModules, ... }:
+
+with pkgs;
+with pkgs.lib;
+
+let
+
+  optionsSpecs = inferenceMode:
+    let
+      versionModule =
+        { system.nixosVersionSuffix = config.system.nixosVersionSuffix;
+          system.nixosRevision = config.system.nixosRevision;
+          nixpkgs.system = config.nixpkgs.system;
+        };
+
+      internalModule = { _module = config._module; } // (if isNull inferenceMode then {} else { _module.typeInference = mkForce inferenceMode; });
+
+      eval = evalModules {
+        modules = [ versionModule ] ++ baseModules ++ [ internalModule ];
+        args = (config._module.args) // { modules = [ ]; };
+      };
+
+      # Remove invisible and internal options.
+      optionsSpecs' = filter (opt: opt.visible && !opt.internal) (optionAttrSetToParseableSpecifications config._module eval.options);
+
+      # INFO: Please add 'defaultText' or 'literalExample' to the option
+      #       definition to avoid this exception!
+      substFunction = key: decls: x:
+        if builtins.isAttrs x then mapAttrs (name: substFunction key decls) x
+        else if builtins.isList x then map (substFunction key decls) x
+        else if builtins.isFunction x then throw "Found an unexpected <function> in ${key} declared in ${concatStringsSep " and " decls}."
+        else x;
+
+      prefix = toString ../..;
+
+      stripPrefix = fn:
+        if substring 0 (stringLength prefix) fn == prefix then
+          substring (stringLength prefix + 1) 1000 fn
+        else
+          fn;
+
+      # Clean up declaration sites to not refer to the NixOS source tree.
+      cleanupOptions = x: flip map x (opt:
+        let substFunction' = y: substFunction opt.name opt.declarations y;
+        in opt
+           // { declarations = map (fn: stripPrefix fn) opt.declarations; }
+           // optionalAttrs (opt ? example) { example = substFunction' opt.example; }
+           // optionalAttrs (opt ? default) { default = substFunction' opt.default; }
+           // optionalAttrs (opt ? type) { type = substFunction' opt.type; });
+
+    in
+      cleanupOptions optionsSpecs';
+
+in
+
+{
+
+  system.build.typechecker = {
+
+    # The NixOS options as machine readable specifications in JSON format.
+    specifications = stdenv.mkDerivation {
+      name = "options-specs-json";
+
+      buildCommand = ''
+        # Export list of options in different format.
+        dst=$out/share/doc/nixos
+        mkdir -p $dst
+
+        cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON
+          (listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs null)))))
+        } $dst/options-specs.json
+
+        mkdir -p $out/nix-support
+        echo "file json $dst/options-specs.json" >> $out/nix-support/hydra-build-products
+      ''; # */
+
+      meta.description = "List of NixOS options specifications in JSON format";
+    };
+
+    silent = listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs "silent"));
+    printAll = listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs "printAll"));
+    printUnspecified = listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs "printUnspecified"));
+
+  };
+
+}
+
+
+
+
+
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index b20fac6ad3e..3d21bda5734 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -64,6 +64,7 @@ in
       consoleKeyMap = mkOption {
         type = mkOptionType {
           name = "string or path";
+          typerep = "(stringOrPath)";
           check = t: (isString t || types.path.check t);
         };
 
diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index 61b02c5ffa6..174d7014ca8 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -6,6 +6,7 @@ let
 
   sysctlOption = mkOptionType {
     name = "sysctl option value";
+    typerep = "(sysctl)";
     check = val:
       let
         checkType = x: isBool x || isString x || isInt x || isNull x;
diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index 17c17d05e28..dd21dc71ee2 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -115,8 +115,8 @@ let
       let name = head attrsNames; rest = tail attrsNames; in
       if isOption result.options then
         walkOptions rest {
-          options = result.options.type.getSubOptions "";
-          opt = ''(\${result.opt}.type.getSubOptions "")'';
+          options = result.options.type.getSubOptionsPrefix "";
+          opt = ''(\${result.opt}.type.getSubOptionsPrefix "")'';
           cfg = ''\${result.cfg}."\${name}"'';
         }
       else
diff --git a/nixos/modules/installer/tools/nixos-typecheck.sh b/nixos/modules/installer/tools/nixos-typecheck.sh
new file mode 100644
index 00000000000..f9557be0c50
--- /dev/null
+++ b/nixos/modules/installer/tools/nixos-typecheck.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+#! @shell@
+
+if [ -x "@shell@" ]; then export SHELL="@shell@"; fi;
+
+set -e
+
+showSyntax() {
+cat >&1 << EOF
+nixos-typecheck
+usage:
+  nixos-typecheck [action] [args]
+where:
+  action = silent | printAll | printUnspecified | getSpecs
+    with default action: printUnspecified
+  args = any argument supported by nix-build
+EOF
+}
+
+
+# Parse the command line.
+extraArgs=()
+action=printUnspecified
+
+while [ "$#" -gt 0 ]; do
+    i="$1"; shift 1
+    case "$i" in
+      --help)
+        showSyntax
+        ;;
+      silent|printAll|printUnspecified|getSpecs)
+        action="$i"
+        ;;
+      *)
+        extraArgs="$extraArgs $i"
+        ;;
+    esac
+done
+
+
+if [ "$action" = silent ]; then
+    nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.silent $extraArgs
+elif [ "$action" = printAll ]; then
+    nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.printAll $extraArgs
+elif [ "$action" = printUnspecified ]; then
+    nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.printUnspecified $extraArgs
+elif [ "$action" = getSpecs ]; then
+    ln -s $(nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.specifications $extraArgs)/share/doc/nixos/options-specs.json specifications.json
+else
+    showSyntax
+    exit 1
+fi
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 9ac3b7a5b16..69bd0d26b77 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -54,6 +54,11 @@ let
     inherit (config.system) nixosVersion nixosCodeName nixosRevision;
   };
 
+  nixos-typecheck = makeProg {
+    name = "nixos-typecheck";
+    src = ./nixos-typecheck.sh;
+  };
+
 in
 
 {
@@ -67,10 +72,11 @@ in
         nixos-generate-config
         nixos-option
         nixos-version
+        nixos-typecheck
       ];
 
     system.build = {
-      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild;
+      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-typecheck;
     };
 
   };
diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix
index 22622706f2c..9a453172c63 100644
--- a/nixos/modules/misc/meta.nix
+++ b/nixos/modules/misc/meta.nix
@@ -5,6 +5,7 @@ with lib;
 let
   maintainer = mkOptionType {
     name = "maintainer";
+    typerep = "(maintainer)";
     check = email: elem email (attrValues lib.maintainers);
     merge = loc: defs: listToAttrs (singleton (nameValuePair (last defs).file (last defs).value));
   };
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 5eb38c510b4..511831ae5cd 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -3,32 +3,35 @@
 with lib;
 
 let
-  isConfig = x:
-    builtins.isAttrs x || builtins.isFunction x;
-
-  optCall = f: x:
-    if builtins.isFunction f
-    then f x
-    else f;
-
-  mergeConfig = lhs_: rhs_:
+  nixpkgsConfig = pkgs:
     let
-      lhs = optCall lhs_ { inherit pkgs; };
-      rhs = optCall rhs_ { inherit pkgs; };
+      isConfig = x:
+        builtins.isAttrs x || builtins.isFunction x;
+
+      optCall = f: x:
+        if builtins.isFunction f
+        then f x
+        else f;
+
+      mergeConfig = lhs_: rhs_:
+        let
+          lhs = optCall lhs_ { inherit pkgs; };
+          rhs = optCall rhs_ { inherit pkgs; };
+        in
+        lhs // rhs //
+        optionalAttrs (lhs ? packageOverrides) {
+          packageOverrides = pkgs:
+            optCall lhs.packageOverrides pkgs //
+            optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
+        };
     in
-    lhs // rhs //
-    optionalAttrs (lhs ? packageOverrides) {
-      packageOverrides = pkgs:
-        optCall lhs.packageOverrides pkgs //
-        optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
+    mkOptionType {
+      name = "nixpkgs config";
+      typerep = "(nixpkgsConfig)";
+      check = lib.traceValIfNot isConfig;
+      merge = config: args: fold (def: mergeConfig def.value) {};
+      defaultValues = [{}];
     };
-
-  configType = mkOptionType {
-    name = "nixpkgs config";
-    check = traceValIfNot isConfig;
-    merge = args: fold (def: mergeConfig def.value) {};
-  };
-
 in
 
 {
@@ -46,7 +49,7 @@ in
             };
           }
         '';
-      type = configType;
+      type = nixpkgsConfig pkgs;
       description = ''
         The configuration of the Nix Packages collection.  (For
         details, see the Nixpkgs documentation.)  It allows you to set
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ad1636e002d..88e01069b26 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1,4 +1,5 @@
 [
+  ../lib/typechecker.nix
   ./config/debug-info.nix
   ./config/fonts/corefonts.nix
   ./config/fonts/fontconfig-ultimate.nix
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index cc50bfbea53..e6ebcd6dc14 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -155,18 +155,21 @@ in {
       packages.gitlab = mkOption {
         type = types.package;
         default = pkgs.gitlab;
+        defaultText = "pkgs.gitlab";
         description = "Reference to the gitlab package";
       };
 
       packages.gitlab-shell = mkOption {
         type = types.package;
         default = pkgs.gitlab-shell;
+        defaultText = "pkgs.gitlab-shell";
         description = "Reference to the gitlab-shell package";
       };
 
       packages.gitlab-workhorse = mkOption {
         type = types.package;
         default = pkgs.gitlab-workhorse;
+        defaultText = "pkgs.gitlab-workhorse";
         description = "Reference to the gitlab-workhorse package";
       };
 
diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index d0e9b839e75..c177d68c8fe 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -15,12 +15,14 @@ in
   options = {
     services.ihaskell = {
       enable = mkOption {
+        type = lib.types.bool;
         default = false;
         example = true;
         description = "Autostart an IHaskell notebook service.";
       };
 
       haskellPackages = mkOption {
+        type = lib.types.packageSet;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
@@ -33,7 +35,9 @@ in
       };
 
       extraPackages = mkOption {
+        type = types.functionTo (types.listOf types.package);
         default = self: [];
+        defaultText = "self: []";
         example = literalExample ''
           haskellPackages: [
             haskellPackages.wreq
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 37ea339300d..7ba1c319add 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -17,6 +17,8 @@ let
       nixpkgs.system = config.nixpkgs.system;
     };
 
+  internalModule = { _module = config._module; };
+
   /* For the purpose of generating docs, evaluate options with each derivation
     in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
     It isn't perfect, but it seems to cover a vast majority of use cases.
@@ -29,7 +31,7 @@ let
     options =
       let
         scrubbedEval = evalModules {
-          modules = [ versionModule ] ++ baseModules;
+          modules = [ versionModule ] ++ baseModules ++ [ internalModule ];
           args = (config._module.args) // { modules = [ ]; };
           specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
         };
@@ -43,6 +45,7 @@ let
           )
           pkgSet;
       in scrubbedEval.options;
+    internalModule = config._module;
   };
 
   entry = "${manual.manual}/share/doc/nixos/index.html";
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 60ec49c9e66..8340287df45 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -48,8 +48,7 @@ let
           if svc ? function then svc.function
           else import (toString "${toString ./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix");
         config = (evalModules
-          { modules = [ { options = res.options; config = svc.config or svc; } ];
-            check = false;
+          { modules = [ { options = res.options; config = svc.config or svc; } ] ++ [ { _module.check = false; } ];
           }).config;
         defaults = {
           extraConfig = "";
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index 6af88d4f645..d8acb824f7d 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -16,6 +16,7 @@ in
     services.xserver.windowManager.xmonad = {
       enable = mkEnableOption "xmonad";
       haskellPackages = mkOption {
+        type = lib.types.packageSet;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
@@ -28,7 +29,9 @@ in
       };
 
       extraPackages = mkOption {
+        type = lib.types.functionTo (lib.types.listOf lib.types.package);
         default = self: [];
+        defaultText = "self: []";
         example = literalExample ''
           haskellPackages: [
             haskellPackages.xmonad-contrib
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index a6bbca9b30b..5b11a3fc61c 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -20,6 +20,7 @@ in
   options = {
 
     boot.kernelPackages = mkOption {
+      type = types.packageSet;
       default = pkgs.linuxPackages;
       # We don't want to evaluate all of linuxPackages for the manual
       # - some of it might not even evaluate correctly.
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index d4cab93b26b..16d0e098b8c 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -17,14 +17,15 @@ in rec {
 
   unitOption = mkOptionType {
     name = "systemd option";
-    merge = loc: defs:
+    typerep = "(systemdOption)";
+    merge = _module: loc: defs:
       let
         defs' = filterOverrides defs;
         defs'' = getValues defs';
       in
         if isList (head defs'')
         then concatLists defs''
-        else mergeOneOption loc defs';
+        else mergeOneOption _module loc defs';
   };
 
   sharedOptions = {
diff --git a/nixos/release.nix b/nixos/release.nix
index cfe152cc163..3fa1676c861 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -101,6 +101,8 @@ in rec {
   manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages);
   options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;
 
+  optionsSpecs = (buildFromConfig ({ pkgs, ... }: { _module.typeInference = "silent"; }) (config: config.system.build.typechecker.specifications)).x86_64-linux;
+
 
   # Build the initial ramdisk so Hydra can keep track of its size over time.
   initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);

From 2d6696fc0a23976498d0033d03382880e24e953d Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 29 Feb 2016 01:47:12 +0100
Subject: [PATCH 104/338] nixos-modules: Fixes related to "literalExample" and
 "defaultText".

---
 nixos/modules/services/logging/logstash.nix          | 6 +++---
 nixos/modules/services/misc/octoprint.nix            | 2 ++
 nixos/modules/services/networking/nsd.nix            | 4 ++--
 nixos/modules/services/networking/wpa_supplicant.nix | 9 +++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index d27456e59e8..e019e6c3f23 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -85,7 +85,7 @@ in
         type = types.lines;
         default = ''stdin { type => "example" }'';
         description = "Logstash input configuration.";
-        example = literalExample ''
+        example = ''
           # Read from journal
           pipe {
             command => "''${pkgs.systemd}/bin/journalctl -f -o json"
@@ -98,7 +98,7 @@ in
         type = types.lines;
         default = ''noop {}'';
         description = "logstash filter configuration.";
-        example = literalExample ''
+        example = ''
           if [type] == "syslog" {
             # Keep only relevant systemd fields
             # http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
@@ -114,7 +114,7 @@ in
 
       outputConfig = mkOption {
         type = types.lines;
-        default = literalExample ''stdout { debug => true debug_format => "json"}'';
+        default = ''stdout { debug => true debug_format => "json"}'';
         description = "Logstash output configuration.";
         example = ''
           redis { host => "localhost" data_type => "list" key => "logstash" codec => json }
diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index bb9dc5da2eb..150056b8ab0 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -62,7 +62,9 @@ in
       };
 
       plugins = mkOption {
+        type = types.functionTo (types.listOf types.package);
         default = plugins: [];
+        defaultText = "plugins: []";
         example = literalExample "plugins: [ m3d-fio ]";
         description = "Additional plugins.";
       };
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index b3f2730e672..ca08bb57895 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -559,7 +559,7 @@ in
             algorithm = "hmac-md5";
             keyFile = "/path/to/my/key";
           };
-        };
+        }
       '';
       description = ''
         Define your TSIG keys here.
@@ -719,7 +719,7 @@ in
               ...
             ''';
           };
-        };
+        }
       '';
       description = ''
         Define your zones here. Zones can cascade other zones and therefore
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 88345fdc11e..a8f445a2c73 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -78,10 +78,11 @@ in {
         '';
         default = {};
         example = literalExample ''
-          echelon = {
-            psk = "abcdefgh";
-          };
-          "free.wifi" = {};
+          { echelon = {
+              psk = "abcdefgh";
+            };
+            "free.wifi" = {};
+          }
         '';
       };
 

From bc52fa05080b40a2b60fd1a7ab20d4ea510a3807 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 29 Feb 2016 01:51:41 +0100
Subject: [PATCH 105/338] update maintainer's email address

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index df5dfced4b4..3bbb30ba3ce 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -330,7 +330,7 @@
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
   travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";
   trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";
-  tstrobel = "Thomas Strobel <ts468@cam.ac.uk>";
+  tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>";
   ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
   tv = "Tomislav Viljetić <tv@shackspace.de>";
   tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>";

From 818f2cd19fcb0d450e2b0847b3dd3598007ba38a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 28 Feb 2016 21:04:23 -0600
Subject: [PATCH 106/338] nethack: fix darwin support

---
 pkgs/games/nethack/default.nix | 40 +++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index 05c39fb2f2b..ce12196d3c3 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -6,6 +6,7 @@ let
     else abort "Unknown platform for NetHack";
   unixHint =
     if stdenv.isLinux then "linux"
+    else if stdenv.isDarwin then "macosx10.10"
     # We probably want something different for Darwin
     else "unix";
   userDir = "~/.config/nethack";
@@ -24,25 +25,30 @@ in stdenv.mkDerivation {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  configurePhase = ''
-    cd sys/${platform}
-    ${lib.optionalString (platform == "unix") ''
-      sed -e '/^ *cd /d' -i nethack.sh
-      ${lib.optionalString (unixHint == "linux") ''
-        sed \
-          -e 's,/bin/gzip,${gzip}/bin/gzip,g' \
-          -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \
-          -i hints/linux
-      ''}
-      sh setup.sh hints/${unixHint}
-    ''}
-    cd ../..
-
-    sed -e '/define CHDIR/d' -i include/config.h
+  patchPhase = ''
+    sed -e '/^ *cd /d' -i sys/unix/nethack.sh
     sed \
       -e 's/^YACC *=.*/YACC = bison -y/' \
       -e 's/^LEX *=.*/LEX = flex/' \
-      -i util/Makefile
+      -i sys/unix/Makefile.utl
+    sed \
+      -e 's,/bin/gzip,${gzip}/bin/gzip,g' \
+      -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \
+      -i sys/unix/hints/linux
+    sed \
+      -e 's,^CC=.*$,CC=cc,' \
+      -e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \
+      -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \
+      -i sys/unix/hints/macosx10.10
+    sed -e '/define CHDIR/d' -i include/config.h
+  '';
+
+  configurePhase = ''
+    cd sys/${platform}
+    ${lib.optionalString (platform == "unix") ''
+      sh setup.sh hints/${unixHint}
+    ''}
+    cd ../..
   '';
 
   postInstall = ''
@@ -61,7 +67,7 @@ in stdenv.mkDerivation {
       chmod -R +w ${userDir}
     fi
 
-    RUNDIR=\$(mktemp -td nethack.\$USER.XXXXX)
+    RUNDIR=\$(mktemp -d)
 
     cleanup() {
       rm -rf \$RUNDIR

From 70df5bf9ea1d56dbe7dfe0bd83ed5478882fda8f Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Mon, 29 Feb 2016 20:15:19 +1100
Subject: [PATCH 107/338] gup: 0.5.3 -> 0.5.4

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

diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index 0f1ecdcaa54..a907e6ace9e 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchgit, lib, python, which }:
 let
-  version = "0.5.3";
+  version = "0.5.4";
   src = fetchgit {
     url = "https://github.com/gfxmonk/gup.git";
-    rev = "55ffd8828ddc28a2a786b75422d672d6569f961f";
-    sha256 = "7c2abbf5d3814c6b84da0de1c91f9f7d299c2362cf091da96f6a68d8fffcb5ce";
+    rev = "b3980e529c860167b48e31634d2b479fc4d10274";
+    sha256 = "bb02ba0a7f1680ed5b9a8e8c9cc42aa07016329840f397d914b94744f9ed7c85";
   };
 in
 import ./build.nix

From 0294fc5bbda95f80d39a6242388787d6d3576701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 29 Feb 2016 10:53:35 +0100
Subject: [PATCH 108/338] haskellPackages: fix evaluation

It seems `self` was wanted instead of `pkgs` by the author of 3844206.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1b2a82f3dcb..4fa6d2f78bb 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -323,7 +323,7 @@ self: super: {
   github-types = dontCheck super.github-types;          # http://hydra.cryp.to/build/1114046/nixlog/1/raw
   hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw
   hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
-  hjsonschema = overrideCabal (super.hjsonschema.override { hjsonpointer = pkgs.hjsonpointer_0_2_0_4; }) (drv: { testTarget = "local"; });
+  hjsonschema = overrideCabal (super.hjsonschema.override { hjsonpointer = self.hjsonpointer_0_2_0_4; }) (drv: { testTarget = "local"; });
   hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; });
   marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
   network-transport-tcp = dontCheck super.network-transport-tcp;

From de8c119a4b1e4cac525c36613c8fdba54bb0af5d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 29 Feb 2016 10:02:59 +0000
Subject: [PATCH 109/338] redmine: fix compilation with ruby 2.3

Just bumped the JSON dependency manually to the one bundled with ruby 2.3
---
 pkgs/applications/version-management/redmine/Gemfile.lock | 2 +-
 pkgs/applications/version-management/redmine/Gemfile.nix  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock
index 7d83583c019..c660e73f4a0 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/Gemfile.lock
@@ -50,7 +50,7 @@ GEM
     jquery-rails (2.0.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.8.1)
+    json (1.8.3)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
diff --git a/pkgs/applications/version-management/redmine/Gemfile.nix b/pkgs/applications/version-management/redmine/Gemfile.nix
index a7339097b14..77adfba334e 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.nix
+++ b/pkgs/applications/version-management/redmine/Gemfile.nix
@@ -115,9 +115,9 @@ version = "2.0.3";
 }
 {
 name = "json";
-hash = "961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200";
-url = "http://rubygems.org/downloads/json-1.8.1.gem";
-version = "1.8.1";
+hash = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+url = "http://rubygems.org/downloads/json-1.8.3.gem";
+version = "1.8.3";
 }
 {
 name = "mail";

From 8625d2f8aa645971a19324b0d78770680ee0f845 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Sun, 28 Feb 2016 16:32:56 +0100
Subject: [PATCH 110/338] nodejs-5_x: 5.6.0 -> 5.7.0

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

diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index 948c4d10b30..c5bc3311503 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -7,7 +7,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "5.6.0";
+  version = "5.7.0";
 
   deps = {
     inherit openssl zlib libuv;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0zy2pq2xpw170lycs0518jjldy1d5vm5y1pjb4zcibvhb5gcrwis";
+    sha256 = "1n6jvvf3jfmv7fjd64c5jajjapsmc8gr6rlw113vgys55xmb8f13";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From 56e68d4d5f7db95370aa0be76dc8b107fb169904 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Feb 2016 11:39:11 +0100
Subject: [PATCH 111/338] Manual: rl-unstable.xml -> rl-1603.xml

---
 nixos/doc/manual/release-notes/release-notes.xml              | 2 +-
 .../doc/manual/release-notes/{rl-unstable.xml => rl-1603.xml} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename nixos/doc/manual/release-notes/{rl-unstable.xml => rl-1603.xml} (99%)

diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 6ed99315a7a..2beaab00800 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -9,7 +9,7 @@
 <para>This section lists the release notes for each stable version of NixOS
 and current unstable revision.</para>
 
-<xi:include href="rl-unstable.xml" />
+<xi:include href="rl-1603.xml" />
 <xi:include href="rl-1509.xml" />
 <xi:include href="rl-1412.xml" />
 <xi:include href="rl-1404.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-1603.xml
similarity index 99%
rename from nixos/doc/manual/release-notes/rl-unstable.xml
rename to nixos/doc/manual/release-notes/rl-1603.xml
index 5c2938794b9..0ede1a9ce8e 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -2,9 +2,9 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
-         xml:id="sec-release-unstable">
+         xml:id="sec-release-16.03">
 
-<title>Unstable</title>
+<title>Release 16.03 (“Emu”, 2016/03/??)</title>
 
 <para>In addition to numerous new and upgraded packages, this release
 has the following highlights:</para>

From fa4499cc8c8a4d31cf8acff941f3c752fc993bee Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 29 Feb 2016 11:06:02 +0000
Subject: [PATCH 112/338] pythonPackages.acme-tiny: fixup duplicate declaration

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 29ed4c07beb..ff2fe1e840a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -300,43 +300,6 @@ in modules // {
     };
   };
 
-  acme-tiny = buildPythonPackage rec {
-    name = "acme-tiny-${version}";
-    version = "20151229";
-    rev = "f61f72c212cea27f388eb4a26ede0d65035bdb53";
-
-    src = pkgs.fetchgit {
-      inherit rev;
-      url = "https://github.com/diafygi/acme-tiny.git";
-      sha256 = "dde59354e483bdff3dfd06717c094889ae673efb568e40b150b4695b0c539649";
-    };
-
-    # source doesn't have any python "packaging" as such
-    configurePhase = " ";
-    buildPhase = " ";
-    # the tests are... complex
-    doCheck = false;
-
-    patchPhase = ''
-      substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl}/bin/openssl"
-    '';
-
-    installPhase = ''
-      mkdir -p $out/${python.sitePackages}/
-      cp acme_tiny.py $out/${python.sitePackages}/
-      mkdir -p $out/bin
-      ln -s $out/${python.sitePackages}/acme_tiny.py $out/bin/acme_tiny
-      chmod +x $out/bin/acme_tiny
-    '';
-
-    meta = {
-      description = "A tiny script to issue and renew TLS certs from Let's Encrypt";
-      homepage = https://github.com/diafygi/acme-tiny;
-      license = licenses.mit;
-    };
-  };
-
-
   actdiag = buildPythonPackage rec {
     name = "actdiag-0.5.3";
 

From 22d7c08dc506f74803b7c61c6cbf156dfe844f02 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 28 Feb 2016 16:35:27 +0000
Subject: [PATCH 113/338] lib.trivial: add a new importJSON function

This is meant to be used by packages who often re-generate their inputs.

Producing valid JSON is easier than nix, and also garantees it's purity.
---
 lib/trivial.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index cda8aa08a20..9821e3c138d 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -75,4 +75,25 @@ rec {
   min = x: y: if x < y then x else y;
   max = x: y: if x > y then x else y;
 
+  /* Reads a JSON file. It is useful to import pure data into other nix
+     expressions.
+
+     Example:
+
+       mkDerivation {
+         src = fetchgit (importJSON ./repo.json)
+         #...
+       }
+
+       where repo.json contains:
+
+       {
+         "url": "git://some-domain/some/repo",
+         "rev": "265de7283488964f44f0257a8b4a055ad8af984d",
+         "sha256": "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"
+       }
+
+  */
+  importJSON = path:
+    builtins.fromJSON (builtins.readFile path);
 }

From ce549c85c8e67892fa23365d70e123e60a94d95b Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Mon, 29 Feb 2016 13:08:12 +0100
Subject: [PATCH 114/338] pharo-vm: stop trying to build on darwin

Building these pharo-vm sources on darwin may be possible but doesn't
make much sense because native darwin sources exist.
---
 pkgs/development/pharo/vm/build-vm.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index d18f64c9aba..3dfe913145c 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -88,6 +88,10 @@ stdenv.mkDerivation rec {
     homepage = http://pharo.org;
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.DamienCassou ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    # Pharo VM sources are packaged separately for darwin (OS X)
+    platforms = with stdenv.lib;
+                  intersectLists
+                    platforms.mesaPlatforms
+                    (subtractLists platforms.darwin platforms.unix);
   };
 }

From 756604cc08d801b8648c5d86a0c34f45f15e2f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 29 Feb 2016 13:08:33 +0000
Subject: [PATCH 115/338] transmission: 2.84 -> 2.90

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

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index e81ef7a4f9f..dbd23195a1c 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "2.84";
+  version = "2.90";
 in
 
 with { inherit (stdenv.lib) optional optionals optionalString; };
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://transmission.cachefly.net/transmission-${version}.tar.xz";
-    sha256 = "1sxr1magqb5s26yvr5yhs1f7bmir8gl09niafg64lhgfnhv1kz59";
+    sha256 = "1lig7y9fhmv2ajgq1isj9wqgpcgignzlczs3dy95ahb8h6pqrzv9";
   };
 
   buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools zlib ]

From b5ee64410d00e2cb43edcb1ad269b05c3e33e5ad Mon Sep 17 00:00:00 2001
From: Mitchell Pleune <mitchpleune@gmail.com>
Date: Sat, 27 Feb 2016 16:36:13 -0500
Subject: [PATCH 116/338] x11 service: bspwm limit sxhkd freqency

add '-f 100' as an argument to sxhkd to keep it from flooding bspwm

add SXHKD_SHELL=/bin/sh to help default to a faster shell than what may
be set in $SHELL (example: with zsh)
---
 nixos/modules/services/x11/window-managers/bspwm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix
index 8b4e91d25aa..1edf6ba4deb 100644
--- a/nixos/modules/services/x11/window-managers/bspwm.nix
+++ b/nixos/modules/services/x11/window-managers/bspwm.nix
@@ -15,7 +15,7 @@ in
     services.xserver.windowManager.session = singleton {
       name = "bspwm";
       start = "
-        ${pkgs.sxhkd}/bin/sxhkd &
+        SXHKD_SHELL=/bin/sh ${pkgs.sxhkd}/bin/sxhkd -f 100 &
         ${pkgs.bspwm}/bin/bspwm
       ";
     };

From 6d9cc5408909aa304cd8af25059b129c1652c26e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 29 Feb 2016 13:49:29 +0000
Subject: [PATCH 117/338] build-maven: use lib.importJSON

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

diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index ff91828eeca..ba85428ba8c 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -11,7 +11,7 @@
  *        the project.
  */
 infoFile: let
-  info = builtins.fromJSON (builtins.readFile infoFile);
+  info = lib.importJSON infoFile;
 
   script = writeText "build-maven-repository.sh" ''
     ${lib.concatStrings (map (dep: let

From 694a5ba291c37a324cc8076e456e2e9c85077029 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 29 Feb 2016 15:35:21 +0100
Subject: [PATCH 118/338] eprover: fix build on Darwin

---
 pkgs/applications/science/logic/eprover/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index 97fe7065b85..1f36858ae32 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -20,7 +20,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ which ];
 
-  preConfigure = "sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' -i Makefile.vars";
+  preConfigure = ''
+    sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' \
+    -e 's/^CC *= gcc$//' \
+    -i Makefile.vars
+  '';
 
   buildPhase = "make install";
 
@@ -34,6 +38,8 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = "Automated theorem prover for full first-order logic with equality";
+    homepage = http://www.eprover.org/;
+    license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.all;
   };

From aa9576bceb56d4fe2fb24e6fb47001817baeab34 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 8 Oct 2015 14:53:37 +0200
Subject: [PATCH 119/338] installer: add graphical GNOME iso

---
 .../installation-cd-graphical-gnome.nix       | 78 +++++++++++++++++++
 ...tallation-cd-graphical-kde-new-kernel.nix} |  2 +-
 ....nix => installation-cd-graphical-kde.nix} |  0
 .../services/x11/desktop-managers/gnome3.nix  | 57 +++++++++-----
 nixos/release.nix                             |  2 +-
 .../gnome-3/3.18/core/gnome-shell/default.nix |  3 +-
 .../gnome-3/3.18/core/nautilus/default.nix    |  3 +-
 pkgs/desktops/gnome-3/3.18/default.nix        |  3 +
 pkgs/desktops/gnome-3/3.18/installer.nix      | 15 ++++
 9 files changed, 140 insertions(+), 23 deletions(-)
 create mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
 rename nixos/modules/installer/cd-dvd/{installation-cd-graphical-new-kernel.nix => installation-cd-graphical-kde-new-kernel.nix} (60%)
 rename nixos/modules/installer/cd-dvd/{installation-cd-graphical.nix => installation-cd-graphical-kde.nix} (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.18/installer.nix

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
new file mode 100644
index 00000000000..5725938465f
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
@@ -0,0 +1,78 @@
+# This module defines a NixOS installation CD that contains X11 and
+# GNOME 3.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  imports = [ ./installation-cd-base.nix ];
+
+  services.xserver = {
+    enable = true;
+    # GDM doesn't start in virtual machines with ISO
+    displayManager.slim = {
+      enable = true;
+      defaultUser = "root";
+      autoLogin = true;
+    };
+    desktopManager.gnome3 = {
+      enable = true;
+      extraGSettingsOverrides = ''
+        [org.gnome.desktop.background]
+        show-desktop-icons=true
+
+        [org.gnome.nautilus.desktop]
+        trash-icon-visible=false
+        volumes-visible=false
+        home-icon-visible=false
+        network-icon-visible=false
+      '';
+
+      extraGSettingsOverridePackages = [ pkgs.gnome3.nautilus ];
+    };
+  };
+
+  environment.systemPackages =
+    [ # Include gparted for partitioning disks.
+      pkgs.gparted
+
+      # Include some editors.
+      pkgs.vim
+      pkgs.bvi # binary editor
+      pkgs.joe
+
+      pkgs.glxinfo
+    ];
+
+  # Don't start the X server by default.
+  services.xserver.autorun = mkForce false;
+
+  # Auto-login as root.
+  services.xserver.displayManager.gdm.autoLogin = {
+    enable = true;
+    user = "root";
+  };
+
+  system.activationScripts.installerDesktop = let
+    # Must be executable
+    desktopFile = pkgs.writeScript "nixos-manual.desktop" ''
+      [Desktop Entry]
+      Version=1.0
+      Type=Link
+      Name=NixOS Manual
+      URL=${config.system.build.manual.manual}/share/doc/nixos/index.html
+      Icon=system-help
+    '';
+
+  # use cp and chmod +x, we must be sure the apps are in the nix store though
+  in ''
+    mkdir -p /root/Desktop
+    ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
+    cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop
+    chmod a+rx /root/Desktop/gnome-terminal.desktop
+    cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
+    chmod a+rx /root/Desktop/gparted.desktop
+  '';
+
+}
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
similarity index 60%
rename from nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix
rename to nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
index 506b9292b01..a4bcd7079a4 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./installation-cd-graphical.nix ];
+  imports = [ ./installation-cd-graphical-kde.nix ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 }
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
similarity index 100%
rename from nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
rename to nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 4dd631d8751..be7700424bc 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -27,19 +27,24 @@ let
 
   nixos-gsettings-desktop-schemas = pkgs.stdenv.mkDerivation {
     name = "nixos-gsettings-desktop-schemas";
-    buildInputs = [ pkgs.nixos-artwork ];
     buildCommand = ''
-     mkdir -p $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas
-     cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0 $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/
-     chmod -R a+w $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas
-     cat - > $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
+     mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+     cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+
+     ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages}
+
+     chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
+     cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
        [org.gnome.desktop.background]
        picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'
 
        [org.gnome.desktop.screensaver]
        picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'
+
+       ${cfg.extraGSettingsOverrides}
      EOF
-     ${pkgs.glib}/bin/glib-compile-schemas $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/
+
+     ${pkgs.glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/
     '';
   };
 
@@ -47,19 +52,33 @@ in {
 
   options = {
 
-    services.xserver.desktopManager.gnome3.enable = mkOption {
-      default = false;
-      example = true;
-      description = "Enable Gnome 3 desktop manager.";
-    };
+    services.xserver.desktopManager.gnome3 = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable Gnome 3 desktop manager.";
+      };
 
-    services.xserver.desktopManager.gnome3.sessionPath = mkOption {
-      default = [];
-      example = literalExample "[ pkgs.gnome3.gpaste ]";
-      description = "Additional list of packages to be added to the session search path.
-                     Useful for gnome shell extensions or gsettings-conditionated autostart.";
-      apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ];
-    };
+      sessionPath = mkOption {
+        default = [];
+        example = literalExample "[ pkgs.gnome3.gpaste ]";
+        description = "Additional list of packages to be added to the session search path.
+                       Useful for gnome shell extensions or gsettings-conditionated autostart.";
+        apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ];
+      };
+
+      extraGSettingsOverrides = mkOption {
+        default = "";
+        type = types.lines;
+        description = "Additional gsettings overrides.";
+      };
+
+      extraGSettingsOverridePackages = mkOption {
+        default = [];
+        type = types.listOf types.path;
+        description = "List of packages for which gsettings are overridden.";
+      };
+    };  
 
     environment.gnome3.packageSet = mkOption {
       type = types.nullOr types.package;
@@ -130,7 +149,7 @@ in {
           export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
 
           # Override gsettings-desktop-schema
-          export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
+          export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
 
           # Let nautilus find extensions
           export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/
diff --git a/nixos/release.nix b/nixos/release.nix
index d9f3e46b27c..76ca15ef97f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -113,7 +113,7 @@ in rec {
   });
 
   iso_graphical = forAllSystems (system: makeIso {
-    module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
+    module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix;
     type = "graphical";
     inherit system;
   });
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix
index 899efc5443b..11d78cd6132 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
       --prefix PATH : "${unzip}/bin" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --suffix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
+      --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
 
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix
index f28e86d7bad..ff9f847d3cd 100644
--- a/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/nautilus" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" \
+      --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
   patches = [ ./extension_dir.patch ];
diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix
index f949eb1b208..8234d21f39e 100644
--- a/pkgs/desktops/gnome-3/3.18/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/default.nix
@@ -65,6 +65,9 @@ let
 # Simplify the nixos module and gnome packages
   defaultIconTheme = adwaita-icon-theme;
 
+# ISO installer
+  installerIso = callPackage ./installer.nix {};
+
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
   adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { };
diff --git a/pkgs/desktops/gnome-3/3.18/installer.nix b/pkgs/desktops/gnome-3/3.18/installer.nix
new file mode 100644
index 00000000000..e4d64ac9e88
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.18/installer.nix
@@ -0,0 +1,15 @@
+{ isoBaseName ? "nixos-graphical-gnome", system ? builtins.currentSystem
+, extraModules ? [] }:
+    
+let
+
+  module = ../../../../nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix;
+
+  config = (import ../../../../nixos/lib/eval-config.nix {
+    inherit system;
+    modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules;
+  }).config;
+
+in
+  config.system.build.isoImage
+

From 1685ad23674823ccef5071053522d852822cb56f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 29 Feb 2016 17:20:41 +0100
Subject: [PATCH 120/338] Update ECL

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

diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index 172283b19de..a04ec454cae 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -7,11 +7,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="ecl";
-    version="16.0.0";
+    version="16.1.2";
     name="${baseName}-${version}";
-    hash="0czh78z9i5b7jc241mq1h1gdscvdw5fbhfb0g9sn4rchwk1x8gil";
-    url="https://common-lisp.net/project/ecl/files/release/16.0.0/ecl-16.0.0.tgz";
-    sha256="0czh78z9i5b7jc241mq1h1gdscvdw5fbhfb0g9sn4rchwk1x8gil";
+    hash="16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d";
+    url="https://common-lisp.net/project/ecl/files/release/16.1.2/ecl-16.1.2.tgz";
+    sha256="16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d";
   };
   buildInputs = [
     libtool autoconf automake

From cef37d8de1b4ad19ac8184f96b3b85a82be1b5e9 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Mon, 29 Feb 2016 12:37:20 -0400
Subject: [PATCH 121/338] openiscsi: fix download url, add platforms

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

diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index e6682aec6c6..d004328a10b 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -2,13 +2,16 @@
 let
   pname = "open-iscsi-2.0-873";
 in stdenv.mkDerivation {
-  name = "${pname}";
+  name = pname;
   outputs = [ "out" "iscsistart" ];
 
   buildInputs = [ nukeReferences ];
   
   src = fetchurl {
-    url = "http://www.open-iscsi.org/bits/${pname}.tar.gz";
+    urls = [
+      "http://www.open-iscsi.org/bits/${pname}.tar.gz"
+      "http://pkgs.fedoraproject.org/repo/pkgs/iscsi-initiator-utils/${pname}.tar.gz/8b8316d7c9469149a6cc6234478347f7/${pname}.tar.gz"
+    ];
     sha256 = "1nbwmj48xzy45h52917jbvyqpsfg9zm49nm8941mc5x4gpwz5nbx";
   };
   
@@ -24,9 +27,10 @@ in stdenv.mkDerivation {
     nuke-refs $iscsistart/bin/iscsistart
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A high performance, transport independent, multi-platform implementation of RFC3720";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     homepage = http://www.open-iscsi.org;
+    platforms = platforms.linux;
   };
 }

From 9af50a2e7d735b4a024cb91e2bf720341675031f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 29 Feb 2016 08:31:58 +0100
Subject: [PATCH 122/338] kodi: add optional joystick support

---
 pkgs/applications/video/kodi/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 5761a443df8..c2b3914f850 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -7,7 +7,7 @@
 , libXt, libXmu, libXext, xextproto
 , libXinerama, libXrandr, randrproto
 , libXtst, libXfixes, fixesproto, systemd
-, SDL, SDL_image, SDL_mixer, alsaLib
+, SDL, SDL2, SDL_image, SDL_mixer, alsaLib
 , mesa, glew, fontconfig, freetype, ftgl
 , libjpeg, jasper, libpng, libtiff
 , libmpeg2, libsamplerate, libmad
@@ -26,6 +26,7 @@
 , rtmpdump ? null, rtmpSupport ? true
 , libvdpau ? null, vdpauSupport ? true
 , libpulseaudio ? null, pulseSupport ? true
+, joystickSupport ? true
 }:
 
 assert dbusSupport  -> dbus_libs != null;
@@ -78,7 +79,9 @@ in stdenv.mkDerivation rec {
     ++ lib.optional sambaSupport samba
     ++ lib.optional vdpauSupport libvdpau
     ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional rtmpSupport rtmpdump;
+    ++ lib.optional rtmpSupport rtmpdump
+    ++ lib.optional joystickSupport SDL2;
+
 
     dontUseCmakeConfigure = true;
 
@@ -98,7 +101,8 @@ in stdenv.mkDerivation rec {
     ++ lib.optional (!sambaSupport) "--disable-samba"
     ++ lib.optional vdpauSupport "--enable-vdpau"
     ++ lib.optional pulseSupport "--enable-pulse"
-    ++ lib.optional rtmpSupport "--enable-rtmp";
+    ++ lib.optional rtmpSupport "--enable-rtmp"
+    ++ lib.optional joystickSupport "--enable-joystick";
 
     postInstall = ''
       for p in $(ls $out/bin/) ; do
@@ -113,7 +117,8 @@ in stdenv.mkDerivation rec {
           --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libcec_platform}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libass}/lib" \
-          --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib"
+          --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib" \
+          --prefix LD_LIBRARY_PATH ":" "${SDL2}/lib"
       done
     '';
 

From a6d3b3f97ffe72f84be336aaee02b1be0a04c9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 29 Feb 2016 19:11:38 +0100
Subject: [PATCH 123/338] zotero: patch firefox xpi loading

---
 pkgs/applications/office/zotero/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index d74e1ac4b7c..5939478d695 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }:
+{ stdenv, fetchurl, fetchpatch, bash, firefox, perl, unzipNLS, xorg }:
 
 let
 
@@ -7,6 +7,14 @@ let
     sha256 = "02h2ja08v8as4fawj683rh5rmxsjf5d0qmvqa77i176nm20y5s7s";
   };
 
+  firefox' = stdenv.lib.overrideDerivation (firefox) (attrs: {
+    patches = [ (fetchpatch {
+      url = "https://hg.mozilla.org/releases/mozilla-beta/raw-rev/0558da46f20c";
+      sha256 = "08ibp7hny78x8ywfvrh56z90kf8fjpf04mibdlrwkw4f1vgm3fc3";
+      name = "fix-external-xpi-loader";
+    }) ];
+  });
+
   version = "4.0.28";
 
 in
@@ -21,7 +29,9 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ perl unzipNLS ];
 
-  inherit bash firefox;
+  inherit bash;
+
+  firefox = firefox';
 
   phases = "unpackPhase installPhase fixupPhase";
 

From b1801168e3eb819d20b301409135e7e7f6a45b7e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 29 Feb 2016 19:14:41 +0100
Subject: [PATCH 124/338] pixman: remove legacy patches

---
 pkgs/development/libraries/pixman/default.nix       |  2 +-
 pkgs/development/libraries/pixman/fix-clang36.patch | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 pkgs/development/libraries/pixman/fix-clang36.patch

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index 681e54a781b..dc378711d36 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir";
   };
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./fix-clang36.patch;
+  patches = [];
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = stdenv.lib.optional doCheck libpng;
diff --git a/pkgs/development/libraries/pixman/fix-clang36.patch b/pkgs/development/libraries/pixman/fix-clang36.patch
deleted file mode 100644
index 7db3c7ecaba..00000000000
--- a/pkgs/development/libraries/pixman/fix-clang36.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pixman/pixman-mmx.c	2014-04-24 08:34:14.000000000 +0400
-+++ b/pixman/pixman-mmx.c	2015-01-30 20:19:28.000000000 +0300
-@@ -89,7 +89,7 @@
-     return __A;
- }
- 
--#  ifdef __OPTIMIZE__
-+#  if defined(__OPTIMIZE__) && !(defined (__clang__) && defined(__clang_major__) && defined(__clang_minor__) && __clang_major__ == 3 && __clang_minor__ >= 6)
- extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
- _mm_shuffle_pi16 (__m64 __A, int8_t const __N)
- {

From cd897f657c28fafe9b018feb25ef5f2dbf691e48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 29 Feb 2016 19:36:51 +0100
Subject: [PATCH 125/338] cb2bib: init at 1.9.2

---
 pkgs/applications/office/cb2bib/default.nix | 24 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/office/cb2bib/default.nix

diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
new file mode 100644
index 00000000000..aa246d241ca
--- /dev/null
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, qt5Full, lzo, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = pname + "-" + version;
+  pname = "cb2bib";
+  version = "1.9.2";
+  src = fetchurl {
+    url = "http://www.molspaces.com/dl/progs/${name}.tar.gz";
+    sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin";
+  };
+  buildInputs = [ qt5Full lzo libX11 ];
+  QTDIR=qt5Full;
+  configurePhase =''
+    ./configure --prefix $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files";
+    homepage = http://www.molspaces.com/d_cb2bib-overview.php;
+    maintainers = with maintainers; [ edwtjo ];
+    license = licenses.gpl3;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index caa5c0ca8ad..b0e9b022f46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11549,6 +11549,10 @@ let
 
   cava = callPackage ../applications/audio/cava { };
 
+  cb2bib = callPackage ../applications/office/cb2bib {
+    inherit (xorg) libX11;
+  };
+
   cbatticon = callPackage ../applications/misc/cbatticon { };
 
   cbc = callPackage ../applications/science/math/cbc { };

From f3336a122acafd02fad80af31595c38dfd3133b6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 29 Feb 2016 12:46:34 -0600
Subject: [PATCH 126/338] openal: 1.16.0 -> 1.17.2

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

diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index 89dc32b61f2..ff29b2741fb 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -9,12 +9,12 @@ assert alsaSupport -> alsaLib != null;
 assert pulseSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
-  version = "1.16.0";
+  version = "1.17.2";
   name = "openal-soft-${version}";
 
   src = fetchurl {
     url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2";
-    sha256 = "0pqdykdclycfnk66v166srjrry936y39d1dz9wl92qz27wqwsg9g";
+    sha256 = "051k5fy8pk4fd9ha3qaqcv08xwbks09xl5qs4ijqq2qz5xaghhd3";
   };
 
   buildInputs = [ cmake ]

From 5bab623fb93567e9f3217e90c7e2679388ec86a3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 29 Feb 2016 19:15:36 +0100
Subject: [PATCH 127/338] nixos/tests/virtualbox: Split up subtests

Now subtests are separate derivations, because the individual tests do
not depend on state from previous test runs.

This has the advantage that it's easier to run individiual tests and
it's also easier to pinpoint individual tests that randomly fail.

I ran all of these tests locally and they still succeed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release.nix          |   7 +-
 nixos/tests/virtualbox.nix | 248 +++++++++++++++++++------------------
 2 files changed, 132 insertions(+), 123 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index cfe152cc163..497056c2274 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -299,7 +299,12 @@ in rec {
   tests.simple = callTest tests/simple.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};
   tests.udisks2 = callTest tests/udisks2.nix {};
-  tests.virtualbox = hydraJob (import tests/virtualbox.nix { system = "x86_64-linux"; });
+  tests.virtualbox = let
+    testsOnly = filterAttrs (const (t: t ? test));
+    vboxTests = testsOnly (import tests/virtualbox.nix {
+      system = "x86_64-linux";
+    });
+  in mapAttrs (const (t: hydraJob t.test)) vboxTests;
   tests.xfce = callTest tests/xfce.nix {};
   tests.bootBiosCdrom = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosCdrom);
   tests.bootBiosUsb = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosUsb);
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 01fcd15fd8b..da4c0bddc34 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -1,7 +1,9 @@
-{ debug ? false, ... } @ args:
+{ system ? builtins.currentSystem, debug ? false }:
 
-import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
 
+let
   testVMConfig = vmName: attrs: { config, pkgs, ... }: let
     guestAdditions = pkgs.linuxPackages.virtualboxGuestAdditions;
 
@@ -314,138 +316,140 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
     test2.vmScript = dhcpScript;
   };
 
-in {
-  name = "virtualbox";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ aszlig wkennington ];
-  };
+  mkVBoxTest = name: testScript: makeTest {
+    name = "virtualbox-${name}";
 
-  machine = { pkgs, lib, config, ... }: {
-    imports = let
-      mkVMConf = name: val: val.machine // { key = "${name}-config"; };
-      vmConfigs = mapAttrsToList mkVMConf vboxVMs;
-    in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs;
-    virtualisation.memorySize = 2048;
-    virtualisation.virtualbox.host.enable = true;
-    users.extraUsers.alice.extraGroups = let
-      inherit (config.virtualisation.virtualbox.host) enableHardening;
-    in lib.mkIf enableHardening (lib.singleton "vboxusers");
-  };
-
-  testScript = ''
-    sub ru ($) {
-      my $esc = $_[0] =~ s/'/'\\${"'"}'/gr;
-      return "su - alice -c '$esc'";
-    }
-
-    sub vbm {
-      $machine->succeed(ru("VBoxManage ".$_[0]));
+    machine = { lib, config, ... }: {
+      imports = let
+        mkVMConf = name: val: val.machine // { key = "${name}-config"; };
+        vmConfigs = mapAttrsToList mkVMConf vboxVMs;
+      in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs;
+      virtualisation.memorySize = 2048;
+      virtualisation.virtualbox.host.enable = true;
+      users.extraUsers.alice.extraGroups = let
+        inherit (config.virtualisation.virtualbox.host) enableHardening;
+      in lib.mkIf enableHardening (lib.singleton "vboxusers");
     };
 
-    ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vboxVMs)}
+    testScript = ''
+      sub ru ($) {
+        my $esc = $_[0] =~ s/'/'\\${"'"}'/gr;
+        return "su - alice -c '$esc'";
+      }
 
-    $machine->waitForX;
+      sub vbm {
+        $machine->succeed(ru("VBoxManage ".$_[0]));
+      };
 
-    ${mkLog "$HOME/.config/VirtualBox/VBoxSVC.log" "HOST-SVC"}
+      sub removeUUIDs {
+        return join("\n", grep { $_ !~ /^UUID:/ } split(/\n/, $_[0]))."\n";
+      }
 
+      ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vboxVMs)}
+
+      $machine->waitForX;
+
+      ${mkLog "$HOME/.config/VirtualBox/VBoxSVC.log" "HOST-SVC"}
+
+      ${testScript}
+    '';
+
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ aszlig wkennington ];
+    };
+  };
+
+in mapAttrs mkVBoxTest {
+  simple-gui = ''
     createVM_simple;
-
-    subtest "simple-gui", sub {
-      $machine->succeed(ru "VirtualBox &");
-      $machine->waitForWindow(qr/Oracle VM VirtualBox Manager/);
-      $machine->sleep(5);
-      $machine->screenshot("gui_manager_started");
+    $machine->succeed(ru "VirtualBox &");
+    $machine->waitForWindow(qr/Oracle VM VirtualBox Manager/);
+    $machine->sleep(5);
+    $machine->screenshot("gui_manager_started");
+    $machine->sendKeys("ret");
+    $machine->screenshot("gui_manager_sent_startup");
+    waitForStartup_simple (sub {
       $machine->sendKeys("ret");
-      $machine->screenshot("gui_manager_sent_startup");
-      waitForStartup_simple (sub {
-        $machine->sendKeys("ret");
-      });
-      $machine->screenshot("gui_started");
-      waitForVMBoot_simple;
-      $machine->screenshot("gui_booted");
-      shutdownVM_simple;
-      $machine->sleep(5);
-      $machine->screenshot("gui_stopped");
-      $machine->sendKeys("ctrl-q");
-      $machine->sleep(5);
-      $machine->screenshot("gui_manager_stopped");
-    };
+    });
+    $machine->screenshot("gui_started");
+    waitForVMBoot_simple;
+    $machine->screenshot("gui_booted");
+    shutdownVM_simple;
+    $machine->sleep(5);
+    $machine->screenshot("gui_stopped");
+    $machine->sendKeys("ctrl-q");
+    $machine->sleep(5);
+    $machine->screenshot("gui_manager_stopped");
+  '';
 
-    cleanup_simple;
+  simple-cli = ''
+    createVM_simple;
+    vbm("startvm simple");
+    waitForStartup_simple;
+    $machine->screenshot("cli_started");
+    waitForVMBoot_simple;
+    $machine->screenshot("cli_booted");
 
-    subtest "simple-cli", sub {
-      vbm("startvm simple");
-      waitForStartup_simple;
-      $machine->screenshot("cli_started");
-      waitForVMBoot_simple;
-      $machine->screenshot("cli_booted");
-      shutdownVM_simple;
-    };
-
-    subtest "privilege-escalation", sub {
+    $machine->nest("Checking for privilege escalation", sub {
       $machine->fail("test -e '/root/VirtualBox VMs'");
       $machine->fail("test -e '/root/.config/VirtualBox'");
       $machine->succeed("test -e '/home/alice/VirtualBox VMs'");
-    };
+    });
 
-    destroyVM_simple;
-
-    sub removeUUIDs {
-      return join("\n", grep { $_ !~ /^UUID:/ } split(/\n/, $_[0]))."\n";
-    }
-
-    subtest "host-usb-permissions", sub {
-      my $userUSB = removeUUIDs vbm("list usbhost");
-      print STDERR $userUSB;
-      my $rootUSB = removeUUIDs $machine->succeed("VBoxManage list usbhost");
-      print STDERR $rootUSB;
-
-      die "USB host devices differ for root and normal user"
-        if $userUSB ne $rootUSB;
-      die "No USB host devices found" if $userUSB =~ /<none>/;
-    };
-
-    subtest "systemd-detect-virt", sub {
-      createVM_detectvirt;
-      vbm("startvm detectvirt");
-      waitForStartup_detectvirt;
-      waitForVMBoot_detectvirt;
-      shutdownVM_detectvirt;
-      my $result = $machine->succeed("cat '$detectvirt_sharepath/result'");
-      chomp $result;
-      destroyVM_detectvirt;
-      die "systemd-detect-virt returned \"$result\" instead of \"oracle\""
-        if $result ne "oracle";
-    };
-
-    subtest "net-hostonlyif", sub {
-      createVM_test1;
-      createVM_test2;
-
-      vbm("startvm test1");
-      waitForStartup_test1;
-      waitForVMBoot_test1;
-
-      vbm("startvm test2");
-      waitForStartup_test2;
-      waitForVMBoot_test2;
-
-      $machine->screenshot("net_booted");
-
-      my $test1IP = waitForIP_test1 1;
-      my $test2IP = waitForIP_test2 1;
-
-      $machine->succeed("echo '$test2IP' | netcat -c '$test1IP' 1234");
-      $machine->succeed("echo '$test1IP' | netcat -c '$test2IP' 1234");
-
-      $machine->waitUntilSucceeds("netcat -c '$test1IP' 5678 >&2");
-      $machine->waitUntilSucceeds("netcat -c '$test2IP' 5678 >&2");
-
-      shutdownVM_test1;
-      shutdownVM_test2;
-
-      destroyVM_test1;
-      destroyVM_test2;
-    };
+    shutdownVM_simple;
   '';
-}) args
+
+  host-usb-permissions = ''
+    my $userUSB = removeUUIDs vbm("list usbhost");
+    print STDERR $userUSB;
+    my $rootUSB = removeUUIDs $machine->succeed("VBoxManage list usbhost");
+    print STDERR $rootUSB;
+
+    die "USB host devices differ for root and normal user"
+      if $userUSB ne $rootUSB;
+    die "No USB host devices found" if $userUSB =~ /<none>/;
+  '';
+
+  systemd-detect-virt = ''
+    createVM_detectvirt;
+    vbm("startvm detectvirt");
+    waitForStartup_detectvirt;
+    waitForVMBoot_detectvirt;
+    shutdownVM_detectvirt;
+    my $result = $machine->succeed("cat '$detectvirt_sharepath/result'");
+    chomp $result;
+    destroyVM_detectvirt;
+    die "systemd-detect-virt returned \"$result\" instead of \"oracle\""
+      if $result ne "oracle";
+  '';
+
+  net-hostonlyif = ''
+    createVM_test1;
+    createVM_test2;
+
+    vbm("startvm test1");
+    waitForStartup_test1;
+    waitForVMBoot_test1;
+
+    vbm("startvm test2");
+    waitForStartup_test2;
+    waitForVMBoot_test2;
+
+    $machine->screenshot("net_booted");
+
+    my $test1IP = waitForIP_test1 1;
+    my $test2IP = waitForIP_test2 1;
+
+    $machine->succeed("echo '$test2IP' | netcat -c '$test1IP' 1234");
+    $machine->succeed("echo '$test1IP' | netcat -c '$test2IP' 1234");
+
+    $machine->waitUntilSucceeds("netcat -c '$test1IP' 5678 >&2");
+    $machine->waitUntilSucceeds("netcat -c '$test2IP' 5678 >&2");
+
+    shutdownVM_test1;
+    shutdownVM_test2;
+
+    destroyVM_test1;
+    destroyVM_test2;
+  '';
+}

From abfc9e2afa90f30011832e42f25feb9815990200 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 20 Feb 2016 15:38:30 +0100
Subject: [PATCH 128/338] ocamlPackages.result: init at 1.1

---
 .../ocaml-modules/ocaml-result/default.nix    | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocaml-result/default.nix

diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix
new file mode 100644
index 00000000000..8b6e0966f7e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib }:
+
+let version = "1.1"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-result-${version}";
+
+  src = fetchFromGitHub {
+    owner = "janestreet";
+    repo = "result";
+    rev = "${version}";
+    sha256 = "05y07rxdbkaxsc8cy458y00gq05i8gp35hhwg1b757mam21ccxxz";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = https://github.com/janestreet/result;
+    description = "Compatibility Result module";
+    longDescription = ''
+      Projects that want to use the new result type defined in OCaml >= 4.03
+      while staying compatible with older version of OCaml should use the
+      Result module defined in this library.
+    '';
+    license = stdenv.lib.licenses.bsd3;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0e9b022f46..dc20729fc51 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4920,6 +4920,8 @@ let
 
     re2 = callPackage ../development/ocaml-modules/re2 { };
 
+    result = callPackage ../development/ocaml-modules/ocaml-result { };
+
     sequence = callPackage ../development/ocaml-modules/sequence { };
 
     tuntap = callPackage ../development/ocaml-modules/tuntap { };

From cac77dafc4809dbdab43b7a5d4dd0f046ffc8269 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 20 Feb 2016 15:39:08 +0100
Subject: [PATCH 129/338] ocamlPackages.tsdl: init at 0.9.0

---
 .../ocaml-modules/tsdl/default.nix            | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/tsdl/default.nix

diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix
new file mode 100644
index 00000000000..85ea80aeafe
--- /dev/null
+++ b/pkgs/development/ocaml-modules/tsdl/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, ocaml, findlib, ctypes, result, SDL2, pkgconfig, opam }:
+
+let
+  inherit (stdenv.lib) getVersion;
+
+  pname = "tsdl";
+  version = "0.9.0";
+  webpage = "http://erratique.ch/software/${pname}";
+
+in
+
+stdenv.mkDerivation {
+  name = "ocaml-${pname}-${version}";
+
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    sha256 = "02x0wsy5nxagxrh07yb2h4yqqy1bxryp2gwrylds0j6ybqsv4shm";
+  };
+
+  buildInputs = [ ocaml findlib result pkgconfig opam ];
+  propagatedBuildInputs = [ SDL2 ctypes ];
+
+  createFindlibDestdir = true;
+
+  unpackCmd = "tar xjf $src";
+
+  buildPhase = ''
+    # The following is done to avoid an additional dependency (ncurses)
+    # due to linking in the custom bytecode runtime. Instead, just
+    # compile directly into a native binary, even if it's just a
+    # temporary build product.
+    substituteInPlace myocamlbuild.ml \
+      --replace ".byte" ".native"
+
+    ocaml pkg/build.ml native=true native-dynlink=true
+  '';
+
+  installPhase = ''
+    opam-installer --script --prefix=$out ${pname}.install | sh
+    ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "${webpage}";
+    description = "Thin bindings to the cross-platform SDL library";
+    license = licenses.bsd3;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc20729fc51..e75686e4eb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5001,6 +5001,8 @@ let
 
     stringext = callPackage ../development/ocaml-modules/stringext { };
 
+    tsdl = callPackage ../development/ocaml-modules/tsdl { };
+
     twt = callPackage ../development/ocaml-modules/twt { };
 
     typerep = callPackage ../development/ocaml-modules/typerep { };

From 5f8311775c8832b1c5a88576cf58be05fd5c9070 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 29 Feb 2016 20:42:58 +0100
Subject: [PATCH 130/338] chromium: add StartupWMClass to desktop file. Fixes
 #12433

---
 pkgs/applications/networking/browsers/chromium/default.nix | 3 +++
 pkgs/build-support/make-desktopitem/default.nix            | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index c0c5e485e59..f9ed1f31e54 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -57,6 +57,9 @@ let
       "x-scheme-handler/unknown"
     ];
     categories = "Network;WebBrowser";
+    extraEntries = ''
+      StartupWMClass=chromium-browser
+    '';
   };
 
   suffix = if channel != "stable" then "-" + channel else "";
diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix
index 2f6c827d875..f5b4e5af93a 100644
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@@ -10,6 +10,7 @@
 , mimeType ? ""
 , categories ? "Application;Other;"
 , startupNotify ? null
+, extraEntries ? ""
 }:
 
 stdenv.mkDerivation {
@@ -27,6 +28,7 @@ stdenv.mkDerivation {
     GenericName=${genericName}
     MimeType=${mimeType}
     Categories=${categories}
+    ${extraEntries}
     ${if startupNotify == null then ''EOF'' else ''
     StartupNotify=${startupNotify}
     EOF''}

From 765c6c5f2cab86a760095f61b78bcedfdc437826 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Mon, 29 Feb 2016 21:03:27 +0100
Subject: [PATCH 131/338] sbcl: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 3212601e789..82348f35e30 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "18mgj1h9wqi0zq4k7y5r5fk10mlbpgh3796d3dac75bpxabg30nk";
+    sha256 = "0kzvwzz196ws9z20l8fm15m5gckhmkkc6lxvdib12mfvy80gcf6v";
   };
 
   patchPhase = ''

From de5fa8339f323b0714d0dc25896f8863fbf3429f Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 28 Feb 2016 16:50:59 +0100
Subject: [PATCH 132/338] dust: init at 0-91

---
 pkgs/development/interpreters/pixie/dust.nix  |  27 ++++
 .../pixie/make-paths-configurable.patch       | 122 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 3 files changed, 150 insertions(+)
 create mode 100644 pkgs/development/interpreters/pixie/dust.nix
 create mode 100644 pkgs/development/interpreters/pixie/make-paths-configurable.patch

diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix
new file mode 100644
index 00000000000..2478ecf53cb
--- /dev/null
+++ b/pkgs/development/interpreters/pixie/dust.nix
@@ -0,0 +1,27 @@
+{ stdenv, pixie, fetchgit }:
+
+stdenv.mkDerivation {
+  name = "dust-0-91";
+  src = fetchgit {
+    url = "https://github.com/pixie-lang/dust.git";
+    rev = "efe469661e749a71e86858fd006f61464810575a";
+    sha256 = "0krh7ynald3gqv9f17a4kfx7sx8i31l6j1fhd5k8b6m8cid7f9c1";
+  };
+  buildInputs = [ pixie ];
+  patches = [ ./make-paths-configurable.patch ];
+  configurePhase = ''
+    pixiePath="${pixie}/bin/pxi" \
+    basePath="$out/share/dust" \
+      substituteAll dust.in dust
+    chmod +x dust
+  '';
+# FIXME: AOT for dust
+#  buildPhase = ''
+#    find . -name "*.pxi" -exec pixie-vm -c {} \;
+#  '';
+  installPhase = ''
+    mkdir -p $out/bin $out/share/dust
+    cp -a src/ run.pxi $out/share/dust
+    mv dust $out/bin/dust
+  '';
+}
diff --git a/pkgs/development/interpreters/pixie/make-paths-configurable.patch b/pkgs/development/interpreters/pixie/make-paths-configurable.patch
new file mode 100644
index 00000000000..122ab6e2c07
--- /dev/null
+++ b/pkgs/development/interpreters/pixie/make-paths-configurable.patch
@@ -0,0 +1,122 @@
+From 0cbb82e606610d36e52c70d888995fbbf9b0d7c8 Mon Sep 17 00:00:00 2001
+From: Herwig Hochleitner <herwig@bendlas.net>
+Date: Sun, 28 Feb 2016 16:34:14 +0100
+Subject: [PATCH] make paths configurable
+
+---
+ dust    | 52 ----------------------------------------------------
+ dust.in | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 43 insertions(+), 52 deletions(-)
+ delete mode 100755 dust
+ create mode 100755 dust.in
+
+diff --git a/dust b/dust
+deleted file mode 100755
+index ffced9b..0000000
+--- a/dust
++++ /dev/null
+@@ -1,52 +0,0 @@
+-#!/usr/bin/env bash
+-
+-base_path=$0
+-if [ -L "$base_path" ]; then
+-    base_path=`readlink $base_path`
+-fi
+-base_path=`dirname $base_path`
+-
+-pixie_path=`which pixie-vm`
+-if [ -z "$pixie_path" ]; then
+-    echo "Error: 'pixie-vm' must be on your PATH"
+-    exit 1
+-fi
+-
+-function set_load_path() {
+-    load_path=""
+-    if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then
+-        load_path="`cat .load-path`"
+-    fi
+-}
+-
+-if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then
+-	echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."
+-	echo "To start you can run the following command:"
+-	echo "  pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"
+-	echo
+-fi
+-
+-set_load_path
+-run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"
+-
+-case $1 in
+-    ""|"repl")
+-        rlwrap_cmd=""
+-        if [ -n "`which rlwrap`" ]; then
+-            rlwrap_cmd="rlwrap -aignored -n"
+-        fi
+-        $rlwrap_cmd $pixie_path $load_path
+-        ;;
+-    "run")
+-        shift
+-        file=$1
+-        shift
+-        $pixie_path $load_path $file $@
+-        ;;
+-    -h|--help)
+-        $run_dust help
+-        ;;
+-    *)
+-        $run_dust $@
+-        ;;
+-esac
+diff --git a/dust.in b/dust.in
+new file mode 100755
+index 0000000..44a7fbd
+--- /dev/null
++++ b/dust.in
+@@ -0,0 +1,43 @@
++#!/usr/bin/env bash
++
++base_path=@basePath@
++pixie_path=@pixiePath@
++
++function set_load_path() {
++    load_path=""
++    if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then
++        load_path="`cat .load-path`"
++    fi
++}
++
++if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then
++	echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."
++	echo "To start you can run the following command:"
++	echo "  pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"
++	echo
++fi
++
++set_load_path
++run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"
++
++case $1 in
++    ""|"repl")
++        rlwrap_cmd=""
++        if [ -n "`which rlwrap`" ]; then
++            rlwrap_cmd="rlwrap -aignored -n"
++        fi
++        $rlwrap_cmd $pixie_path $load_path
++        ;;
++    "run")
++        shift
++        file=$1
++        shift
++        $pixie_path $load_path $file $@
++        ;;
++    -h|--help)
++        $run_dust help
++        ;;
++    *)
++        $run_dust $@
++        ;;
++esac
+-- 
+2.7.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74bba53647c..403a356a580 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5508,6 +5508,7 @@ let
   };
 
   pixie = callPackage ../development/interpreters/pixie { };
+  dust = callPackage ../development/interpreters/pixie/dust.nix { };
 
   bundix = callPackage ../development/interpreters/ruby/bundix {
     ruby = ruby_2_1_3;

From b82c8e3cd44c5ad97624dd21f9e7d431e7d283ff Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 29 Feb 2016 21:15:25 +0100
Subject: [PATCH 133/338] geolite-legacy 2016-02-25 -> 2016-02-29

---
 pkgs/data/misc/geolite-legacy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 59ae72d863c..c9b6eb8917f 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-02-25";
+  version = "2016-02-29";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     "0fnlznn04lpkkd7sy9r9kdl3fcp8ix7msdrncwgz26dh537ml32z";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "0gli3glr2w58qw2b4lwlp8cqbpfy27c3ryih3qi2bbilqy0r3ibl";
+    "10i4c8irvh9shbl3y0s0ffkm71vf3r290fvxjx20snqa558hkvib";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1k7a9b8hsman64jjk6y3nkhms89gkq1vk26n2xklw710f15jzcsf";
+    "1rvbjrj98pqj9w5ql5j49b3h40496g6aralpnz1gj21v6dfrd55n";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";

From 06a50554ad576aed9e9202628bdc291acd86e58a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 29 Feb 2016 22:51:30 +0100
Subject: [PATCH 134/338] simple-scan: 3.19.90 -> 3.19.91

---
 pkgs/applications/graphics/simple-scan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 658df21a654..7ee298f7281 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
-  version = "3.19.90";
+  version = "3.19.91";
 
   src = fetchurl {
-    sha256 = "16s8855sqrn5iiirpqva0mys8abfpzk9xryrb6rpjbynvx2lanmd";
+    sha256 = "1c5glf5vxgld41w4jxfqcv17q76qnh43fawpv33hncgh8d283xkf";
     url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--disable-packagekit" ];
 
   preBuild = ''
-    # Clean up stale generated .c files still referencing packagekit headers:
+    # Clean up stale .c files referencing packagekit headers as of 3.19.91:
     make clean
   '';
 

From 931fa7433d4ce63f205b13015912e26e06b94b9b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Feb 2016 22:05:57 +0100
Subject: [PATCH 135/338] checkstyle: 6.15 -> 6.16

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index f9131cf2af2..168e9ce95be 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.15";
+  version = "6.16";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "1bazjgfr1mq6qfg4nmack467zg7s4z8v7zfzw46d2dk04mv8y9b8";
+    sha256 = "0kmddfzn7p6fads6crw4gnahvi36xwqyw35i7a2lplrdp8dn9xdd";
   };
 
   installPhase = ''

From b56c1982bdb49381081ef004aa5ea83b2af63aed Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Feb 2016 22:08:01 +0100
Subject: [PATCH 136/338] libfilezilla: 0.4.0 -> 0.4.0.1

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

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 120b707af1e..d8e1c29875c 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.4.0";
+  version = "0.4.0.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2";
-    sha256 = "1l7rih17nzy75zf5h8mx5x38jbl9kxyxpr0ib6nn2615fw92xxgj";
+    sha256 = "1ldiyhjv4jg2jyj3d56mlgyj9lx0qkf1857wvsy51lp9aj96h0v0";
   };
 
   meta = with stdenv.lib; {

From 5ba31560d517a603c6f9b90539e809a7c9c21208 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Feb 2016 22:10:45 +0100
Subject: [PATCH 137/338] pdf2djvu: 0.9.3 -> 0.9.4

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

diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index 96106d06ca5..5f344628e37 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.3";
+  version = "0.9.4";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz";
-    sha256 = "0xvh9kzfym5vsma9bhr1w1lla31qdqfaqc9q25vqpl921shvfpnh";
+    sha256 = "1a1gwr6yzbiximbpgg4rc69dq8g3jmxwcbcwqk0fhfbgzj1j4w65";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];

From 5a0dbaabad6c3e8f30e12d0528a0f6b2f4ce99cf Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Feb 2016 22:21:55 +0100
Subject: [PATCH 138/338] parallel: 20160122 -> 20160222

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index c45c62cb3ad..d4c920f4acc 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20160122";
+  name = "parallel-20160222";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1xs8y8jh7wyjs27079xz0ja7xfi4dywz8d6hbkl44mafdnnfjfiy";
+    sha256 = "1sjmvinwr9j2a0jdk9y9nf2x4hhzcbl529slkwpz0vva0cwybywd";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From afd2d0588b500bd23caee3f3c99286832f1856ea Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Feb 2016 22:40:08 +0100
Subject: [PATCH 139/338] calibre: 2.51.0 -> 2.52.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 5e1bebf900c..5d936421d9e 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.51.0";
+  version = "2.52.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1rhpcxic4g2zyr5s3xn8dayyb45l9r8zyniaig8j7pl5kmsfjijn";
+    sha256 = "1la114vhkm73iv0rrzwws28ydiszl58q5y9d6aafn5sh16ph2aws";
   };
 
   inherit python;

From 90de261f3313fab8b82d33df149738be700f2426 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 29 Feb 2016 22:47:16 +0000
Subject: [PATCH 140/338] nix-prefetch-git: change the default output to JSON

As discussed on the mailing list. The nix output was short-lived so it's
probably okay to change it.
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 22a241d5e0e..2c9d61504ed 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -325,9 +325,9 @@ print_results() {
     fi
     if test -n "$hash"; then
         echo "{"
-        echo "  url = \"$url\";"
-        echo "  rev = \"$fullRev\";"
-        echo "  $hashType = \"$hash\";"
+        echo "  \"url\": \"$url\","
+        echo "  \"rev\": \"$fullRev\","
+        echo "  \"$hashType\": \"$hash\""
         echo "}"
     fi
 }

From f5a63f164b1e0b2abae61d6209c72c764f281735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= <val@codejam.info>
Date: Sun, 28 Feb 2016 12:12:01 -0500
Subject: [PATCH 141/338] go2nix: init at dd513f1

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1515d556b17..2fa00967294 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9210,6 +9210,8 @@ let
 
   goPackages = go15Packages;
 
+  go2nix = goPackages.go2nix.bin // { outputs = [ "bin" ]; };
+
   ### DEVELOPMENT / LISP MODULES
 
   asdf = callPackage ../development/lisp-modules/asdf {
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ddf18dd3b8f..3d4cb5ac1a8 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3546,10 +3546,10 @@ let
   };
 
   vcs = buildFromGitHub {
-    rev    = "1.0.0";
+    rev    = "1.4.0";
     owner  = "Masterminds";
     repo   = "vcs";
-    sha256 = "1qav4lf4ln5gs81714876q2cy9gfaxblbvawg3hxznbwakd9zmd8";
+    sha256 = "0590ww2av4407y7zy3bcmnr8i74fv00k9zzcxcpjxivl6qszna0d";
   };
 
   viper = buildFromGitHub {
@@ -3734,4 +3734,44 @@ let
     '';
     disabled = isGo14;
   };
+
+  template = buildFromGitHub {
+    rev = "14fd436dd20c3cc65242a9f396b61bfc8a3926fc";
+    owner = "alecthomas";
+    repo = "template";
+    sha256 = "19rzvvcgvr1z2wz9xpqsmlm8syizbpxjp5zbzgakvrqlajpbjvx2";
+  };
+
+  units = buildFromGitHub {
+    rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+    owner = "alecthomas";
+    repo = "units";
+    sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+  };
+
+  go-difflib = buildFromGitHub {
+    rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d";
+    owner = "pmezard";
+    repo = "go-difflib";
+    sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs";
+  };
+
+  kingpin = buildFromGitHub {
+    rev = "21551c2a6259a8145110ca80a36e25c9d7624032";
+    owner = "alecthomas";
+    repo = "kingpin";
+    sha256 = "1zhpqc4qxsw9lc1b4dwk5r42k9r702ihzrabs3mnsphvm9jx4l59";
+    propagatedBuildInputs = [ template units ];
+    goPackageAliases = [ "gopkg.in/alecthomas/kingpin.v2" ];
+  };
+
+  go2nix = buildFromGitHub rec {
+    rev = "dd513f1f1336a3cdceb9dd4be0f3c47a09929651";
+    owner = "kamilchm";
+    repo = "go2nix";
+    sha256 = "1ad7zcab5vjbw7a8ns0aspkblqqz0z96b7ak3zdx409rq7rlqdsj";
+    buildInputs = [ go-bindata.bin tools.bin vcs go-spew gls go-difflib assertions goconvey testify kingpin ];
+    preBuild = ''go generate ./...'';
+  };
+
 }; in self

From 269d0864b574b458f0f6d94f096376c913d049d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= <val@codejam.info>
Date: Sun, 28 Feb 2016 22:47:44 -0500
Subject: [PATCH 142/338] nix-prefetch-scripts: explicitly depend on Nix

Otherwise, a call to, for example, nix-prefetch-git, in a nix-shell --pure or
nix-build phase would result in an error such as:

    Switched to a new branch 'fetchgit'
    removing `.git'...
    /nix/store/7qvjji7kbd033nsyxlpiiiam61a44yz9-nix-prefetch-git/bin/.nix-prefetch-git-wrapped: line 374: nix-hash: command not found
---
 pkgs/tools/package-management/nix-prefetch-scripts/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index 5b98bcbbe12..e70659aff00 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -1,5 +1,5 @@
 { stdenv, makeWrapper, buildEnv,
-  git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils
+  git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils, nix
 }:
 
 let mkPrefetchScript = tool: src: deps:
@@ -18,6 +18,7 @@ let mkPrefetchScript = tool: src: deps:
         wrapArgs="$wrapArgs --prefix PATH : $dep/bin"
       done
       wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin"
+      wrapArgs="$wrapArgs --prefix PATH : ${nix}/bin" # For nix-hash
       wrapArgs="$wrapArgs --set HOME : /homeless-shelter"
       wrapProgram $out/bin/$name $wrapArgs
     '';

From b3337edd0b77f04d0abe4a29642a5e4fdb4ad692 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 29 Feb 2016 20:02:26 +0100
Subject: [PATCH 143/338] nixos/release.nix: Add a callSubTests function

This should de-clutter the various redundant lines of callTest's on
subtests so that every main test file should have only one line with a
callSubTests instead.

Overrides work the same way as callTest, except that if the system
attribute is explicitly specified we do not generate attributes for all
available systems.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra
---
 nixos/release.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 497056c2274..76d0ce90458 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -13,7 +13,25 @@ let
 
   forAllSystems = genAttrs supportedSystems;
 
-  callTest = fn: args: forAllSystems (system: hydraJob (import fn ({ inherit system; } // args)));
+  importTest = fn: args: system: import fn ({
+    inherit system;
+  } // args);
+
+  callTest = fn: args: forAllSystems (system: hydraJob (importTest fn args system));
+
+  callSubTests = fn: args: let
+    discover = attrs: let
+      subTests = filterAttrs (const (hasAttr "test")) attrs;
+    in mapAttrs (const (t: hydraJob t.test)) subTests;
+
+    discoverForSystem = system: mapAttrs (_: test: {
+      ${system} = test;
+    }) (discover (importTest fn args system));
+
+  # If the test is only for a particular system, use only the specified
+  # system instead of generating attributes for all available systems.
+  in if args ? system then discover (import fn args)
+     else foldAttrs (a: b: a // b) {} (map discoverForSystem supportedSystems);
 
   pkgs = import nixpkgs { system = "x86_64-linux"; };
 

From 2f2536b9354b296dbf12343d232e113d211704df Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 29 Feb 2016 20:06:55 +0100
Subject: [PATCH 144/338] nixos/tests/networking: Expose subtests via attrs

So far the networking test expression only generated a single test
depending on the passed "test" attribute. This makes it difficult to
autodiscover the subtests with our shiny new callSubTests function.

This change essentially doesn't change the behaviour of the subtests but
rather exposes them as an attribute set instead of relying on a
particular input argument.

The useNetworkd argument still exists however.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @wkennington
---
 nixos/tests/networking.nix | 799 +++++++++++++++++++------------------
 1 file changed, 402 insertions(+), 397 deletions(-)

diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 813d7c2bf51..d5a0a9b798f 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -1,406 +1,411 @@
-import ./make-test.nix ({ pkgs, networkd, test, ... }:
-  let
-    router = { config, pkgs, ... }:
-      with pkgs.lib;
-      let
-        vlanIfs = range 1 (length config.virtualisation.vlans);
-      in {
-        virtualisation.vlans = [ 1 2 3 ];
+{ system ? builtins.currentSystem, networkd }:
+
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
+
+let
+  router = { config, pkgs, ... }:
+    with pkgs.lib;
+    let
+      vlanIfs = range 1 (length config.virtualisation.vlans);
+    in {
+      virtualisation.vlans = [ 1 2 3 ];
+      networking = {
+        useDHCP = false;
+        useNetworkd = networkd;
+        firewall.allowPing = true;
+        interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n:
+          nameValuePair "eth${toString n}" {
+            ipAddress = "192.168.${toString n}.1";
+            prefixLength = 24;
+          })));
+      };
+      services.dhcpd = {
+        enable = true;
+        interfaces = map (n: "eth${toString n}") vlanIfs;
+        extraConfig = ''
+          option subnet-mask 255.255.255.0;
+        '' + flip concatMapStrings vlanIfs (n: ''
+          subnet 192.168.${toString n}.0 netmask 255.255.255.0 {
+            option broadcast-address 192.168.${toString n}.255;
+            option routers 192.168.${toString n}.1;
+            range 192.168.${toString n}.2 192.168.${toString n}.254;
+          }
+        '');
+      };
+    };
+
+  testCases = {
+    loopback = {
+      name = "Loopback";
+      machine.networking.useNetworkd = networkd;
+      testScript = ''
+        startAll;
+        $machine->waitForUnit("network-interfaces.target");
+        $machine->waitForUnit("network.target");
+        $machine->succeed("ip addr show lo | grep -q 'inet 127.0.0.1/8 '");
+        $machine->succeed("ip addr show lo | grep -q 'inet6 ::1/128 '");
+      '';
+    };
+    static = {
+      name = "Static";
+      nodes.router = router;
+      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 2 ];
         networking = {
-          useDHCP = false;
           useNetworkd = networkd;
           firewall.allowPing = true;
-          interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n:
-            nameValuePair "eth${toString n}" {
-              ipAddress = "192.168.${toString n}.1";
-              prefixLength = 24;
-            })));
-        };
-        services.dhcpd = {
-          enable = true;
-          interfaces = map (n: "eth${toString n}") vlanIfs;
-          extraConfig = ''
-            option subnet-mask 255.255.255.0;
-          '' + flip concatMapStrings vlanIfs (n: ''
-            subnet 192.168.${toString n}.0 netmask 255.255.255.0 {
-              option broadcast-address 192.168.${toString n}.255;
-              option routers 192.168.${toString n}.1;
-              range 192.168.${toString n}.2 192.168.${toString n}.254;
-            }
-          '');
+          useDHCP = false;
+          defaultGateway = "192.168.1.1";
+          interfaces.eth1.ip4 = mkOverride 0 [
+            { address = "192.168.1.2"; prefixLength = 24; }
+            { address = "192.168.1.3"; prefixLength = 32; }
+            { address = "192.168.1.10"; prefixLength = 32; }
+          ];
+          interfaces.eth2.ip4 = mkOverride 0 [
+            { address = "192.168.2.2"; prefixLength = 24; }
+          ];
         };
       };
-    testCases = {
-      loopback = {
-        name = "Loopback";
-        machine.networking.useNetworkd = networkd;
-        testScript = ''
+      testScript = { nodes, ... }:
+        ''
           startAll;
-          $machine->waitForUnit("network-interfaces.target");
-          $machine->waitForUnit("network.target");
-          $machine->succeed("ip addr show lo | grep -q 'inet 127.0.0.1/8 '");
-          $machine->succeed("ip addr show lo | grep -q 'inet6 ::1/128 '");
+
+          $client->waitForUnit("network-interfaces.target");
+          $client->waitForUnit("network.target");
+          $router->waitForUnit("network-interfaces.target");
+          $router->waitForUnit("network.target");
+
+          # Make sure dhcpcd is not started
+          $client->fail("systemctl status dhcpcd.service");
+
+          # Test vlan 1
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.3");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.10");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.10");
+
+          # Test vlan 2
+          $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
+
+          # Test default gateway
+          $router->waitUntilSucceeds("ping -c 1 192.168.3.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.3.1");
         '';
-      };
-      static = {
-        name = "Static";
-        nodes.router = router;
-        nodes.client = { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 2 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = false;
-            defaultGateway = "192.168.1.1";
-            interfaces.eth1.ip4 = mkOverride 0 [
-              { address = "192.168.1.2"; prefixLength = 24; }
-              { address = "192.168.1.3"; prefixLength = 32; }
-              { address = "192.168.1.10"; prefixLength = 32; }
-            ];
-            interfaces.eth2.ip4 = mkOverride 0 [
-              { address = "192.168.2.2"; prefixLength = 24; }
-            ];
-          };
-        };
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            $client->waitForUnit("network-interfaces.target");
-            $client->waitForUnit("network.target");
-            $router->waitForUnit("network-interfaces.target");
-            $router->waitForUnit("network.target");
-
-            # Make sure dhcpcd is not started
-            $client->fail("systemctl status dhcpcd.service");
-
-            # Test vlan 1
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.3");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.10");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.10");
-
-            # Test vlan 2
-            $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
-
-            # Test default gateway
-            $router->waitUntilSucceeds("ping -c 1 192.168.3.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.3.1");
-          '';
-      };
-      dhcpSimple = {
-        name = "SimpleDHCP";
-        nodes.router = router;
-        nodes.client = { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 2 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = true;
-            interfaces.eth1.ip4 = mkOverride 0 [ ];
-            interfaces.eth2.ip4 = mkOverride 0 [ ];
-          };
-        };
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            $client->waitForUnit("network-interfaces.target");
-            $client->waitForUnit("network.target");
-            $router->waitForUnit("network-interfaces.target");
-            $router->waitForUnit("network.target");
-
-            # Wait until we have an ip address on each interface
-            $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
-            $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q '192.168.2'");
-
-            # Test vlan 1
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
-
-            # Test vlan 2
-            $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
-          '';
-      };
-      dhcpOneIf = {
-        name = "OneInterfaceDHCP";
-        nodes.router = router;
-        nodes.client = { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 2 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = false;
-            interfaces.eth1 = {
-              ip4 = mkOverride 0 [ ];
-              useDHCP = true;
-            };
-            interfaces.eth2.ip4 = mkOverride 0 [ ];
-          };
-        };
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            # Wait for networking to come up
-            $client->waitForUnit("network-interfaces.target");
-            $client->waitForUnit("network.target");
-            $router->waitForUnit("network-interfaces.target");
-            $router->waitForUnit("network.target");
-
-            # Wait until we have an ip address on each interface
-            $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
-
-            # Test vlan 1
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
-
-            # Test vlan 2
-            $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
-            $client->fail("ping -c 1 192.168.2.2");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
-            $router->fail("ping -c 1 192.168.2.2");
-          '';
-      };
-      bond = let
-        node = address: { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 2 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = false;
-            bonds.bond = {
-              mode = "balance-rr";
-              interfaces = [ "eth1" "eth2" ];
-            };
-            interfaces.eth1.ip4 = mkOverride 0 [ ];
-            interfaces.eth2.ip4 = mkOverride 0 [ ];
-            interfaces.bond.ip4 = mkOverride 0
-              [ { inherit address; prefixLength = 30; } ];
-          };
-        };
-      in {
-        name = "Bond";
-        nodes.client1 = node "192.168.1.1";
-        nodes.client2 = node "192.168.1.2";
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            # Wait for networking to come up
-            $client1->waitForUnit("network-interfaces.target");
-            $client1->waitForUnit("network.target");
-            $client2->waitForUnit("network-interfaces.target");
-            $client2->waitForUnit("network.target");
-
-            # Test bonding
-            $client1->waitUntilSucceeds("ping -c 2 192.168.1.1");
-            $client1->waitUntilSucceeds("ping -c 2 192.168.1.2");
-
-            $client2->waitUntilSucceeds("ping -c 2 192.168.1.1");
-            $client2->waitUntilSucceeds("ping -c 2 192.168.1.2");
-          '';
-      };
-      bridge = let
-        node = { address, vlan }: { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ vlan ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = false;
-            interfaces.eth1.ip4 = mkOverride 0
-              [ { inherit address; prefixLength = 24; } ];
-          };
-        };
-      in {
-        name = "Bridge";
-        nodes.client1 = node { address = "192.168.1.2"; vlan = 1; };
-        nodes.client2 = node { address = "192.168.1.3"; vlan = 2; };
-        nodes.router = { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 2 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = false;
-            bridges.bridge.interfaces = [ "eth1" "eth2" ];
-            interfaces.eth1.ip4 = mkOverride 0 [ ];
-            interfaces.eth2.ip4 = mkOverride 0 [ ];
-            interfaces.bridge.ip4 = mkOverride 0
-              [ { address = "192.168.1.1"; prefixLength = 24; } ];
-          };
-        };
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            # Wait for networking to come up
-            $client1->waitForUnit("network-interfaces.target");
-            $client1->waitForUnit("network.target");
-            $client2->waitForUnit("network-interfaces.target");
-            $client2->waitForUnit("network.target");
-            $router->waitForUnit("network-interfaces.target");
-            $router->waitForUnit("network.target");
-
-            # Test bridging
-            $client1->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $client1->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $client1->waitUntilSucceeds("ping -c 1 192.168.1.3");
-
-            $client2->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $client2->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $client2->waitUntilSucceeds("ping -c 1 192.168.1.3");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
-          '';
-      };
-      macvlan = {
-        name = "MACVLAN";
-        nodes.router = router;
-        nodes.client = { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = true;
-            macvlans.macvlan.interface = "eth1";
-            interfaces.eth1.ip4 = mkOverride 0 [ ];
-          };
-        };
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            # Wait for networking to come up
-            $client->waitForUnit("network-interfaces.target");
-            $client->waitForUnit("network.target");
-            $router->waitForUnit("network-interfaces.target");
-            $router->waitForUnit("network.target");
-
-            # Wait until we have an ip address on each interface
-            $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
-            $client->waitUntilSucceeds("ip addr show dev macvlan | grep -q '192.168.1'");
-
-            # Print diagnosting information
-            $router->succeed("ip addr >&2");
-            $client->succeed("ip addr >&2");
-
-            # Test macvlan creates routable ips
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.3");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
-          '';
-      };
-      sit = let
-        node = { address4, remote, address6 }: { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.enable = false;
-            useDHCP = false;
-            sits.sit = {
-              inherit remote;
-              local = address4;
-              dev = "eth1";
-            };
-            interfaces.eth1.ip4 = mkOverride 0
-              [ { address = address4; prefixLength = 24; } ];
-            interfaces.sit.ip6 = mkOverride 0
-              [ { address = address6; prefixLength = 64; } ];
-          };
-        };
-      in {
-        name = "Sit";
-        nodes.client1 = node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; };
-        nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; };
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            # Wait for networking to be configured
-            $client1->waitForUnit("network-interfaces.target");
-            $client1->waitForUnit("network.target");
-            $client2->waitForUnit("network-interfaces.target");
-            $client2->waitForUnit("network.target");
-
-            # Print diagnostic information
-            $client1->succeed("ip addr >&2");
-            $client2->succeed("ip addr >&2");
-
-            # Test ipv6
-            $client1->waitUntilSucceeds("ping6 -c 1 fc00::1");
-            $client1->waitUntilSucceeds("ping6 -c 1 fc00::2");
-
-            $client2->waitUntilSucceeds("ping6 -c 1 fc00::1");
-            $client2->waitUntilSucceeds("ping6 -c 1 fc00::2");
-          '';
-      };
-      vlan = let
-        node = address: { config, pkgs, ... }: with pkgs.lib; {
-          #virtualisation.vlans = [ 1 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = false;
-            vlans.vlan = {
-              id = 1;
-              interface = "eth0";
-            };
-            interfaces.eth0.ip4 = mkOverride 0 [ ];
-            interfaces.eth1.ip4 = mkOverride 0 [ ];
-            interfaces.vlan.ip4 = mkOverride 0
-              [ { inherit address; prefixLength = 24; } ];
-          };
-        };
-      in {
-        name = "vlan";
-        nodes.client1 = node "192.168.1.1";
-        nodes.client2 = node "192.168.1.2";
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            # Wait for networking to be configured
-            $client1->waitForUnit("network-interfaces.target");
-            $client1->waitForUnit("network.target");
-            $client2->waitForUnit("network-interfaces.target");
-            $client2->waitForUnit("network.target");
-
-            # Test vlan is setup
-            $client1->succeed("ip addr show dev vlan >&2");
-            $client2->succeed("ip addr show dev vlan >&2");
-          '';
-      };
     };
-    case = testCases.${test};
-  in case // {
-    name = "${case.name}-Networking-${if networkd then "Networkd" else "Scripted"}";
-    meta = with pkgs.stdenv.lib.maintainers; {
-      maintainers = [ wkennington ];
+    dhcpSimple = {
+      name = "SimpleDHCP";
+      nodes.router = router;
+      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 2 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = true;
+          interfaces.eth1.ip4 = mkOverride 0 [ ];
+          interfaces.eth2.ip4 = mkOverride 0 [ ];
+        };
+      };
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          $client->waitForUnit("network-interfaces.target");
+          $client->waitForUnit("network.target");
+          $router->waitForUnit("network-interfaces.target");
+          $router->waitForUnit("network.target");
+
+          # Wait until we have an ip address on each interface
+          $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
+          $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q '192.168.2'");
+
+          # Test vlan 1
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+
+          # Test vlan 2
+          $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
+        '';
     };
-  })
+    dhcpOneIf = {
+      name = "OneInterfaceDHCP";
+      nodes.router = router;
+      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 2 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = false;
+          interfaces.eth1 = {
+            ip4 = mkOverride 0 [ ];
+            useDHCP = true;
+          };
+          interfaces.eth2.ip4 = mkOverride 0 [ ];
+        };
+      };
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          # Wait for networking to come up
+          $client->waitForUnit("network-interfaces.target");
+          $client->waitForUnit("network.target");
+          $router->waitForUnit("network-interfaces.target");
+          $router->waitForUnit("network.target");
+
+          # Wait until we have an ip address on each interface
+          $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
+
+          # Test vlan 1
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+
+          # Test vlan 2
+          $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
+          $client->fail("ping -c 1 192.168.2.2");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
+          $router->fail("ping -c 1 192.168.2.2");
+        '';
+    };
+    bond = let
+      node = address: { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 2 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = false;
+          bonds.bond = {
+            mode = "balance-rr";
+            interfaces = [ "eth1" "eth2" ];
+          };
+          interfaces.eth1.ip4 = mkOverride 0 [ ];
+          interfaces.eth2.ip4 = mkOverride 0 [ ];
+          interfaces.bond.ip4 = mkOverride 0
+            [ { inherit address; prefixLength = 30; } ];
+        };
+      };
+    in {
+      name = "Bond";
+      nodes.client1 = node "192.168.1.1";
+      nodes.client2 = node "192.168.1.2";
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          # Wait for networking to come up
+          $client1->waitForUnit("network-interfaces.target");
+          $client1->waitForUnit("network.target");
+          $client2->waitForUnit("network-interfaces.target");
+          $client2->waitForUnit("network.target");
+
+          # Test bonding
+          $client1->waitUntilSucceeds("ping -c 2 192.168.1.1");
+          $client1->waitUntilSucceeds("ping -c 2 192.168.1.2");
+
+          $client2->waitUntilSucceeds("ping -c 2 192.168.1.1");
+          $client2->waitUntilSucceeds("ping -c 2 192.168.1.2");
+        '';
+    };
+    bridge = let
+      node = { address, vlan }: { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ vlan ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = false;
+          interfaces.eth1.ip4 = mkOverride 0
+            [ { inherit address; prefixLength = 24; } ];
+        };
+      };
+    in {
+      name = "Bridge";
+      nodes.client1 = node { address = "192.168.1.2"; vlan = 1; };
+      nodes.client2 = node { address = "192.168.1.3"; vlan = 2; };
+      nodes.router = { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 2 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = false;
+          bridges.bridge.interfaces = [ "eth1" "eth2" ];
+          interfaces.eth1.ip4 = mkOverride 0 [ ];
+          interfaces.eth2.ip4 = mkOverride 0 [ ];
+          interfaces.bridge.ip4 = mkOverride 0
+            [ { address = "192.168.1.1"; prefixLength = 24; } ];
+        };
+      };
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          # Wait for networking to come up
+          $client1->waitForUnit("network-interfaces.target");
+          $client1->waitForUnit("network.target");
+          $client2->waitForUnit("network-interfaces.target");
+          $client2->waitForUnit("network.target");
+          $router->waitForUnit("network-interfaces.target");
+          $router->waitForUnit("network.target");
+
+          # Test bridging
+          $client1->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $client1->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $client1->waitUntilSucceeds("ping -c 1 192.168.1.3");
+
+          $client2->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $client2->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $client2->waitUntilSucceeds("ping -c 1 192.168.1.3");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
+        '';
+    };
+    macvlan = {
+      name = "MACVLAN";
+      nodes.router = router;
+      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = true;
+          macvlans.macvlan.interface = "eth1";
+          interfaces.eth1.ip4 = mkOverride 0 [ ];
+        };
+      };
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          # Wait for networking to come up
+          $client->waitForUnit("network-interfaces.target");
+          $client->waitForUnit("network.target");
+          $router->waitForUnit("network-interfaces.target");
+          $router->waitForUnit("network.target");
+
+          # Wait until we have an ip address on each interface
+          $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
+          $client->waitUntilSucceeds("ip addr show dev macvlan | grep -q '192.168.1'");
+
+          # Print diagnosting information
+          $router->succeed("ip addr >&2");
+          $client->succeed("ip addr >&2");
+
+          # Test macvlan creates routable ips
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.3");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
+        '';
+    };
+    sit = let
+      node = { address4, remote, address6 }: { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.enable = false;
+          useDHCP = false;
+          sits.sit = {
+            inherit remote;
+            local = address4;
+            dev = "eth1";
+          };
+          interfaces.eth1.ip4 = mkOverride 0
+            [ { address = address4; prefixLength = 24; } ];
+          interfaces.sit.ip6 = mkOverride 0
+            [ { address = address6; prefixLength = 64; } ];
+        };
+      };
+    in {
+      name = "Sit";
+      nodes.client1 = node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; };
+      nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; };
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          # Wait for networking to be configured
+          $client1->waitForUnit("network-interfaces.target");
+          $client1->waitForUnit("network.target");
+          $client2->waitForUnit("network-interfaces.target");
+          $client2->waitForUnit("network.target");
+
+          # Print diagnostic information
+          $client1->succeed("ip addr >&2");
+          $client2->succeed("ip addr >&2");
+
+          # Test ipv6
+          $client1->waitUntilSucceeds("ping6 -c 1 fc00::1");
+          $client1->waitUntilSucceeds("ping6 -c 1 fc00::2");
+
+          $client2->waitUntilSucceeds("ping6 -c 1 fc00::1");
+          $client2->waitUntilSucceeds("ping6 -c 1 fc00::2");
+        '';
+    };
+    vlan = let
+      node = address: { config, pkgs, ... }: with pkgs.lib; {
+        #virtualisation.vlans = [ 1 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = false;
+          vlans.vlan = {
+            id = 1;
+            interface = "eth0";
+          };
+          interfaces.eth0.ip4 = mkOverride 0 [ ];
+          interfaces.eth1.ip4 = mkOverride 0 [ ];
+          interfaces.vlan.ip4 = mkOverride 0
+            [ { inherit address; prefixLength = 24; } ];
+        };
+      };
+    in {
+      name = "vlan";
+      nodes.client1 = node "192.168.1.1";
+      nodes.client2 = node "192.168.1.2";
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          # Wait for networking to be configured
+          $client1->waitForUnit("network-interfaces.target");
+          $client1->waitForUnit("network.target");
+          $client2->waitForUnit("network-interfaces.target");
+          $client2->waitForUnit("network.target");
+
+          # Test vlan is setup
+          $client1->succeed("ip addr show dev vlan >&2");
+          $client2->succeed("ip addr show dev vlan >&2");
+        '';
+    };
+  };
+
+in mapAttrs (const (attrs: makeTest (attrs // {
+  name = "${attrs.name}-Networking-${if networkd then "Networkd" else "Scripted"}";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ wkennington ];
+  };
+}))) testCases

From 7eea91fbc0efc19f416121369f566c6f5363fbc0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 29 Feb 2016 20:11:04 +0100
Subject: [PATCH 145/338] nixos/release: Use callSubTests for subtests

Should clean up a lot of these redundant lines for various sub-tests.

Note that the tests.boot* are now called tests.boot.boot*, but otherwise
all the test attribute names should stay the same.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra
Cc: @wkennington
Cc: @bobvanderlinden
---
 nixos/release-combined.nix |  2 +-
 nixos/release.nix          | 45 +++++---------------------------------
 2 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 06890b458ef..b3bef2deb79 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -63,7 +63,7 @@ in rec {
         (all nixos.tests.installer.btrfsSimple)
         (all nixos.tests.installer.btrfsSubvols)
         (all nixos.tests.installer.btrfsSubvolDefault)
-        (all nixos.tests.bootBiosCdrom)
+        (all nixos.tests.boot.bootBiosCdrom)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
         #(all nixos.tests.lightdm)
diff --git a/nixos/release.nix b/nixos/release.nix
index 76d0ce90458..eb614ac1103 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -233,6 +233,7 @@ in rec {
   tests.avahi = callTest tests/avahi.nix {};
   tests.bittorrent = callTest tests/bittorrent.nix {};
   tests.blivet = callTest tests/blivet.nix {};
+  tests.boot = callSubTests tests/boot.nix {};
   tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
   tests.chromium = callTest tests/chromium.nix {};
   tests.cjdns = callTest tests/cjdns.nix {};
@@ -250,18 +251,7 @@ in rec {
   tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
   tests.grsecurity = callTest tests/grsecurity.nix {};
   tests.i3wm = callTest tests/i3wm.nix {};
-  tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test);
-  tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test);
-  tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test);
-  tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test);
-  tests.installer.separateBootFat = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBootFat.test);
-  tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test);
-  tests.installer.simpleLabels = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleLabels.test);
-  tests.installer.simpleProvided = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleProvided.test);
-  tests.installer.swraid = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).swraid.test);
-  tests.installer.btrfsSimple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSimple.test);
-  tests.installer.btrfsSubvols = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvols.test);
-  tests.installer.btrfsSubvolDefault = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test);
+  tests.installer = callSubTests tests/installer.nix {};
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
@@ -280,24 +270,8 @@ in rec {
   tests.mysqlReplication = callTest tests/mysql-replication.nix {};
   tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; };
   tests.nat.standalone = callTest tests/nat.nix { withFirewall = false; };
-  tests.networking.networkd.loopback = callTest tests/networking.nix { networkd = true; test = "loopback"; };
-  tests.networking.networkd.static = callTest tests/networking.nix { networkd = true; test = "static"; };
-  tests.networking.networkd.dhcpSimple = callTest tests/networking.nix { networkd = true; test = "dhcpSimple"; };
-  tests.networking.networkd.dhcpOneIf = callTest tests/networking.nix { networkd = true; test = "dhcpOneIf"; };
-  tests.networking.networkd.bond = callTest tests/networking.nix { networkd = true; test = "bond"; };
-  tests.networking.networkd.bridge = callTest tests/networking.nix { networkd = true; test = "bridge"; };
-  tests.networking.networkd.macvlan = callTest tests/networking.nix { networkd = true; test = "macvlan"; };
-  tests.networking.networkd.sit = callTest tests/networking.nix { networkd = true; test = "sit"; };
-  tests.networking.networkd.vlan = callTest tests/networking.nix { networkd = true; test = "vlan"; };
-  tests.networking.scripted.loopback = callTest tests/networking.nix { networkd = false; test = "loopback"; };
-  tests.networking.scripted.static = callTest tests/networking.nix { networkd = false; test = "static"; };
-  tests.networking.scripted.dhcpSimple = callTest tests/networking.nix { networkd = false; test = "dhcpSimple"; };
-  tests.networking.scripted.dhcpOneIf = callTest tests/networking.nix { networkd = false; test = "dhcpOneIf"; };
-  tests.networking.scripted.bond = callTest tests/networking.nix { networkd = false; test = "bond"; };
-  tests.networking.scripted.bridge = callTest tests/networking.nix { networkd = false; test = "bridge"; };
-  tests.networking.scripted.macvlan = callTest tests/networking.nix { networkd = false; test = "macvlan"; };
-  tests.networking.scripted.sit = callTest tests/networking.nix { networkd = false; test = "sit"; };
-  tests.networking.scripted.vlan = callTest tests/networking.nix { networkd = false; test = "vlan"; };
+  tests.networking.networkd = callSubTests tests/networking.nix { networkd = true; };
+  tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };
   # TODO: put in networking.nix after the test becomes more complete
   tests.networkingProxy = callTest tests/networking-proxy.nix {};
   tests.nfs3 = callTest tests/nfs.nix { version = 3; };
@@ -317,17 +291,8 @@ in rec {
   tests.simple = callTest tests/simple.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};
   tests.udisks2 = callTest tests/udisks2.nix {};
-  tests.virtualbox = let
-    testsOnly = filterAttrs (const (t: t ? test));
-    vboxTests = testsOnly (import tests/virtualbox.nix {
-      system = "x86_64-linux";
-    });
-  in mapAttrs (const (t: hydraJob t.test)) vboxTests;
+  tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; };
   tests.xfce = callTest tests/xfce.nix {};
-  tests.bootBiosCdrom = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosCdrom);
-  tests.bootBiosUsb = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosUsb);
-  tests.bootUefiCdrom = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootUefiCdrom);
-  tests.bootUefiUsb = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootUefiUsb);
 
 
   /* Build a bunch of typical closures so that Hydra can keep track of

From e45c211b50c6f473e3d92d29e1a8426ec4579f05 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 1 Mar 2016 00:20:27 +0100
Subject: [PATCH 146/338] nixos/tests/chromium: Split up into subtests

This makes it easier to test just a specific channel rather than to
force testing all builds down the users/testers throat. Especially this
makes it easier to test NixOS channel upgrades only against the Chromium
stable channel instead of just removing the beta/dev channels from the
tests entirely (as done in 69ec09f38aa1f1d37baec73ebdf9cf5f21050f94).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release-combined.nix |   2 +-
 nixos/release.nix          |   2 +-
 nixos/tests/chromium.nix   | 133 +++++++++++++++++--------------------
 3 files changed, 63 insertions(+), 74 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index b3bef2deb79..69cc357078d 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -48,7 +48,7 @@ in rec {
         (all nixos.ova)
 
         #(all nixos.tests.containers)
-        (all nixos.tests.chromium)
+        (all nixos.tests.chromium.stable)
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux
diff --git a/nixos/release.nix b/nixos/release.nix
index eb614ac1103..18e4e2d6b17 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -235,7 +235,7 @@ in rec {
   tests.blivet = callTest tests/blivet.nix {};
   tests.boot = callSubTests tests/boot.nix {};
   tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
-  tests.chromium = callTest tests/chromium.nix {};
+  tests.chromium = callSubTests tests/chromium.nix {};
   tests.cjdns = callTest tests/cjdns.nix {};
   tests.containers = callTest tests/containers.nix {};
   tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 6c61087760d..974af6888b6 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -1,13 +1,10 @@
-import ./make-test.nix (
-{ pkgs
-, channelMap ? {
-    stable = pkgs.chromium;
-    #beta   = pkgs.chromiumBeta;
-    #dev    = pkgs.chromiumDev;
-  }
-, ...
-}: rec {
-  name = "chromium";
+{ system ? builtins.currentSystem }:
+
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
+
+mapAttrs (channel: chromiumPkg: makeTest rec {
+  name = "chromium-${channel}";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ aszlig ];
   };
@@ -16,6 +13,7 @@ import ./make-test.nix (
 
   machine.imports = [ ./common/x11.nix ];
   machine.virtualisation.memorySize = 2047;
+  machine.environment.systemPackages = [ chromiumPkg ];
 
   startupHTML = pkgs.writeText "chromium-startup.html" ''
     <!DOCTYPE html>
@@ -105,74 +103,65 @@ import ./make-test.nix (
       closeWin;
     }
 
-    sub chromiumTest {
-      my ($channel, $pkg, $code) = @_;
-      $machine->waitForX;
+    $machine->waitForX;
 
-      my $url = "file://${startupHTML}";
-      my $args = "--user-data-dir=/tmp/chromium-$channel";
-      $machine->execute(
-        "ulimit -c unlimited; ".
-        "$pkg/bin/chromium $args \"$url\" & disown"
-      );
-      $machine->waitForText(qr/Type to search or enter a URL to navigate/);
-      $machine->waitUntilSucceeds("${xdo "check-startup" ''
-        search --sync --onlyvisible --name "startup done"
-        # close first start help popup
-        key -delay 1000 Escape
+    my $url = "file://${startupHTML}";
+    my $args = "--user-data-dir=/tmp/chromium-${channel}";
+    $machine->execute(
+      "ulimit -c unlimited; ".
+      "chromium $args \"$url\" & disown"
+    );
+    $machine->waitForText(qr/Type to search or enter a URL to navigate/);
+    $machine->waitUntilSucceeds("${xdo "check-startup" ''
+      search --sync --onlyvisible --name "startup done"
+      # close first start help popup
+      key -delay 1000 Escape
+      windowfocus --sync
+      windowactivate --sync
+    ''}");
+
+    createAndWaitForNewWin;
+    $machine->screenshot("empty_windows");
+    closeWin;
+
+    $machine->screenshot("startup_done");
+
+    testNewWin "check sandbox", sub {
+      $machine->succeed("${xdo "type-url" ''
+        search --sync --onlyvisible --name "new tab"
         windowfocus --sync
-        windowactivate --sync
+        type --delay 1000 "chrome://sandbox"
       ''}");
 
-      createAndWaitForNewWin;
-      $machine->screenshot($channel."_emptywin");
-      closeWin;
+      $machine->succeed("${xdo "submit-url" ''
+        search --sync --onlyvisible --name "new tab"
+        windowfocus --sync
+        key --delay 1000 Return
+      ''}");
 
-      $machine->screenshot($channel."_startup_done");
+      $machine->screenshot("sandbox_info");
 
-      subtest("Chromium $channel", $code);
+      $machine->succeed("${xdo "submit-url" ''
+        search --sync --onlyvisible --name "sandbox status"
+        windowfocus --sync
+      ''}");
+      $machine->succeed("${xdo "submit-url" ''
+        key --delay 1000 Ctrl+a Ctrl+c
+      ''}");
 
-      $machine->shutdown;
-    }
+      my $clipboard = $machine->succeed("${pkgs.xclip}/bin/xclip -o");
+      die "sandbox not working properly: $clipboard"
+      unless $clipboard =~ /namespace sandbox.*yes/mi
+          && $clipboard =~ /pid namespaces.*yes/mi
+          && $clipboard =~ /network namespaces.*yes/mi
+          && $clipboard =~ /seccomp.*sandbox.*yes/mi
+          && $clipboard =~ /you are adequately sandboxed/mi;
+    };
 
-    for (${let
-      mkArray = name: pkg: "[\"${name}\", \"${pkg}\"]";
-      chanArrays = pkgs.lib.mapAttrsToList mkArray channelMap;
-    in pkgs.lib.concatStringsSep ", " chanArrays}) {
-      my ($channel, $pkg) = @$_;
-      chromiumTest $channel, $pkg, sub {
-        testNewWin "check sandbox", sub {
-          $machine->succeed("${xdo "type-url" ''
-            search --sync --onlyvisible --name "new tab"
-            windowfocus --sync
-            type --delay 1000 "chrome://sandbox"
-          ''}");
-
-          $machine->succeed("${xdo "submit-url" ''
-            search --sync --onlyvisible --name "new tab"
-            windowfocus --sync
-            key --delay 1000 Return
-          ''}");
-
-          $machine->screenshot($channel."_sandbox");
-
-          $machine->succeed("${xdo "submit-url" ''
-            search --sync --onlyvisible --name "sandbox status"
-            windowfocus --sync
-          ''}");
-          $machine->succeed("${xdo "submit-url" ''
-            key --delay 1000 Ctrl+a Ctrl+c
-          ''}");
-
-          my $clipboard = $machine->succeed("${pkgs.xclip}/bin/xclip -o");
-          die "sandbox not working properly: $clipboard"
-          unless $clipboard =~ /namespace sandbox.*yes/mi
-              && $clipboard =~ /pid namespaces.*yes/mi
-              && $clipboard =~ /network namespaces.*yes/mi
-              && $clipboard =~ /seccomp.*sandbox.*yes/mi
-              && $clipboard =~ /you are adequately sandboxed/mi;
-        };
-      };
-    }
+    $machine->shutdown;
   '';
-})
+}) {
+  stable = pkgs.chromium;
+  beta   = pkgs.chromiumBeta;
+  dev    = pkgs.chromiumDev;
+}

From a3119bd35dbaad51b11abcae5cc4e83fb510ca69 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 1 Mar 2016 00:19:27 +0000
Subject: [PATCH 147/338] bats: fixes installation

The build was failing with:

  /...-stdenv/setup: ./install.sh: /usr/bin/env: bad interpreter: No such file
  or directory

See https://hydra.nixos.org/build/32353411/log
---
 pkgs/development/interpreters/bats/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index 4eb86460be9..bf262d4f050 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "05xpvfm0xky1532i3hd2l3wznxzh99bv2hxgykwdpxh18h6jr6jm";
   };
 
+  patchPhase = "patchShebangs ./install.sh";
+
   installPhase = "./install.sh $out";
 
   meta = with stdenv.lib; {

From d085a649c231f48e4b7f58c0f10d609fd76a7389 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 29 Feb 2016 12:47:12 -0600
Subject: [PATCH 148/338] openal: fix darwin builds

---
 pkgs/development/libraries/openal-soft/default.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix                    | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index ff29b2741fb..4a466ad133a 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, cmake
-, alsaSupport ? true, alsaLib ? null
-, pulseSupport ? true, libpulseaudio ? null
+, alsaSupport ? !stdenv.isDarwin, alsaLib ? null
+, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null
+, CoreServices, AudioUnit, AudioToolbox
 }:
 
 with stdenv.lib;
@@ -19,7 +20,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake ]
     ++ optional alsaSupport alsaLib
-    ++ optional pulseSupport libpulseaudio;
+    ++ optional pulseSupport libpulseaudio
+    ++ optional stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
 
   NIX_LDFLAGS = []
     ++ optional alsaSupport "-lasound"
@@ -30,5 +32,6 @@ stdenv.mkDerivation rec {
     homepage = http://kcat.strangesoft.net/openal.html;
     license = licenses.lgpl2;
     maintainers = with maintainers; [ftrvxmtrx];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d014ba39340..ed5bf87643d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8221,7 +8221,9 @@ let
   oniguruma = callPackage ../development/libraries/oniguruma { };
 
   openal = openalSoft;
-  openalSoft = callPackage ../development/libraries/openal-soft { };
+  openalSoft = callPackage ../development/libraries/openal-soft {
+    inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
+  };
 
   openbabel = callPackage ../development/libraries/openbabel { };
 

From 202ebf794cbd5ea293170f71999bc4e8f788779e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 1 Mar 2016 11:01:00 +0100
Subject: [PATCH 149/338] vm/rpm/rpm-closure.pl: make it deterministic

Some recent perl version introduced "keys" to return the keys
in random order. As some of the packages are solved by "provides" and
based on the order, this randomness affects what packages get into the
closure.

This problem may be in other nix perl scripts.
---
 pkgs/build-support/vm/rpm/rpm-closure.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl
index 8f7669d6fef..6442cd91a95 100644
--- a/pkgs/build-support/vm/rpm/rpm-closure.pl
+++ b/pkgs/build-support/vm/rpm/rpm-closure.pl
@@ -90,7 +90,7 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
 }
 
 my %provides;
-PKG: foreach my $pkgName (keys %pkgs) {
+PKG: foreach my $pkgName (sort(keys %pkgs)) {
     #print STDERR "looking at $pkgName\n";
     my $pkg = $pkgs{$pkgName};
 

From a110c8d52b5156717010655dce344bd8b107eae7 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 1 Mar 2016 11:59:00 +0100
Subject: [PATCH 150/338] perl-MooseX-Role-WithOverloading: fix hash

The version had been updated, but the hash hadn't.
---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7cae676f829..41e46f32342 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8147,7 +8147,7 @@ let self = _self // overrides; _self = with self; {
     name = "MooseX-Role-WithOverloading-0.17";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "01mqpvbz7yw993918hgp72vl22i6mgicpq5b3zrrsp6vl8sqj2sw";
+      sha256 = "0rb8k0dp1a55bm2pr6r0vsi5msvjl1dslfidxp1gj80j7zbrbc4j";
     };
     buildInputs = [ TestCheckDeps TestNoWarnings ModuleMetadata];
     propagatedBuildInputs = [ aliased Moose namespaceautoclean namespaceclean ];

From b2889efff29ea316e66083e590ba22327b851e33 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 1 Mar 2016 12:50:23 +0100
Subject: [PATCH 151/338] devhelp: fix build with new webkitgtk

---
 pkgs/desktops/gnome-3/3.18/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix
index 8234d21f39e..11e2c7e9beb 100644
--- a/pkgs/desktops/gnome-3/3.18/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/default.nix
@@ -312,9 +312,7 @@ let
 
   anjuta = callPackage ./devtools/anjuta { };
 
-  devhelp = callPackage ./devtools/devhelp {
-    webkitgtk = webkitgtk24x;
-  };
+  devhelp = callPackage ./devtools/devhelp { };
 
   gdl = callPackage ./devtools/gdl { };
 

From c8e55671cd85a7468a726eb0bc2d127b61aaa4f4 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 1 Mar 2016 12:29:31 +0000
Subject: [PATCH 152/338] nodejs-4_x: bump to version 4.3.1

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

diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index 04dbd1b1a27..629864b6e0b 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -7,7 +7,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "4.3.0";
+  version = "4.3.1";
 
   deps = {
     inherit openssl zlib libuv;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "1f86jy71mi01g4xd411l5w8pi80nlk6sz7d2c0ghdk83v734ll0q";
+    sha256 = "0wzf5sirbph5kaik3pm9i2dxbjwqh5qlnqn71azrsv0vhs7dbqk1";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From 75f361f4c9af5a53d6591d2272c78318550ee3a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Mar 2016 13:50:31 +0100
Subject: [PATCH 153/338] Revert "all-packages: Rewrite packageOverrides to use
 fix'/extends"

This reverts commit 9c0121be81fa8c5e6b5f7bd23326dd76d22e5d0b. I don't
know what this change does and I don't have time to review it at the
moment, sorry.
---
 pkgs/top-level/all-packages.nix | 96 ++++++++++++++++++---------------
 1 file changed, 54 insertions(+), 42 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e75686e4eb7..804230e05b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -64,7 +64,7 @@ let
       # { /* the config */ } and
       # { pkgs, ... } : { /* the config */ }
       if builtins.isFunction configExpr
-        then configExpr { pkgs = pkgsFinal; }
+        then configExpr { inherit pkgs; }
         else configExpr;
 
   # Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc)
@@ -83,38 +83,51 @@ let
   platform = if platform_ != null then platform_
     else config.platform or platformAuto;
 
-  # The complete set of packages, after applying the overrides
-  pkgsFinal = lib.fix' (lib.extends configOverrides (lib.extends stdenvOverrides pkgsFun));
+  # Helper functions that are exported through `pkgs'.
+  helperFunctions =
+    stdenvAdapters //
+    (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; });
 
-  stdenvOverrides =
-    # We don't want stdenv overrides in the case of cross-building,
-    # or otherwise the basic overrided packages will not be built
-    # with the crossStdenv adapter.
-    if crossSystem == null
-      then self: super: lib.optionalAttrs (super.stdenv ? overrides) (super.stdenv.overrides super)
-      else self: super: {};
+  stdenvAdapters =
+    import ../stdenv/adapters.nix pkgs;
 
-  # Packages can be overriden globally via the `packageOverrides'
+
+  # Allow packages to be overriden globally via the `packageOverrides'
   # configuration option, which must be a function that takes `pkgs'
   # as an argument and returns a set of new or overriden packages.
-  # The recommended usage follows this snippet:
-  #   packageOverrides = super: let self = super.pkgs in ...
-  # `super' is the *original* (un-overriden) set of packages,
-  # while `self' refers to the final (overriden) set of packages.
-  configOverrides =
-      if config ? packageOverrides && bootStdenv == null # don't apply config overrides in stdenv boot
-        then self: config.packageOverrides
-        else self: super: {};
+  # The `packageOverrides' function is called with the *original*
+  # (un-overriden) set of packages, allowing packageOverrides
+  # attributes to refer to the original attributes (e.g. "foo =
+  # ... pkgs.foo ...").
+  pkgs = applyGlobalOverrides (config.packageOverrides or (pkgs: {}));
+
+  mkOverrides = pkgsOrig: overrides: overrides //
+        (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig));
+
+  # Return the complete set of packages, after applying the overrides
+  # returned by the `overrider' function (see above).  Warning: this
+  # function is very expensive!
+  applyGlobalOverrides = overrider:
+    let
+      # Call the overrider function.  We don't want stdenv overrides
+      # in the case of cross-building, or otherwise the basic
+      # overrided packages will not be built with the crossStdenv
+      # adapter.
+      overrides = mkOverrides pkgsOrig (overrider pkgsOrig);
+
+      # The un-overriden packages, passed to `overrider'.
+      pkgsOrig = pkgsFun pkgs {};
+
+      # The overriden, final packages.
+      pkgs = pkgsFun pkgs overrides;
+    in pkgs;
+
 
   # The package compositions.  Yes, this isn't properly indented.
-  pkgsFun = pkgs:
-    let defaultScope = pkgs // pkgs.xorg;
-        helperFunctions = pkgs_.stdenvAdapters // pkgs_.trivial-builders;
-        pkgsRet = helperFunctions // pkgs_;
-        pkgs_ = with pkgs; {
-  # Helper functions that are exported through `pkgs'.
-  trivial-builders = import ../build-support/trivial-builders.nix { inherit lib; inherit stdenv; inherit (xorg) lndir; };
-  stdenvAdapters = import ../stdenv/adapters.nix pkgs;
+  pkgsFun = pkgs: overrides:
+    with helperFunctions;
+    let defaultScope = pkgs // pkgs.xorg; self = self_ // overrides;
+    self_ = with self; helperFunctions // {
 
   # Make some arguments passed to all-packages.nix available
   inherit system platform;
@@ -144,7 +157,11 @@ let
   #
   # The result is `pkgs' where all the derivations depending on `foo'
   # will use the new version.
-  overridePackages = f: lib.fix' (lib.extends f pkgs.__unfix__);
+  overridePackages = f:
+    let
+      newpkgs = pkgsFun newpkgs overrides;
+      overrides = mkOverrides pkgs (f newpkgs pkgs);
+    in newpkgs;
 
   # Override system. This is useful to build i686 packages on x86_64-linux.
   forceSystem = system: kernel: (import ./all-packages.nix) {
@@ -166,7 +183,7 @@ let
 
 
   ### Helper functions.
-  inherit lib config;
+  inherit lib config stdenvAdapters;
 
   inherit (lib) lowPrio hiPrio appendToName makeOverridable;
   inherit (misc) versionedDerivation;
@@ -197,8 +214,7 @@ let
     allPackages = args: import ./all-packages.nix ({ inherit config system; } // args);
   };
 
-  # We use pkgs_ because accessing pkgs would lead to an infinite recursion in stdenvOverrides
-  defaultStdenv = pkgs_.allStdenvs.stdenv // { inherit platform; };
+  defaultStdenv = allStdenvs.stdenv // { inherit platform; };
 
   stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal);
 
@@ -218,7 +234,7 @@ let
             };
           }
       else
-        pkgs_.defaultStdenv;
+        defaultStdenv;
 
   forceNativeDrv = drv : if crossSystem == null then drv else
     (drv // { crossDrv = drv.nativeDrv; });
@@ -5988,8 +6004,8 @@ let
   gotty = goPackages.gotty.bin // { outputs = [ "bin" ]; };
 
   gradleGen = callPackage ../development/tools/build-managers/gradle { };
-  gradle = gradleGen.gradleLatest;
-  gradle25 = gradleGen.gradle25;
+  gradle = self.gradleGen.gradleLatest;
+  gradle25 = self.gradleGen.gradle25;
 
   gperf = callPackage ../development/tools/misc/gperf { };
 
@@ -11824,7 +11840,7 @@ let
       AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
       ImageCaptureCore GSS ImageIO;
   });
-  emacs24Macport = emacs24Macport_24_5;
+  emacs24Macport = self.emacs24Macport_24_5;
 
   emacs25pre = lowPrio (callPackage ../applications/editors/emacs-25 {
     # use override to enable additional features
@@ -16200,13 +16216,12 @@ let
 
   mg = callPackage ../applications/editors/mg { };
 
-};
-# end pkgs_ =
+}; # self_ =
 
 
   ### Deprecated aliases - for backward compatibility
 
-aliases = with pkgs; {
+aliases = with self; rec {
   accounts-qt = qt5.accounts-qt;  # added 2015-12-19
   adobeReader = adobe-reader;
   aircrackng = aircrack-ng; # added 2016-01-14
@@ -16295,7 +16310,4 @@ tweakAlias = _n: alias: with lib;
     removeAttrs alias ["recurseForDerivations"]
   else alias;
 
-in lib.mapAttrs tweakAlias aliases // pkgsRet;
-# end pkgsFun
-
-in pkgsFinal
+in lib.mapAttrs tweakAlias aliases // self; in pkgs

From 7eb15265d3cfa493dd8e839d10c512d4b9d97b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 1 Mar 2016 13:52:30 +0100
Subject: [PATCH 154/338] kodiPlugins.pvr-hts: 2.1.18 -> 2.2.13

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

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 34b454ddcdd..96c47a15ef1 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -215,13 +215,13 @@ in
   pvr-hts = (mkKodiPlugin rec {
     plugin = "pvr-hts";
     namespace = "pvr.hts";
-    version = "2.1.18";
+    version = "2.2.13";
 
     src = fetchFromGitHub {
       owner = "kodi-pvr";
       repo = "pvr.hts";
-      rev = "016b0b3251d6d5bffaf68baf59010e4347759c4a";
-      sha256 = "03lhxipz03r516pycabqc9b89kd7wih3c2dr4p602bk64bsmpi0j";
+      rev = "3274354511e970e2101c2aa437001b2f245f80da";
+      sha256 = "0i7cb61pjv6vbj3x96cm1n4w91mvc8z6lxa8ykjasrrbi95ph7ld";
     };
 
     meta = with stdenv.lib; {

From e5069c1be590df367f9f2e3085bc238cf053d285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 1 Mar 2016 14:13:02 +0100
Subject: [PATCH 155/338] rethinkdb: patch for glibc 2.23

---
 pkgs/servers/nosql/rethinkdb/default.nix      |   2 +
 pkgs/servers/nosql/rethinkdb/glibc-2.23.patch | 111 ++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 pkgs/servers/nosql/rethinkdb/glibc-2.23.patch

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 4566a670206..f1b57546c7d 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0zs07g7arrrvm85mqbkffyzgd255qawn64r6iqdws25lj1kq2qim";
   };
 
+  patches = [ ./glibc-2.23.patch ];
+
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py
 
diff --git a/pkgs/servers/nosql/rethinkdb/glibc-2.23.patch b/pkgs/servers/nosql/rethinkdb/glibc-2.23.patch
new file mode 100644
index 00000000000..818ea124564
--- /dev/null
+++ b/pkgs/servers/nosql/rethinkdb/glibc-2.23.patch
@@ -0,0 +1,111 @@
+From 84be09f314c4cbf88b4ac8fe9dbff1d36f0f5781 Mon Sep 17 00:00:00 2001
+From: Daniel Mewes <daniel@rethinkdb.com>
+Date: Fri, 5 Feb 2016 18:45:28 -0800
+Subject: [PATCH] Alpinelinux compilation fixes
+
+by @clandmeter
+---
+ src/containers/buffer_group.hpp                            |  1 +
+ src/containers/printf_buffer.hpp                           |  1 +
+ src/errors.cc                                              |  2 +-
+ src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc |  4 ++--
+ src/rdb_protocol/geo/s2/util/math/mathlimits.h             | 12 ++++++------
+ src/threading.hpp                                          |  2 ++
+ 6 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/src/containers/buffer_group.hpp b/src/containers/buffer_group.hpp
+index 865c5cb..0403db6 100644
+--- a/src/containers/buffer_group.hpp
++++ b/src/containers/buffer_group.hpp
+@@ -3,6 +3,7 @@
+ #define CONTAINERS_BUFFER_GROUP_HPP_
+ 
+ #include <stdlib.h>
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <vector>
+ 
+diff --git a/src/containers/printf_buffer.hpp b/src/containers/printf_buffer.hpp
+index b7a5154..76959f3 100644
+--- a/src/containers/printf_buffer.hpp
++++ b/src/containers/printf_buffer.hpp
+@@ -5,6 +5,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ // Cannot include utils.hpp, we are included by utils.hpp.
+ #include "errors.hpp"
+diff --git a/src/errors.cc b/src/errors.cc
+index d40c04f..39efc9f 100644
+--- a/src/errors.cc
++++ b/src/errors.cc
+@@ -89,7 +89,7 @@ void report_fatal_error(const char *file, int line, const char *msg, ...) {
+ }
+ 
+ const char *errno_string_maybe_using_buffer(int errsv, char *buf, size_t buflen) {
+-#ifdef _GNU_SOURCE
++#ifdef __GLIBC__
+     return strerror_r(errsv, buf, buflen);
+ #elif defined(_WIN32)
+     UNUSED errno_t res = strerror_s(buf, buflen, errsv);
+diff --git a/src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc b/src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc
+index 3b07392..aa1a1d3 100644
+--- a/src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc
++++ b/src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc
+@@ -110,9 +110,9 @@ static int BN_ext_count_low_zero_bits(const BIGNUM* bn) {
+ ExactFloat::ExactFloat(double v) {
+   BN_init(&bn_);
+   sign_ = signbit(v) ? -1 : 1;
+-  if (isnan(v)) {
++  if (std::isnan(v)) {
+     set_nan();
+-  } else if (isinf(v)) {
++  } else if (std::isinf(v)) {
+     set_inf(sign_);
+   } else {
+     // The following code is much simpler than messing about with bit masks,
+diff --git a/src/rdb_protocol/geo/s2/util/math/mathlimits.h b/src/rdb_protocol/geo/s2/util/math/mathlimits.h
+index 5148422..86af72d 100644
+--- a/src/rdb_protocol/geo/s2/util/math/mathlimits.h
++++ b/src/rdb_protocol/geo/s2/util/math/mathlimits.h
+@@ -14,7 +14,7 @@
+ #define UTIL_MATH_MATHLIMITS_H__
+ 
+ #include <string.h>
+-#include <math.h>
++#include <cmath>
+ #include <cfloat>
+ 
+ #include "rdb_protocol/geo/s2/base/basictypes.h"
+@@ -195,11 +195,11 @@ DECL_UNSIGNED_INT_LIMITS(unsigned long long int)
+   static bool IsNegInf(const Type x) { return _fpclass(x) == _FPCLASS_NINF; }
+ #else
+ #define DECL_FP_LIMIT_FUNCS \
+-  static bool IsFinite(const Type x) { return !isinf(x)  &&  !isnan(x); } \
+-  static bool IsNaN(const Type x) { return isnan(x); } \
+-  static bool IsInf(const Type x) { return isinf(x); } \
+-  static bool IsPosInf(const Type x) { return isinf(x)  &&  x > 0; } \
+-  static bool IsNegInf(const Type x) { return isinf(x)  &&  x < 0; }
++  static bool IsFinite(const Type x) { return !std::isinf(x)  &&  !std::isnan(x); } \
++  static bool IsNaN(const Type x) { return std::isnan(x); } \
++  static bool IsInf(const Type x) { return std::isinf(x); } \
++  static bool IsPosInf(const Type x) { return std::isinf(x)  &&  x > 0; } \
++  static bool IsNegInf(const Type x) { return std::isinf(x)  &&  x < 0; }
+ #endif
+ 
+ // We can't put floating-point constant values in the header here because
+diff --git a/src/threading.hpp b/src/threading.hpp
+index 14fc6a8..9bf033f 100644
+--- a/src/threading.hpp
++++ b/src/threading.hpp
+@@ -1,6 +1,8 @@
+ #ifndef THREADING_HPP_
+ #define THREADING_HPP_
+ 
++#include <sys/types.h>
++#include <unistd.h>
+ #include <functional>
+ #include <vector>
+ 

From 976657a71f96d9b7cdd09e96c8d1e844a74ce4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 1 Mar 2016 14:31:33 +0100
Subject: [PATCH 156/338] openspades: fix build

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

diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index df987b3f856..475a844c1ab 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "1aa848cck8qrp67ha9vrkzm3k24r2aiv1v4dxla6pi22rw98yxzm";
   };
 
+  # https://github.com/yvt/openspades/issues/354
+  postPatch = ''
+    substituteInPlace Sources/Client/Client_Input.cpp --replace "isnan(" "std::isnan("
+    substituteInPlace Sources/Client/Corpse.cpp --replace "isnan(" "std::isnan("
+    substituteInPlace Sources/Draw/SWMapRenderer.cpp --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf("
+  '';
+
   nativeBuildInputs = 
     with stdenv.lib;
     [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]

From 82fa1a796b1e8be27e5c02bc00c6cdba06b26693 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 1 Mar 2016 15:26:01 +0100
Subject: [PATCH 157/338] lib/copyPathToStore: annotate docstring

---
 pkgs/build-support/trivial-builders.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 6cd82adf8e7..93b8b1cbc42 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -157,6 +157,9 @@ rec {
       '';
 
   # Copy a path to the Nix store.
+  # Nix automatically copies files to the store before stringifying paths.
+  # If you need the store path of a file, ${copyPathToStore <path>} can be
+  # shortened to ${<path>}.
   copyPathToStore = builtins.filterSource (p: t: true);
 
   # Copy a list of paths to the Nix store.

From ac687200e3945ca70bd9170d8ac8b46b8b9d1206 Mon Sep 17 00:00:00 2001
From: Allan Espinosa <allan.espinosa@outlook.com>
Date: Sat, 26 Sep 2015 13:00:22 +0900
Subject: [PATCH 158/338] nexus: init at 2.12.0-01

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

diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
new file mode 100644
index 00000000000..1b2f48b696c
--- /dev/null
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+stdenv.mkDerivation rec {
+  name = "nexus-${version}";
+  version = "2.12.0-01";
+
+  src = fetchurl {
+    url = "https://sonatype-download.global.ssl.fastly.net/nexus/oss/nexus-${version}-bundle.tar.gz";
+    sha256 = "1k3z7kwcmr1pxaxfnak99fq5s8br9zbqbfpyw1afi86ykkph4g5z";
+  };
+
+  sourceRoot = name;
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = 
+    ''
+      mkdir -p $out
+      cp -rfv * $out
+      rm -fv $out/bin/nexus.bat
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Repository manager for binary software components";
+    homepage = http://www.sonatype.org/nexus;
+    license = licenses.epl10;
+    platforms = platforms.all;
+    maintainers = [ maintainers.aespinosa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 804230e05b0..931a7c413ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6112,6 +6112,8 @@ let
       pythonPackages = python3Packages;
   };
 
+  nexus = callPackage ../development/tools/repository-managers/nexus { };
+
   node_webkit = node_webkit_0_9;
 
   nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix {

From 98d8e1a160d3138e9ef3a51f727b04315ab9e285 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 1 Mar 2016 10:36:00 -0600
Subject: [PATCH 159/338] kde5: consolidate packages into desktops/kde-5

---
 .gitignore                                    |  4 +--
 .../kde-5/applications-15.12}/ark.nix         |  0
 .../applications-15.12}/baloo-widgets.nix     |  0
 .../kde-5/applications-15.12}/default.nix     |  0
 .../applications-15.12}/dolphin-plugins.nix   |  0
 .../kde-5/applications-15.12}/dolphin.nix     |  0
 .../kde-5/applications-15.12}/fetchsrcs.sh    |  0
 .../applications-15.12}/ffmpegthumbs.nix      |  0
 .../kde-5/applications-15.12}/filelight.nix   |  0
 .../kde-5/applications-15.12}/gpgmepp.nix     |  0
 .../kde-5/applications-15.12}/gwenview.nix    |  0
 .../kde-5/applications-15.12}/kate.nix        |  0
 .../kde-5/applications-15.12}/kcalc.nix       |  0
 .../kde-5/applications-15.12}/kde-app.nix     |  0
 .../applications-15.12}/kde-locale-4.nix      |  0
 .../applications-15.12}/kde-locale-5.nix      |  0
 .../kdegraphics-thumbnailers.nix              |  0
 .../0001-old-kde4-cmake-policies.patch        |  0
 .../kdelibs/0002-polkit-install-path.patch    |  0
 .../kdelibs/0003-remove_xdg_impurities.patch  |  0
 .../applications-15.12}/kdelibs/default.nix   |  0
 .../applications-15.12}/kdelibs/setup-hook.sh |  0
 .../kdenetwork-filesharing.nix                |  0
 .../kde-5/applications-15.12}/kgpg.nix        |  0
 .../kde-5/applications-15.12}/kio-extras.nix  |  0
 .../kde-5/applications-15.12}/konsole.nix     |  0
 .../kde-5/applications-15.12}/l10n.nix        |  0
 .../kde-5/applications-15.12}/libkdcraw.nix   |  0
 .../kde-5/applications-15.12}/libkexiv2.nix   |  0
 .../kde-5/applications-15.12}/libkipi.nix     |  0
 .../kde-5/applications-15.12}/okular.nix      |  0
 .../applications-15.12}/print-manager.nix     |  0
 .../kde-5/applications-15.12}/spectacle.nix   |  0
 .../kde-5/applications-15.12}/srcs.nix        |  0
 .../kde-5/frameworks-5.19}/attica.nix         |  0
 .../kde-5/frameworks-5.19}/baloo.nix          |  0
 .../kde-5/frameworks-5.19}/bluez-qt.nix       |  0
 .../kde-5/frameworks-5.19}/breeze-icons.nix   |  0
 .../kde-5/frameworks-5.19}/default.nix        |  0
 .../0001-extra-cmake-modules-paths.patch      |  0
 .../extra-cmake-modules/default.nix           |  0
 .../extra-cmake-modules/setup-hook.sh         |  0
 .../kde-5/frameworks-5.19}/fetchsrcs.sh       |  0
 .../frameworks-5.19}/frameworkintegration.nix |  0
 .../kde-5/frameworks-5.19}/kactivities.nix    |  0
 .../kde-5/frameworks-5.19}/kapidox.nix        |  0
 .../kde-5/frameworks-5.19}/karchive.nix       |  0
 .../kde-5/frameworks-5.19}/kauth/default.nix  |  0
 .../kauth/kauth-policy-install.patch          |  0
 .../kde-5/frameworks-5.19}/kbookmarks.nix     |  0
 .../0001-qdiriterator-follow-symlinks.patch   |  0
 .../frameworks-5.19}/kcmutils/default.nix     |  0
 .../kde-5/frameworks-5.19}/kcodecs.nix        |  0
 .../kde-5/frameworks-5.19}/kcompletion.nix    |  0
 .../kde-5/frameworks-5.19}/kconfig.nix        |  0
 .../0001-qdiriterator-follow-symlinks.patch   |  0
 .../kconfigwidgets/default.nix                |  0
 .../kde-5/frameworks-5.19}/kcoreaddons.nix    |  0
 .../kde-5/frameworks-5.19}/kcrash.nix         |  0
 .../kde-5/frameworks-5.19}/kdbusaddons.nix    |  0
 .../kde-5/frameworks-5.19}/kdeclarative.nix   |  0
 .../kde-5/frameworks-5.19}/kded.nix           |  0
 .../frameworks-5.19}/kdelibs4support.nix      |  0
 .../frameworks-5.19}/kdesignerplugin.nix      |  0
 .../kde-5/frameworks-5.19}/kdesu.nix          |  0
 .../kde-5/frameworks-5.19}/kdewebkit.nix      |  0
 .../kde-5/frameworks-5.19}/kdnssd.nix         |  0
 .../frameworks-5.19}/kdoctools/default.nix    |  0
 .../kdoctools-no-find-docbook-xml.patch       |  0
 .../frameworks-5.19}/kdoctools/setup-hook.sh  |  0
 .../kde-5/frameworks-5.19}/kemoticons.nix     |  0
 .../kde-5/frameworks-5.19}/kfilemetadata.nix  |  0
 .../kde-5/frameworks-5.19}/kglobalaccel.nix   |  0
 .../kde-5/frameworks-5.19}/kguiaddons.nix     |  0
 .../kde-5/frameworks-5.19}/khtml.nix          |  0
 .../kde-5/frameworks-5.19}/ki18n.nix          |  0
 .../kiconthemes/default-theme-breeze.patch    |  0
 .../frameworks-5.19}/kiconthemes/default.nix  |  0
 .../kde-5/frameworks-5.19}/kiconthemes/series |  0
 .../kde-5/frameworks-5.19}/kidletime.nix      |  0
 .../kde-5/frameworks-5.19}/kimageformats.nix  |  0
 .../kinit/0001-kinit-libpath.patch            |  0
 .../kde-5/frameworks-5.19}/kinit/default.nix  |  0
 .../kde-5/frameworks-5.19}/kio/default.nix    |  0
 .../kio/samba-search-path.patch               |  0
 .../kde-5/frameworks-5.19}/kio/series         |  0
 .../kde-5/frameworks-5.19}/kitemmodels.nix    |  0
 .../kde-5/frameworks-5.19}/kitemviews.nix     |  0
 .../kde-5/frameworks-5.19}/kjobwidgets.nix    |  0
 .../kde-5/frameworks-5.19}/kjs.nix            |  0
 .../kde-5/frameworks-5.19}/kjsembed.nix       |  0
 .../kde-5/frameworks-5.19}/kmediaplayer.nix   |  0
 .../kde-5/frameworks-5.19}/knewstuff.nix      |  0
 .../kde-5/frameworks-5.19}/knotifications.nix |  0
 .../kde-5/frameworks-5.19}/knotifyconfig.nix  |  0
 .../kpackage/allow-external-paths.patch       |  0
 .../frameworks-5.19}/kpackage/default.nix     |  0
 .../qdiriterator-follow-symlinks.patch        |  0
 .../kde-5/frameworks-5.19}/kpackage/series    |  0
 .../kde-5/frameworks-5.19}/kparts.nix         |  0
 .../kde-5/frameworks-5.19}/kpeople.nix        |  0
 .../kde-5/frameworks-5.19}/kplotting.nix      |  0
 .../kde-5/frameworks-5.19}/kpty.nix           |  0
 .../kde-5/frameworks-5.19}/kross.nix          |  0
 .../kde-5/frameworks-5.19}/krunner.nix        |  0
 .../0001-qdiriterator-follow-symlinks.patch   |  0
 .../kservice/0002-no-canonicalize-path.patch  |  0
 .../frameworks-5.19}/kservice/default.nix     |  0
 .../frameworks-5.19}/kservice/setup-hook.sh   |  0
 .../frameworks-5.19}/ktexteditor/default.nix  |  0
 .../ktexteditor/no-qcoreapplication.patch     |  0
 .../kde-5/frameworks-5.19}/ktexteditor/series |  0
 .../kde-5/frameworks-5.19}/ktextwidgets.nix   |  0
 .../frameworks-5.19}/kunitconversion.nix      |  0
 .../kde-5/frameworks-5.19}/kwallet.nix        |  0
 .../kde-5/frameworks-5.19}/kwidgetsaddons.nix |  0
 .../kde-5/frameworks-5.19}/kwindowsystem.nix  |  0
 .../kde-5/frameworks-5.19}/kxmlgui.nix        |  0
 .../kde-5/frameworks-5.19}/kxmlrpcclient.nix  |  0
 .../frameworks-5.19}/modemmanager-qt.nix      |  0
 .../frameworks-5.19}/networkmanager-qt.nix    |  0
 .../kde-5/frameworks-5.19}/oxygen-icons5.nix  |  0
 .../plasma-framework/default.nix              |  0
 .../kde-5/frameworks-5.19}/solid.nix          |  0
 .../kde-5/frameworks-5.19}/sonnet.nix         |  0
 .../kde-5/frameworks-5.19}/srcs.nix           |  0
 .../kde-5/frameworks-5.19}/threadweaver.nix   |  0
 .../{ => kde-5}/plasma-5.5/bluedevil.nix      |  0
 .../{ => kde-5}/plasma-5.5/breeze-gtk.nix     |  0
 .../{ => kde-5}/plasma-5.5/breeze-qt4.nix     |  0
 .../{ => kde-5}/plasma-5.5/breeze-qt5.nix     |  0
 .../{ => kde-5}/plasma-5.5/default.nix        |  0
 .../{ => kde-5}/plasma-5.5/fetchsrcs.sh       |  0
 .../{ => kde-5}/plasma-5.5/kde-cli-tools.nix  |  0
 .../kde-gtk-config/0001-follow-symlinks.patch |  0
 .../plasma-5.5/kde-gtk-config/default.nix     |  0
 .../{ => kde-5}/plasma-5.5/kdecoration.nix    |  0
 .../plasma-5.5/kdeplasma-addons.nix           |  0
 .../{ => kde-5}/plasma-5.5/kgamma5.nix        |  0
 .../{ => kde-5}/plasma-5.5/khelpcenter.nix    |  0
 .../{ => kde-5}/plasma-5.5/khotkeys.nix       |  0
 .../{ => kde-5}/plasma-5.5/kinfocenter.nix    |  0
 .../{ => kde-5}/plasma-5.5/kmenuedit.nix      |  0
 .../{ => kde-5}/plasma-5.5/kscreen.nix        |  0
 .../{ => kde-5}/plasma-5.5/kscreenlocker.nix  |  0
 .../{ => kde-5}/plasma-5.5/ksshaskpass.nix    |  0
 .../{ => kde-5}/plasma-5.5/ksysguard.nix      |  0
 .../{ => kde-5}/plasma-5.5/kwayland.nix       |  0
 .../0001-qdiriterator-follow-symlinks.patch   |  0
 .../{ => kde-5}/plasma-5.5/kwin/default.nix   |  0
 .../{ => kde-5}/plasma-5.5/kwrited.nix        |  0
 .../plasma-5.5/libkscreen/default.nix         |  0
 .../0001-qdiriterator-follow-symlinks.patch   |  0
 .../plasma-5.5/libksysguard/default.nix       |  0
 .../desktops/{ => kde-5}/plasma-5.5/milou.nix |  0
 .../{ => kde-5}/plasma-5.5/oxygen.nix         |  0
 .../0001-qt-5.5-QML-import-paths.patch        |  0
 .../plasma-desktop/0002-hwclock.patch         |  0
 .../plasma-desktop/0003-tzdir.patch           |  0
 .../plasma-5.5/plasma-desktop/default.nix     |  0
 .../plasma-5.5/plasma-mediacenter.nix         |  0
 ...-mobile-broadband-provider-info-path.patch |  0
 .../plasma-5.5/plasma-nm/default.nix          |  0
 .../{ => kde-5}/plasma-5.5/plasma-pa.nix      |  0
 .../plasma-workspace-wallpapers.nix           |  0
 .../plasma-5.5/plasma-workspace/default.nix   |  0
 .../plasma-workspace/qml-import-path.patch    |  0
 .../plasma-5.5/plasma-workspace/series        |  0
 .../plasma-workspace/startkde.patch           |  0
 .../plasma-5.5/polkit-kde-agent.nix           |  0
 .../{ => kde-5}/plasma-5.5/powerdevil.nix     |  0
 .../{ => kde-5}/plasma-5.5/setup-hook.sh      |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/srcs.nix |  0
 .../{ => kde-5}/plasma-5.5/systemsettings.nix |  0
 pkgs/top-level/all-packages.nix               | 30 ++++++++++++-------
 175 files changed, 21 insertions(+), 13 deletions(-)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/ark.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/baloo-widgets.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/default.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/dolphin-plugins.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/dolphin.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/fetchsrcs.sh (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/ffmpegthumbs.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/filelight.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/gpgmepp.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/gwenview.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kate.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kcalc.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-app.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-locale-4.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-locale-5.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdegraphics-thumbnailers.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0001-old-kde4-cmake-policies.patch (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0002-polkit-install-path.patch (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0003-remove_xdg_impurities.patch (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/default.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/setup-hook.sh (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdenetwork-filesharing.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kgpg.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kio-extras.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/konsole.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/l10n.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkdcraw.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkexiv2.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkipi.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/okular.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/print-manager.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/spectacle.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/srcs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/attica.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/baloo.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/bluez-qt.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/breeze-icons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/0001-extra-cmake-modules-paths.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/setup-hook.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/fetchsrcs.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/frameworkintegration.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kactivities.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kapidox.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/karchive.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kauth/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kauth/kauth-policy-install.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kbookmarks.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcmutils/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcmutils/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcodecs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcompletion.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfig.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfigwidgets/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcoreaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcrash.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdbusaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdeclarative.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kded.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdelibs4support.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdesignerplugin.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdesu.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdewebkit.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdnssd.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/kdoctools-no-find-docbook-xml.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/setup-hook.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kemoticons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kfilemetadata.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kglobalaccel.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kguiaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/khtml.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ki18n.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/default-theme-breeze.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kidletime.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kimageformats.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kinit/0001-kinit-libpath.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kinit/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/samba-search-path.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kitemmodels.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kitemviews.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjobwidgets.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjsembed.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kmediaplayer.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knewstuff.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knotifications.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knotifyconfig.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/allow-external-paths.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kparts.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpeople.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kplotting.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpty.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kross.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/krunner.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/0002-no-canonicalize-path.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/setup-hook.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/no-qcoreapplication.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktextwidgets.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kunitconversion.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwallet.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwidgetsaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwindowsystem.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kxmlgui.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kxmlrpcclient.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/modemmanager-qt.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/networkmanager-qt.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/oxygen-icons5.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/plasma-framework/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/solid.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/sonnet.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/srcs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/threadweaver.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/bluedevil.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-gtk.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-qt4.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-qt5.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/fetchsrcs.sh (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-cli-tools.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-gtk-config/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kdecoration.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kdeplasma-addons.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kgamma5.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/khelpcenter.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/khotkeys.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kinfocenter.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kmenuedit.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kscreen.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kscreenlocker.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/ksshaskpass.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/ksysguard.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwayland.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwin/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwrited.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/libkscreen/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/libksysguard/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/milou.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/oxygen.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0002-hwclock.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0003-tzdir.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-mediacenter.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-nm/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-pa.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace-wallpapers.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/qml-import-path.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/series (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/startkde.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/polkit-kde-agent.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/powerdevil.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/setup-hook.sh (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/srcs.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/systemsettings.nix (100%)

diff --git a/.gitignore b/.gitignore
index 74de941b768..dba957f7662 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,5 @@ result-*
 
 .DS_Store
 
-/pkgs/applications/kde-apps-*/tmp/
-/pkgs/development/libraries/kde-frameworks-*/tmp/
 /pkgs/development/libraries/qt-5/*/tmp/
-/pkgs/desktops/plasma-*/tmp/
\ No newline at end of file
+/pkgs/desktops/kde-5/*/tmp/
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.12/ark.nix b/pkgs/desktops/kde-5/applications-15.12/ark.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/ark.nix
rename to pkgs/desktops/kde-5/applications-15.12/ark.nix
diff --git a/pkgs/applications/kde-apps-15.12/baloo-widgets.nix b/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/baloo-widgets.nix
rename to pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/desktops/kde-5/applications-15.12/default.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/default.nix
rename to pkgs/desktops/kde-5/applications-15.12/default.nix
diff --git a/pkgs/applications/kde-apps-15.12/dolphin-plugins.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/dolphin-plugins.nix
rename to pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
diff --git a/pkgs/applications/kde-apps-15.12/dolphin.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/dolphin.nix
rename to pkgs/desktops/kde-5/applications-15.12/dolphin.nix
diff --git a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh b/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/fetchsrcs.sh
rename to pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
diff --git a/pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix b/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix
rename to pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
diff --git a/pkgs/applications/kde-apps-15.12/filelight.nix b/pkgs/desktops/kde-5/applications-15.12/filelight.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/filelight.nix
rename to pkgs/desktops/kde-5/applications-15.12/filelight.nix
diff --git a/pkgs/applications/kde-apps-15.12/gpgmepp.nix b/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/gpgmepp.nix
rename to pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
diff --git a/pkgs/applications/kde-apps-15.12/gwenview.nix b/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/gwenview.nix
rename to pkgs/desktops/kde-5/applications-15.12/gwenview.nix
diff --git a/pkgs/applications/kde-apps-15.12/kate.nix b/pkgs/desktops/kde-5/applications-15.12/kate.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kate.nix
rename to pkgs/desktops/kde-5/applications-15.12/kate.nix
diff --git a/pkgs/applications/kde-apps-15.12/kcalc.nix b/pkgs/desktops/kde-5/applications-15.12/kcalc.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kcalc.nix
rename to pkgs/desktops/kde-5/applications-15.12/kcalc.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-app.nix b/pkgs/desktops/kde-5/applications-15.12/kde-app.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kde-app.nix
rename to pkgs/desktops/kde-5/applications-15.12/kde-app.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-4.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kde-locale-4.nix
rename to pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-5.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kde-locale-5.nix
rename to pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix
rename to pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/default.nix b/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/default.nix
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh b/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
diff --git a/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix b/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix
rename to pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
diff --git a/pkgs/applications/kde-apps-15.12/kgpg.nix b/pkgs/desktops/kde-5/applications-15.12/kgpg.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kgpg.nix
rename to pkgs/desktops/kde-5/applications-15.12/kgpg.nix
diff --git a/pkgs/applications/kde-apps-15.12/kio-extras.nix b/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kio-extras.nix
rename to pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
diff --git a/pkgs/applications/kde-apps-15.12/konsole.nix b/pkgs/desktops/kde-5/applications-15.12/konsole.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/konsole.nix
rename to pkgs/desktops/kde-5/applications-15.12/konsole.nix
diff --git a/pkgs/applications/kde-apps-15.12/l10n.nix b/pkgs/desktops/kde-5/applications-15.12/l10n.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/l10n.nix
rename to pkgs/desktops/kde-5/applications-15.12/l10n.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkdcraw.nix b/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/libkdcraw.nix
rename to pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkexiv2.nix b/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/libkexiv2.nix
rename to pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkipi.nix b/pkgs/desktops/kde-5/applications-15.12/libkipi.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/libkipi.nix
rename to pkgs/desktops/kde-5/applications-15.12/libkipi.nix
diff --git a/pkgs/applications/kde-apps-15.12/okular.nix b/pkgs/desktops/kde-5/applications-15.12/okular.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/okular.nix
rename to pkgs/desktops/kde-5/applications-15.12/okular.nix
diff --git a/pkgs/applications/kde-apps-15.12/print-manager.nix b/pkgs/desktops/kde-5/applications-15.12/print-manager.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/print-manager.nix
rename to pkgs/desktops/kde-5/applications-15.12/print-manager.nix
diff --git a/pkgs/applications/kde-apps-15.12/spectacle.nix b/pkgs/desktops/kde-5/applications-15.12/spectacle.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/spectacle.nix
rename to pkgs/desktops/kde-5/applications-15.12/spectacle.nix
diff --git a/pkgs/applications/kde-apps-15.12/srcs.nix b/pkgs/desktops/kde-5/applications-15.12/srcs.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/srcs.nix
rename to pkgs/desktops/kde-5/applications-15.12/srcs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix b/pkgs/desktops/kde-5/frameworks-5.19/attica.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/attica.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/attica.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh b/pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix b/pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix b/pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch b/pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix b/pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix b/pkgs/desktops/kde-5/frameworks-5.19/kded.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kded.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kded.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix b/pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix b/pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix b/pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix b/pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks-5.19/kinit/0001-kinit-libpath.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kinit/0001-kinit-libpath.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/series b/pkgs/desktops/kde-5/frameworks-5.19/kio/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kio/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kio/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix b/pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix b/pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix b/pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix b/pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix b/pkgs/desktops/kde-5/frameworks-5.19/kross.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kross.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kross.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
rename to pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix b/pkgs/desktops/kde-5/frameworks-5.19/solid.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/solid.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/solid.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix b/pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix b/pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
diff --git a/pkgs/desktops/plasma-5.5/bluedevil.nix b/pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/bluedevil.nix
rename to pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/breeze-gtk.nix
rename to pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/breeze-qt4.nix
rename to pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/breeze-qt5.nix
rename to pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/kde-5/plasma-5.5/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/default.nix
diff --git a/pkgs/desktops/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
similarity index 100%
rename from pkgs/desktops/plasma-5.5/fetchsrcs.sh
rename to pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
diff --git a/pkgs/desktops/plasma-5.5/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kde-cli-tools.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
diff --git a/pkgs/desktops/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
diff --git a/pkgs/desktops/plasma-5.5/kdecoration.nix b/pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kdecoration.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
diff --git a/pkgs/desktops/plasma-5.5/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kdeplasma-addons.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
diff --git a/pkgs/desktops/plasma-5.5/kgamma5.nix b/pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kgamma5.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
diff --git a/pkgs/desktops/plasma-5.5/khelpcenter.nix b/pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/khelpcenter.nix
rename to pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
diff --git a/pkgs/desktops/plasma-5.5/khotkeys.nix b/pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/khotkeys.nix
rename to pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
diff --git a/pkgs/desktops/plasma-5.5/kinfocenter.nix b/pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kinfocenter.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
diff --git a/pkgs/desktops/plasma-5.5/kmenuedit.nix b/pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kmenuedit.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
diff --git a/pkgs/desktops/plasma-5.5/kscreen.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kscreen.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
diff --git a/pkgs/desktops/plasma-5.5/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kscreenlocker.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
diff --git a/pkgs/desktops/plasma-5.5/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/ksshaskpass.nix
rename to pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
diff --git a/pkgs/desktops/plasma-5.5/ksysguard.nix b/pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/ksysguard.nix
rename to pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
diff --git a/pkgs/desktops/plasma-5.5/kwayland.nix b/pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwayland.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
diff --git a/pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/kwin/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwin/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
diff --git a/pkgs/desktops/plasma-5.5/kwrited.nix b/pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwrited.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
diff --git a/pkgs/desktops/plasma-5.5/libkscreen/default.nix b/pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/libkscreen/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
diff --git a/pkgs/desktops/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/libksysguard/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
diff --git a/pkgs/desktops/plasma-5.5/milou.nix b/pkgs/desktops/kde-5/plasma-5.5/milou.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/milou.nix
rename to pkgs/desktops/kde-5/plasma-5.5/milou.nix
diff --git a/pkgs/desktops/plasma-5.5/oxygen.nix b/pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/oxygen.nix
rename to pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-mediacenter.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-nm/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-pa.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-pa.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/series
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
diff --git a/pkgs/desktops/plasma-5.5/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/polkit-kde-agent.nix
rename to pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
diff --git a/pkgs/desktops/plasma-5.5/powerdevil.nix b/pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/powerdevil.nix
rename to pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
diff --git a/pkgs/desktops/plasma-5.5/setup-hook.sh b/pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/plasma-5.5/setup-hook.sh
rename to pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh
diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/srcs.nix
rename to pkgs/desktops/kde-5/plasma-5.5/srcs.nix
diff --git a/pkgs/desktops/plasma-5.5/systemsettings.nix b/pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/systemsettings.nix
rename to pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 804230e05b0..5b295d1d77e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15188,23 +15188,33 @@ let
 
   kde5 =
     let
-      frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; };
-      plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
-      apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
-      named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };
+      frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; };
+      plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; };
+      applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; };
       merged = self:
-        named self // frameworks self // plasma self // apps self // kde5PackagesFun self;
+        { plasma = plasma self;
+          frameworks = frameworks self;
+          applications = applications self; }
+        // frameworks self
+        // plasma self
+        // applications self
+        // kde5PackagesFun self;
     in
       recurseIntoAttrs (lib.makeScope qt55.newScope merged);
 
   kde5_latest =
     let
-      frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; };
-      plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
-      apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
-      named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };
+      frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; };
+      plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; };
+      applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; };
       merged = self:
-        named self // frameworks self // plasma self // apps self // kde5PackagesFun self;
+        { plasma = plasma self;
+          frameworks = frameworks self;
+          applications = applications self; }
+        // frameworks self
+        // plasma self
+        // applications self
+        // kde5PackagesFun self;
     in
       recurseIntoAttrs (lib.makeScope qt55.newScope merged);
 

From 1f89aa6c7f2f16c8c0834cfa65b8484fecd72af3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 1 Mar 2016 19:02:36 +0100
Subject: [PATCH 160/338] nixos/tests: Remove tests.boot.boot* prefixes

As @bobvanderlinden suggests in #13585:

"Looks like that cleans things up quite a bit! Just one aesthetics note,
the boot tests could now be renamed from boot.bootBiosCdrom to
boot.biosCdrom in nixos/tests/boot.nix:L33.

That makes them more consistent with the other tests."

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release-combined.nix | 2 +-
 nixos/tests/boot.nix       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 69cc357078d..958e587444d 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -63,7 +63,7 @@ in rec {
         (all nixos.tests.installer.btrfsSimple)
         (all nixos.tests.installer.btrfsSubvols)
         (all nixos.tests.installer.btrfsSubvolDefault)
-        (all nixos.tests.boot.bootBiosCdrom)
+        (all nixos.tests.boot.biosCdrom)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
         #(all nixos.tests.lightdm)
diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix
index 6a1d330155e..905d1645882 100644
--- a/nixos/tests/boot.nix
+++ b/nixos/tests/boot.nix
@@ -30,17 +30,17 @@ let
         '';
     };
 in {
-    bootBiosCdrom = makeBootTest "bios-cdrom" ''
+    biosCdrom = makeBootTest "bios-cdrom" ''
         cdrom => glob("${iso}/iso/*.iso")
       '';
-    bootBiosUsb = makeBootTest "bios-usb" ''
+    biosUsb = makeBootTest "bios-usb" ''
         usb => glob("${iso}/iso/*.iso")
       '';
-    bootUefiCdrom = makeBootTest "uefi-cdrom" ''
+    uefiCdrom = makeBootTest "uefi-cdrom" ''
         cdrom => glob("${iso}/iso/*.iso"),
         bios => '${pkgs.OVMF}/FV/OVMF.fd'
       '';
-    bootUefiUsb = makeBootTest "uefi-usb" ''
+    uefiUsb = makeBootTest "uefi-usb" ''
         usb => glob("${iso}/iso/*.iso"),
         bios => '${pkgs.OVMF}/FV/OVMF.fd'
       '';

From 78602b68069711b5d9d5904d27f237119e171aae Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 1 Mar 2016 13:38:45 -0600
Subject: [PATCH 161/338] kde5.plasma: 5.5.4 -> 5.5.5

---
 pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh |   2 +-
 pkgs/desktops/kde-5/plasma-5.5/srcs.nix     | 304 ++++++++++----------
 2 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
index 714e0fc7509..d2b426b85d6 100755
--- a/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
+++ b/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/plasma/5.5.4/"
+RELEASE_URL="http://download.kde.org/stable/plasma/5.5.5/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp
diff --git a/pkgs/desktops/kde-5/plasma-5.5/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
index 3b63c864045..40fe5618ff8 100644
--- a/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
@@ -3,307 +3,307 @@
 
 {
   bluedevil = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/bluedevil-5.5.4.tar.xz";
-      sha256 = "1r20dlsg83d3lrnbdb92cpd7h0s2fmh0vjv3xi5z6rf741463p14";
-      name = "bluedevil-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/bluedevil-5.5.5.tar.xz";
+      sha256 = "10fm3gf28c4hwy628z8wy82j6n00z6xf0vad52jahwzz98w5xy9l";
+      name = "bluedevil-5.5.5.tar.xz";
     };
   };
   breeze = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/breeze-5.5.4.tar.xz";
-      sha256 = "0chlp5z5zz19rh9k4ffjr92hn07dmavfcwx0wwffy8qhiw6qw7w3";
-      name = "breeze-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/breeze-5.5.5.tar.xz";
+      sha256 = "0xxfykg1gsr65jb8jmkk6qr991cvdfibpb9228kb16kpfn73k45l";
+      name = "breeze-5.5.5.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/breeze-gtk-5.5.4.tar.xz";
-      sha256 = "1r6ihmpgha1s4hvgr4jliqvbraw06fnaa4sjrhzqbx9dh00y5d8v";
-      name = "breeze-gtk-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/breeze-gtk-5.5.5.tar.xz";
+      sha256 = "047b5xrbpk2d1x1srxpx2j5sp0kjzfvgh1xaldirxpcla6jpjj65";
+      name = "breeze-gtk-5.5.5.tar.xz";
     };
   };
   discover = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/discover-5.5.4.tar.xz";
-      sha256 = "0d5s8b9f5az40ajviijc67rz5l2345wlrqacjm4pdi8fqvxivb1v";
-      name = "discover-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/discover-5.5.5.tar.xz";
+      sha256 = "0asbn69k4agr0jyw249bnw8xhi9hnj18asij0h1a8r5wlqbqj22a";
+      name = "discover-5.5.5.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kde-cli-tools-5.5.4.tar.xz";
-      sha256 = "1w9l8lh05k6xjdz0nccfygp76lp3wf3xa6pizmgv27wq21pw4wxy";
-      name = "kde-cli-tools-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kde-cli-tools-5.5.5.tar.xz";
+      sha256 = "19iggnanlxz1j2xx9l2p7wwf1471yic9fyjfhhk0wfj2z3ickmsh";
+      name = "kde-cli-tools-5.5.5.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kdecoration-5.5.4.tar.xz";
-      sha256 = "1ghgvg0lfjjlgl3a9ryw1y8aqihdwrkr7qjph4v3p9brlpqm5326";
-      name = "kdecoration-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kdecoration-5.5.5.tar.xz";
+      sha256 = "0ix4jnqm5jpfdhgr6r8j1mwasics22i63hacd6h8gj5klhbgsqvc";
+      name = "kdecoration-5.5.5.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kde-gtk-config-5.5.4.tar.xz";
-      sha256 = "062jgc2sqd93yz5n1z4n7h50k7zsiayi3z901y2rq0x62nndff1m";
-      name = "kde-gtk-config-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kde-gtk-config-5.5.5.tar.xz";
+      sha256 = "0b6xkpfy4da3vign82z186ghg61l6k9sisppmfgmy5ycqjp4yghq";
+      name = "kde-gtk-config-5.5.5.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kdeplasma-addons-5.5.4.tar.xz";
-      sha256 = "0yrrjkh632q3ns068j7avaf2rkn2n54sf594jyl30q5fxc22mhq1";
-      name = "kdeplasma-addons-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kdeplasma-addons-5.5.5.tar.xz";
+      sha256 = "1l327fi0x3vljkj7f3113ryynxrsk16qhn0vpsdxc7f169vf4isx";
+      name = "kdeplasma-addons-5.5.5.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kgamma5-5.5.4.tar.xz";
-      sha256 = "0w63m1sxq2fa0wabyyry4prbzc2c54adc56hfhkh84rflccfbnc2";
-      name = "kgamma5-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kgamma5-5.5.5.tar.xz";
+      sha256 = "1597q98iw4dmkzm40525xlcjj3xfrgsmhp8djgm2yk92bjxy7ydj";
+      name = "kgamma5-5.5.5.tar.xz";
     };
   };
   khelpcenter = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/khelpcenter-5.5.4.tar.xz";
-      sha256 = "01kw97p1xz2gghghykkv953bvypcyd080fxknjrzn4v9gl5mrjv0";
-      name = "khelpcenter-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/khelpcenter-5.5.5.tar.xz";
+      sha256 = "04q5rj5g882qzdzvxxil6668x77iwvbpqx0z8jzm5z80x0xrg44p";
+      name = "khelpcenter-5.5.5.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/khotkeys-5.5.4.tar.xz";
-      sha256 = "1jlpzqrww2n9zf5cwlvpyvxcz0wv0cyln1xjhm49ayl5iin3m9yn";
-      name = "khotkeys-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/khotkeys-5.5.5.tar.xz";
+      sha256 = "12rrgs7slais8xagv3rn06him4qq21cahlb1yh3gpz571mhyl1nj";
+      name = "khotkeys-5.5.5.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kinfocenter-5.5.4.tar.xz";
-      sha256 = "10qhq76ha1mahpmgrj4kw660zf92k7ys3mz2dkiid7ib6gsimir4";
-      name = "kinfocenter-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kinfocenter-5.5.5.tar.xz";
+      sha256 = "1j76cfpilhjy97541l90fm6nsamlwa4q4ap7hrp65cdwi5lb08c2";
+      name = "kinfocenter-5.5.5.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kmenuedit-5.5.4.tar.xz";
-      sha256 = "0scsr3isf4d0hlk85pk0snn6j5cwm7qlqnl6iqs0df32g8ysirs6";
-      name = "kmenuedit-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kmenuedit-5.5.5.tar.xz";
+      sha256 = "010fdfp7kawwhvg76ypzq4rs047xkc2gxz3cfifaybiz5z1y4mdj";
+      name = "kmenuedit-5.5.5.tar.xz";
     };
   };
   kscreen = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kscreen-5.5.4.tar.xz";
-      sha256 = "0ax67gqfjw59jk3wh3sflk3q10xqrjwf2qmvx6jky6q2x4kdixvv";
-      name = "kscreen-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kscreen-5.5.5.tar.xz";
+      sha256 = "1a0fq2x30nnrq2r4slgmfziibbdjmbzh1n8q8ym1lj18j5zyhqcz";
+      name = "kscreen-5.5.5.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kscreenlocker-5.5.4.tar.xz";
-      sha256 = "18r53f5vri8xaj53zskadnxqxs60akxmwkq54xnb4lvg5cks9hrr";
-      name = "kscreenlocker-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kscreenlocker-5.5.5.tar.xz";
+      sha256 = "00sq4ddb30sxdp6br9h8r4rb07hra3vqv0kxvqfdr50hhcq8dbbw";
+      name = "kscreenlocker-5.5.5.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/ksshaskpass-5.5.4.tar.xz";
-      sha256 = "0hlgf7896qksivmf79ks0xcqndjvmmq13ywrkc0l43pcj50ydhj2";
-      name = "ksshaskpass-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/ksshaskpass-5.5.5.tar.xz";
+      sha256 = "0szw50wfwh8dvwm61m3azk96di6fr0ymvjhjqffy6ja41kslhp4a";
+      name = "ksshaskpass-5.5.5.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/ksysguard-5.5.4.tar.xz";
-      sha256 = "1hbq8ppz9ijkk032aldrxyfwk1yrpjchfy6w6mg836bi8f69i1kc";
-      name = "ksysguard-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/ksysguard-5.5.5.tar.xz";
+      sha256 = "020b5fkkj3baqg7clhkvpjhqp5xl0gdzyh75b19sx4ba3akpqx5m";
+      name = "ksysguard-5.5.5.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kwallet-pam-5.5.4.tar.xz";
-      sha256 = "0cj9iq7ba24lccgj3h4fpa97bcm3lw3yz43hfhldiwdkzl1pydhl";
-      name = "kwallet-pam-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kwallet-pam-5.5.5.tar.xz";
+      sha256 = "0dlkm1dm60fbnwdmfhiql6mkqrqkdpqi04qa6xxpccijb6h57h8r";
+      name = "kwallet-pam-5.5.5.tar.xz";
     };
   };
   kwayland = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kwayland-5.5.4.tar.xz";
-      sha256 = "1cprg187h8pny86910m08pzyvknbcqa9x3xbqh7flrpw0rvrg5wp";
-      name = "kwayland-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kwayland-5.5.5.tar.xz";
+      sha256 = "04p6m9fgllarh7l449injjn5426bqfjwyab0d739p0ys6kdm9hqh";
+      name = "kwayland-5.5.5.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kwayland-integration-5.5.4.tar.xz";
-      sha256 = "07vv7gjqgmgn766p6nifn2i835rdhs6kvp24a5fqnh8ad24m8fjy";
-      name = "kwayland-integration-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kwayland-integration-5.5.5.tar.xz";
+      sha256 = "1ijllnfxy5ackz6bbxffi31ibpsrmgg3abm74x1p2m6a5r4f6bj8";
+      name = "kwayland-integration-5.5.5.tar.xz";
     };
   };
   kwin = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kwin-5.5.4.tar.xz";
-      sha256 = "1015a0d3yi5b4isfkrl3w3mdslh0r1xyhvy9z8liz3wnxgrajwj8";
-      name = "kwin-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kwin-5.5.5.tar.xz";
+      sha256 = "1i79qq9p0rfz6gjjx9m1kjskrnh2kkpvkgp20cw8akn1cgi755vm";
+      name = "kwin-5.5.5.tar.xz";
     };
   };
   kwrited = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kwrited-5.5.4.tar.xz";
-      sha256 = "01d8q3hj5frhmafsavgvyz2nlbd4ma4fsx12dhjyxqsgxdvvgffh";
-      name = "kwrited-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kwrited-5.5.5.tar.xz";
+      sha256 = "17hq5jknqaqdf571m3ahdf3dwvphrmxj3jxgl5bhrb9zh5whjsi3";
+      name = "kwrited-5.5.5.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/libkscreen-5.5.4.tar.xz";
-      sha256 = "15q7x844x8cz15b3mkh4lwygvrx66s0fl706b221p3my54n63ymf";
-      name = "libkscreen-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/libkscreen-5.5.5.tar.xz";
+      sha256 = "1djv0h6vw4ijfsd281pxr3yxi24rjbg7kshpm6qhfn3gbhz7qbqv";
+      name = "libkscreen-5.5.5.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/libksysguard-5.5.4.tar.xz";
-      sha256 = "1irrb3im0gr8yhkp570bqipbqz8igpxr2k4kxb2c04111npkqmw1";
-      name = "libksysguard-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/libksysguard-5.5.5.tar.xz";
+      sha256 = "16ky6xmd60ga2a09kgd4111rhly1p26dv72xmda4n40zswd6k1j2";
+      name = "libksysguard-5.5.5.tar.xz";
     };
   };
   milou = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/milou-5.5.4.tar.xz";
-      sha256 = "0dc8jbk0yihqv5jxd4i12rmvfyyp63b6hx9q22qjrj5gkda1cddl";
-      name = "milou-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/milou-5.5.5.tar.xz";
+      sha256 = "1fzbni8lyrx858pd3b1365x84pmyjamxa5f56q2h3ahzdhb726l5";
+      name = "milou-5.5.5.tar.xz";
     };
   };
   oxygen = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/oxygen-5.5.4.tar.xz";
-      sha256 = "10fjwk1aznpkrnal961kfwpjjil2iy2n0x96h26bh91l4insix1v";
-      name = "oxygen-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/oxygen-5.5.5.tar.xz";
+      sha256 = "1hmzvpsh0rpp2aps77cs9w4fqdfa3y5fbq7mpx97sp2z072x6i12";
+      name = "oxygen-5.5.5.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-desktop-5.5.4.tar.xz";
-      sha256 = "0lkjgbqinxy40w6z01akpihljqpm7bachmxqmcp6fjnzawql2xqd";
-      name = "plasma-desktop-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-desktop-5.5.5.tar.xz";
+      sha256 = "12za7c6c28iccw0b7ccrwz0hj2pa71387334jdinl2a1f60xljb6";
+      name = "plasma-desktop-5.5.5.tar.xz";
     };
   };
   plasma-mediacenter = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-mediacenter-5.5.4.tar.xz";
-      sha256 = "1rn7qffd11dljx1il7cw74wbqf4lwmmlcv19yxj08fdrp5ylqr8a";
-      name = "plasma-mediacenter-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-mediacenter-5.5.5.tar.xz";
+      sha256 = "1yixqsajxf9jp5n16n0zg53iypmp9c114lbnhlr5ni1a0dqgfc8j";
+      name = "plasma-mediacenter-5.5.5.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-nm-5.5.4.tar.xz";
-      sha256 = "0bjfcsavrqx4i4c0ynfmdna7fnmabm8970h3dnx7ihwsqgjf5q31";
-      name = "plasma-nm-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-nm-5.5.5.tar.xz";
+      sha256 = "0xffyfw1pb53h686lfc1v9k5f2p3mjqgzi49h6j46l2zxd2wi9w4";
+      name = "plasma-nm-5.5.5.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-pa-5.5.4.tar.xz";
-      sha256 = "0d1cdixgxa2vsgv47hinh5nsbf2bln3ppdlrnzz9vglian0z7879";
-      name = "plasma-pa-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-pa-5.5.5.tar.xz";
+      sha256 = "1msmnci4id2qxj1453qizx3zsmdf2rpryy83c7j192izc25ry6sh";
+      name = "plasma-pa-5.5.5.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-sdk-5.5.4.tar.xz";
-      sha256 = "0fdx4f8z00276s1p1v1bkbrhy59jswk2dj8kcj96r2rk3xzcg0ax";
-      name = "plasma-sdk-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-sdk-5.5.5.tar.xz";
+      sha256 = "0301h0h1z5id0win0599qwhvxdxz6m881qadyzwxrvhysj3r1sd8";
+      name = "plasma-sdk-5.5.5.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.5.4";
+    version = "5.5.5.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-workspace-5.5.4.tar.xz";
-      sha256 = "0zh96qq0nl1c6bni7vnciba548f3cjacsi06n2rv05356j1fp87h";
-      name = "plasma-workspace-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-workspace-5.5.5.1.tar.xz";
+      sha256 = "1grhw60rd5dl07fl0dr96fq6c6d7076k5m2hjg6w6w9ynb76sg6h";
+      name = "plasma-workspace-5.5.5.1.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-workspace-wallpapers-5.5.4.tar.xz";
-      sha256 = "0p111f95di11k4v19c1mg694c71825najmi8dzj2qrif5sb2vvsn";
-      name = "plasma-workspace-wallpapers-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-workspace-wallpapers-5.5.5.tar.xz";
+      sha256 = "01mrrz6y81ypsd33ldpcz1llj13faqmrip5fg9fxqf6vjbh7jlcp";
+      name = "plasma-workspace-wallpapers-5.5.5.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.5.4";
+    version = "1-5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/polkit-kde-agent-1-5.5.4.tar.xz";
-      sha256 = "116sj9s45n3qcgfsdz5hh6a73b0hldgcnxbpvi4320xpny316vh2";
-      name = "polkit-kde-agent-1-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/polkit-kde-agent-1-5.5.5.tar.xz";
+      sha256 = "0pcwzb747gjp2s68i3apv5q2cfl3igkf1hsx0v1j1y7sk4diqkj9";
+      name = "polkit-kde-agent-1-5.5.5.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/powerdevil-5.5.4.tar.xz";
-      sha256 = "0i0i55g72yb9z8agv1yyrx98l3s0fs5wn51kz571vqqrw6m3wn7l";
-      name = "powerdevil-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/powerdevil-5.5.5.tar.xz";
+      sha256 = "1sb046pyir6x75r2gpqcq6765igpdc0hl9g5jams6j3l65ivzgvk";
+      name = "powerdevil-5.5.5.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/sddm-kcm-5.5.4.tar.xz";
-      sha256 = "04vh4f2hg5584acb5ywf1i8z6lvz0fcs7zh085bm7pkx5l60l59b";
-      name = "sddm-kcm-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/sddm-kcm-5.5.5.tar.xz";
+      sha256 = "0zpl6wfpgvmkf80aqn4b46wrpk1a81yz7srxcnw857xyhvw31m6g";
+      name = "sddm-kcm-5.5.5.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/systemsettings-5.5.4.tar.xz";
-      sha256 = "1i7ljxsnwf2kwd05kzxirbyaxj3w5kyr0jq9j0iy3jlz97p4jkpv";
-      name = "systemsettings-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/systemsettings-5.5.5.tar.xz";
+      sha256 = "183sb898f1452ljdk11k6wqy4dgzlgnicjlrygjfgvw9sz0vgn90";
+      name = "systemsettings-5.5.5.tar.xz";
     };
   };
   user-manager = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/user-manager-5.5.4.tar.xz";
-      sha256 = "17lki4y77rq1n100p74q4n6sm3l5dxvv996wf4w1j2n2aiw89p4j";
-      name = "user-manager-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/user-manager-5.5.5.tar.xz";
+      sha256 = "1g9fm1i05mzmjs3c5fsg45pf8nd28vhh7g5awbpd397z586gr44y";
+      name = "user-manager-5.5.5.tar.xz";
     };
   };
 }

From 78b80ee635262ef39ca855bbfd3a348a93bdfee4 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 1 Mar 2016 19:41:09 +0000
Subject: [PATCH 162/338] girara: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index e91e94695f5..0b721b562b5 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -5,11 +5,11 @@ assert withBuildColors -> ncurses != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "girara-${version}";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
-    sha256 = "0pnfdsg435b5vc4x8l9pgm77aj7ram1q0bzrp9g4a3bh1r64xq1f";
+    sha256 = "14m8mfbck49ldwi1w2i47bbg5c9daglcmvz9v2g1hnrq8k8g5x2w";
   };
 
   preConfigure = ''

From cbf09c69362023abe0c6f3775de88ebbddf260d7 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 1 Mar 2016 19:41:31 +0000
Subject: [PATCH 163/338] zathura: 0.3.3 -> 0.3.5

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

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index cab6423b77e..3a88409999f 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon, sqlite }:
+{ stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon, sqlite, glib }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.3";
+  version = "0.3.5";
   name = "zathura-core-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
-    sha256 = "1rywx09qn6ap5hb1z31wxby4lzdrqdbldm51pjk1ifflr37xwirk";
+    sha256 = "031kdr10065q14nixc4p58c4rgvrqcmn9x39b19h2357kzabaw9a";
   };
 
-  buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite ];
+  buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite glib ];
+
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
 
   makeFlags = [
     "PREFIX=$(out)"

From f3d94cfc23a2787772a369e2ca9e0cd94e72b8b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Mar 2016 20:47:08 +0100
Subject: [PATCH 164/338] Revert "Add the tool "nixos-typecheck" that can check
 an option declaration to:"

This reverts commit cad8957eabcbf73062226d28366fd446c15c8737. It
breaks NixOps, but more importantly, such major changes to the module
system really need to be reviewed.
---
 lib/modules.nix                               |  99 ++------
 lib/options.nix                               | 145 ++----------
 lib/types.nix                                 | 221 ++++--------------
 nixos/default.nix                             |   2 -
 nixos/doc/manual/default.nix                  |   6 +-
 .../development/option-declarations.xml       | 106 +--------
 nixos/lib/eval-config.nix                     |  15 +-
 nixos/lib/typechecker.nix                     |  91 --------
 nixos/modules/config/i18n.nix                 |   1 -
 nixos/modules/config/sysctl.nix               |   1 -
 nixos/modules/installer/tools/nixos-option.sh |   4 +-
 .../installer/tools/nixos-typecheck.sh        |  52 -----
 nixos/modules/installer/tools/tools.nix       |   8 +-
 nixos/modules/misc/meta.nix                   |   1 -
 nixos/modules/misc/nixpkgs.nix                |  51 ++--
 nixos/modules/module-list.nix                 |   1 -
 nixos/modules/services/misc/gitlab.nix        |   3 -
 nixos/modules/services/misc/ihaskell.nix      |   4 -
 nixos/modules/services/misc/nixos-manual.nix  |   5 +-
 .../web-servers/apache-httpd/default.nix      |   3 +-
 .../services/x11/window-managers/xmonad.nix   |   3 -
 nixos/modules/system/boot/kernel.nix          |   1 -
 .../system/boot/systemd-unit-options.nix      |   5 +-
 nixos/release.nix                             |   2 -
 24 files changed, 127 insertions(+), 703 deletions(-)
 delete mode 100644 nixos/lib/typechecker.nix
 delete mode 100644 nixos/modules/installer/tools/nixos-typecheck.sh

diff --git a/lib/modules.nix b/lib/modules.nix
index d08dc9f85a2..12ec7004d1e 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -23,6 +23,8 @@ rec {
                   specialArgs ? {}
                 , # This would be remove in the future, Prefer _module.args option instead.
                   args ? {}
+                , # This would be remove in the future, Prefer _module.check option instead.
+                  check ? true
                 }:
     let
       # This internal module declare internal options under the `_module'
@@ -43,22 +45,9 @@ rec {
           _module.check = mkOption {
             type = types.bool;
             internal = true;
-            default = true;
+            default = check;
             description = "Whether to check whether all option definitions have matching declarations.";
           };
-
-          _module.typeInference = mkOption {
-            type = types.nullOr types.str;
-            internal = true;
-            default = null; # TODO: Move away from 'null' after enough testing.
-            description = ''
-              Mode of type inferencing. Possible values are:
-              null = Disable type inferencing completely. Use 'types.unspecified' for every option without type definition.
-              "silent" = Try to infer type of option without type definition, but do not print anything.
-              "printUnspecified" = Try to infer type of option without type definition and print options for which no full type could be inferred.
-              "printAll" = Try to infer type of option without type definition and print all options without type definition.
-            '';
-          };
         };
 
         config = {
@@ -71,7 +60,7 @@ rec {
       # Note: the list of modules is reversed to maintain backward
       # compatibility with the old module system.  Not sure if this is
       # the most sensible policy.
-      options = mergeModules (config._module) prefix (reverseList closed);
+      options = mergeModules prefix (reverseList closed);
 
       # Traverse options and extract the option values into the final
       # config set.  At the same time, check whether all option
@@ -181,11 +170,11 @@ rec {
      At the same time, for each option declaration, it will merge the
      corresponding option definitions in all machines, returning them
      in the ‘value’ attribute of each option. */
-  mergeModules = _module: prefix: modules:
-    mergeModules' _module prefix modules
+  mergeModules = prefix: modules:
+    mergeModules' prefix modules
       (concatMap (m: map (config: { inherit (m) file; inherit config; }) (pushDownProperties m.config)) modules);
 
-  mergeModules' = _module: prefix: options: configs:
+  mergeModules' = prefix: options: configs:
     listToAttrs (map (name: {
       # We're descending into attribute ‘name’.
       inherit name;
@@ -211,8 +200,8 @@ rec {
             (filter (m: m.config ? ${name}) configs);
         in
           if nrOptions == length decls then
-            let opt = fixupOptionType _module.typeInference loc (mergeOptionDecls loc decls);
-            in evalOptionValue _module loc opt defns'
+            let opt = fixupOptionType loc (mergeOptionDecls loc decls);
+            in evalOptionValue loc opt defns'
           else if nrOptions != 0 then
             let
               firstOption = findFirst (m: isOption m.options) "" decls;
@@ -220,7 +209,7 @@ rec {
             in
               throw "The option `${showOption loc}' in `${firstOption.file}' is a prefix of options in `${firstNonOption.file}'."
           else
-            mergeModules' _module loc decls defns;
+            mergeModules' loc decls defns;
     }) (concatMap (m: attrNames m.options) options))
     // { _definedNames = map (m: { inherit (m) file; names = attrNames m.config; }) configs; };
 
@@ -269,7 +258,7 @@ rec {
 
   /* Merge all the definitions of an option to produce the final
      config value. */
-  evalOptionValue = _module: loc: opt: defs:
+  evalOptionValue = loc: opt: defs:
     let
       # Add in the default value for this option, if any.
       defs' =
@@ -281,7 +270,7 @@ rec {
         if opt.readOnly or false && length defs' > 1 then
           throw "The option `${showOption loc}' is read-only, but it's set multiple times."
         else
-          mergeDefinitions _module loc opt.type defs';
+          mergeDefinitions loc opt.type defs';
 
       # Check whether the option is defined, and apply the ‘apply’
       # function to the merged value.  This allows options to yield a
@@ -302,7 +291,7 @@ rec {
       };
 
   # Merge definitions of a value of a given type.
-  mergeDefinitions = _module: loc: type: defs: rec {
+  mergeDefinitions = loc: type: defs: rec {
     defsFinal =
       let
         # Process mkMerge and mkIf properties.
@@ -325,7 +314,7 @@ rec {
     mergedValue = foldl' (res: def:
       if type.check def.value then res
       else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.")
-      (type.merge _module loc defsFinal) defsFinal;
+      (type.merge loc defsFinal) defsFinal;
 
     isDefined = defsFinal != [];
 
@@ -423,7 +412,7 @@ rec {
   /* Hack for backward compatibility: convert options of type
      optionSet to options of type submodule.  FIXME: remove
      eventually. */
-  fixupOptionType = typeInference: loc: opt:
+  fixupOptionType = loc: opt:
     let
       options = opt.options or
         (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}.");
@@ -435,66 +424,12 @@ rec {
         else if tp.name == "list of option sets" then types.listOf (types.submodule options)
         else if tp.name == "null or option set" then types.nullOr (types.submodule options)
         else tp;
-
     in
       if opt.type.getSubModules or null == null
-      then opt // { type = f (opt.type or (inferType typeInference loc opt)); }
+      then opt // { type = f (opt.type or types.unspecified); }
       else opt // { type = opt.type.substSubModules opt.options; options = []; };
 
 
-  /* Function that tries to infer the type of an option from the default value of the option. */
-  inferType = mode: loc: opt:
-    let
-      doc = x: elemAt x 0;
-      type = x: elemAt x 1;
-      containsUnspecified = x: elemAt x 2;
-      inferType' = def:
-        if isDerivation def then [ "package" types.package false ]
-        else if isBool def then [ "bool" types.bool false ]
-        else if builtins.isString def then [ "str" types.str false ]
-        else if isInt def then [ "int" types.int false ]
-        else if isFunction def then [ "functionTo unspecified" (types.functionTo types.unspecified) true ]
-        else if isList def then
-                let nestedType = if (length def > 0) && (all (x: (type (inferType' x)) == (type (inferType' (head def)))) def)
-                                 then inferType' (head def)
-                                 else [ "unspecified" types.unspecified true ];
-                in [ "listOf ${doc nestedType}" (types.listOf (type nestedType)) (containsUnspecified nestedType) ]
-        else if isAttrs def then
-                let list = mapAttrsToList (_: v: v) (removeAttrs def ["_args"]);
-                    nestedType = if (length list > 0) && (all (x: (type (inferType' x)) == (type (inferType' (head list)))) list)
-                                 then inferType' (head list)
-                                 else [ "unspecified" types.unspecified true ];
-                in [ "attrsOf ${doc nestedType}" (types.attrsOf (type nestedType)) (containsUnspecified nestedType) ]
-        else [ "unspecified" types.unspecified true ];
-
-      inferDoc = x: ''
-        Inferring the type of "${showOption loc}" to "${doc x}".
-        Please verify the inferred type and define the type explicitely in ${showFiles opt.declarations}!
-      '';
-
-      inferredType = printMode:
-        let inferred = inferType' opt.default;
-        in if printMode == "silent" then type inferred
-           else if printMode == "printAll" then builtins.trace (inferDoc inferred) (type inferred)
-           else if printMode == "printUnspecified" && (containsUnspecified inferred) then builtins.trace (inferDoc inferred) (type inferred)
-           else type inferred;
-
-      noInferDoc = ''
-        Could not infer a type for "${showOption loc}", using "unspecified" instead.
-        Please define the type explicitely in ${showFiles opt.declarations}!
-      '';
-
-      hasDefault = (opt ? default) && !(opt ? defaultText);
-      isExternalVisible = (opt.visible or true) && !(opt.internal or false);
-    in
-
-    if isNull mode || !isExternalVisible
-    then types.unspecified
-    else if hasDefault
-         then inferredType mode /* Set to 'true' to see every type that is being inferred, not just those types that result in 'unspecified'. */
-         else if mode != "silent" then builtins.trace noInferDoc types.unspecified else types.unspecified;
-
-
   /* Properties. */
 
   mkIf = condition: content:
@@ -562,7 +497,7 @@ rec {
 
 
   /* Compatibility. */
-  fixMergeModules = modules: args: evalModules { inherit args; modules = (modules ++ [{ _module.check = false; }]); };
+  fixMergeModules = modules: args: evalModules { inherit modules args; check = false; };
 
 
   /* Return a module that causes a warning to be shown if the
diff --git a/lib/options.nix b/lib/options.nix
index d6876e18fe4..444ec37e6ea 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -6,7 +6,6 @@ with import ./trivial.nix;
 with import ./lists.nix;
 with import ./attrsets.nix;
 with import ./strings.nix;
-with {inherit (import ./types.nix) types; };
 
 rec {
 
@@ -43,17 +42,16 @@ rec {
     description = "Sink for option definitions.";
     type = mkOptionType {
       name = "sink";
-      typerep = "(sink)";
       check = x: true;
-      merge = config: loc: defs: false;
+      merge = loc: defs: false;
     };
     apply = x: throw "Option value is not readable because the option is not declared.";
   } // attrs);
 
-  mergeDefaultOption = config: loc: defs:
+  mergeDefaultOption = loc: defs:
     let list = getValues defs; in
     if length list == 1 then head list
-    else if all isFunction list then x: mergeDefaultOption config loc (map (f: f x) list)
+    else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list)
     else if all isList list then concatLists list
     else if all isAttrs list then foldl' lib.mergeAttrs {} list
     else if all isBool list then foldl' lib.or false list
@@ -61,14 +59,14 @@ rec {
     else if all isInt list && all (x: x == head list) list then head list
     else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}.";
 
-  mergeOneOption = config: loc: defs:
+  mergeOneOption = loc: defs:
     if defs == [] then abort "This case should never happen."
     else if length defs != 1 then
       throw "The unique option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
     else (head defs).value;
 
   /* "Merge" option definitions by checking that they all have the same value. */
-  mergeEqualOption = config: loc: defs:
+  mergeEqualOption = loc: defs:
     if defs == [] then abort "This case should never happen."
     else foldl' (val: def:
       if def.value != val then
@@ -79,154 +77,53 @@ rec {
   getValues = map (x: x.value);
   getFiles = map (x: x.file);
 
+
   # Generate documentation template from the list of option declaration like
   # the set generated with filterOptionSets.
   optionAttrSetToDocList = optionAttrSetToDocList' [];
 
-  optionAttrSetToDocList' = prefix: internalModuleConfig: options:
+  optionAttrSetToDocList' = prefix: options:
     concatMap (opt:
       let
-        decls = filter (x: x != unknownModule) opt.declarations;
         docOption = rec {
           name = showOption opt.loc;
           description = opt.description or (throw "Option `${name}' has no description.");
-          declarations = decls;
+          declarations = filter (x: x != unknownModule) opt.declarations;
           internal = opt.internal or false;
           visible = opt.visible or true;
           readOnly = opt.readOnly or false;
           type = opt.type.name or null;
         }
-        // (if opt ? example then { example = detectDerivation decls opt.example; } else {})
-        // (if opt ? default then { default = detectDerivation decls opt.default; } else {})
+        // (if opt ? example then { example = scrubOptionValue opt.example; } else {})
+        // (if opt ? default then { default = scrubOptionValue opt.default; } else {})
         // (if opt ? defaultText then { default = opt.defaultText; } else {});
 
         subOptions =
-          let ss = opt.type.getSubOptionsPrefixed opt.loc;
-          in if ss != {} then optionAttrSetToDocList' opt.loc internalModuleConfig (ss internalModuleConfig) else [];
+          let ss = opt.type.getSubOptions opt.loc;
+          in if ss != {} then optionAttrSetToDocList' opt.loc ss else [];
       in
         [ docOption ] ++ subOptions) (collect isOption options);
 
-  # TODO: Use "extractOptionAttrSet" instead of "optionAttrSetToDocList'" to reduce the code size.
-  #       It should be a drop-in-replacement. But first, examine the impact on the evaluation time.
-  # optionAttrSetToDocList = extractOptionAttrSet true [];
 
-  # Generate a machine readable specification of the list of option declarations.
-  optionAttrSetToParseableSpecifications = extractOptionAttrSet false [];
-
-  extractOptionAttrSet = toDoc: prefix: internalModuleConfig: options:
-    concatMap (opt:
-      let
-        optionName = showOption opt.loc;
-
-        # Check if a type contains derivations, that is check if a type nests
-        # a 'package', 'packageSet' or 'nixpkgsConfig' type.
-        hasDerivation = any (t: elem t opt.type.nestedTypes) ((map (x: x.typerep) (with types; [package packageSet])) ++ ["(nixpkgsConfig)"]);
-
-        # Check if type is 'path' which can potentially contain a derivation.
-        maybeHiddenDerivation = any (t: elem t opt.type.nestedTypes) (map (x: x.typerep) (with types; [path]));
-
-        isDefaultValue = elem opt.default opt.type.defaultValues;
-
-        /* Enforce that the example attribute is wrapped with 'literalExample'
-           for every type that contains derivations. */
-        example =
-          if opt ? example
-          then (if hasDerivation
-                then (if isLiteralExample opt.example
-                      then { example = detectDerivation decls opt.example; }
-                      else throw "The attribute ${optionName}.example must be wrapped with 'literalExample' in ${concatStringsSep " and " decls}!")
-                else { example = detectDerivation decls opt.example; })
-          else {};
-
-        /* Enforce that the 'defaultText' attribute is defined for every option
-           that has a 'default' attribute that contains derivations. */
-        default =
-          if opt ? default
-          then (if hasDerivation
-                then (if isDefaultValue
-                      then { default = opt.default; }
-                      else (if opt ? defaultText
-                            then { default = literalExample (detectDerivation decls opt.defaultText); }
-                            else throw "The option ${optionName} requires a 'defaultText' attribute in ${concatStringsSep " and " decls}!"))
-                else (if opt ? defaultText
-                      then (if maybeHiddenDerivation
-                            then (if (let eval = builtins.tryEval (findDerivation opt.default); in eval.success && !eval.value)
-                                  then builtins.trace
-                                       "The attribute ${optionName}.defaultText might not be necessary in ${concatStringsSep " and " decls}!"
-                                       { default = literalExample (detectDerivation decls opt.defaultText); }
-                                  else { default = literalExample (detectDerivation decls opt.defaultText); })
-                            else builtins.trace
-                                 "The attribute ${optionName}.defaultText is not used and can be removed in ${concatStringsSep " and " decls}!"
-                                 { default = detectDerivation decls opt.default; })
-                      else { default = detectDerivation decls opt.default; }))
-          else {};
-
-        decls = filter (x: x != unknownModule) opt.declarations;
-
-        docOption = {
-          name = optionName;
-          description = opt.description or (throw "Option `${optionName}' has no description.");
-          declarations = decls;
-          internal = opt.internal or false;
-          visible = opt.visible or true;
-          readOnly = opt.readOnly or false;
-        } // example // default // subOptions // typeKeys;
-
-        typeKeys = if toDoc then { type = opt.type.name or null; } else { type = opt.type.typerep; keys = opt.loc; };
-
-        subOptions =
-          if toDoc
-          then {}
-          else let ss = opt.type.getSubOptions;
-               in if ss != {} then { suboptions = (extractOptionAttrSet false [] internalModuleConfig (ss internalModuleConfig)); } else {};
-
-        subOptionsDoc =
-          if toDoc
-          then let ss = opt.type.getSubOptionsPrefixed opt.loc;
-               in if ss != {} then extractOptionAttrSet true opt.loc internalModuleConfig (ss internalModuleConfig) else []
-          else [];
-      in
-        [ docOption ]  ++ subOptionsDoc )
-          (filter (opt: (opt.visible or true) && !(opt.internal or false)) (collect isOption options));
-
-
-  /* This function recursively checks for derivations within an
-     an expression, and throws an error if a derivation or a
-     store path is found. The function is used to ensure that no
-     derivation leaks from the 'default' or 'example' attributes
-     of an option.
-     This makes the generation of `options.xml' much more efficient:
-     the XML representation of derivations is very large (on the
-     order of megabytes) and is not actually used by the manual
-     generator. */
-  detectDerivation = decl: x:
+  /* This function recursively removes all derivation attributes from
+     `x' except for the `name' attribute.  This is to make the
+     generation of `options.xml' much more efficient: the XML
+     representation of derivations is very large (on the order of
+     megabytes) and is not actually used by the manual generator. */
+  scrubOptionValue = x:
     if isDerivation x then
-      throw "Found unexpected derivation in '${x.name}' in '${concatStringsSep " and " decl}'!"
-    else if isString x && isStorePath x then
-      throw "Found unexpected store path in '${x.name}' in '${concatStringsSep " and " decl}'!"
-    else if isList x then map (detectDerivation decl) x
-    else if isAttrs x then mapAttrs (n: v: (detectDerivation decl) v) (removeAttrs x ["_args"])
+      { type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; }
+    else if isList x then map scrubOptionValue x
+    else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x ["_args"])
     else x;
 
-  /* Same as detectDerivation, but returns a boolean instead of
-     throwing an exception. */
-  findDerivation = x:
-    if (isString x && isStorePath x) || isDerivation x then true
-    else if isList x then any findDerivation x
-    else if isAttrs x then any findDerivation (mapAttrsToList (_: v: v) (removeAttrs x ["_args"]))
-    else false;
-
-
 
   /* For use in the ‘example’ option attribute.  It causes the given
      text to be included verbatim in documentation.  This is necessary
      for example values that are not simple values, e.g.,
      functions. */
-  # TODO: A more general name would probably be "literalNix".
   literalExample = text: { _type = "literalExample"; inherit text; };
 
-  isLiteralExample = x: isAttrs x && hasAttr "_type" x && x._type == "literalExample";
-
 
   /* Helper functions. */
   showOption = concatStringsSep ".";
diff --git a/lib/types.nix b/lib/types.nix
index 385103d4214..b4d29ac84d2 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -1,8 +1,6 @@
 # Definitions related to run-time type checking.  Used in particular
 # to type-check NixOS configurations.
 
-let lib = import ./default.nix; in
-
 with import ./lists.nix;
 with import ./attrsets.nix;
 with import ./options.nix;
@@ -23,8 +21,6 @@ rec {
   mkOptionType =
     { # Human-readable representation of the type.
       name
-    , # Parseable representation of the type.
-      typerep
     , # Function applied to each definition that should return true if
       # its type-correct, false otherwise.
       check ? (x: true)
@@ -35,59 +31,40 @@ rec {
       # definition values and locations (e.g. [ { file = "/foo.nix";
       # value = 1; } { file = "/bar.nix"; value = 2 } ]).
       merge ? mergeDefaultOption
-    , # Return list of sub-options.
-      getSubOptions ? {}
-    , # Same as 'getSubOptions', but with extra information about the
-      # location of the option which is used to generate documentation.
-      getSubOptionsPrefixed ? null
+    , # Return a flat list of sub-options.  Used to generate
+      # documentation.
+      getSubOptions ? prefix: {}
     , # List of modules if any, or null if none.
       getSubModules ? null
     , # Function for building the same option type  with a different list of
       # modules.
       substSubModules ? m: null
-    , # List of type representations (typerep) of all the elementary types
-      # that are nested within the type. For an elementary type the list is
-      # a singleton of the typerep of itself.
-      # NOTE: Must be specified for every container type!
-      nestedTypes ? null
-    , # List of all default values, and an empty list if no default value exists.
-      defaultValues ? []
     }:
     { _type = "option-type";
-      inherit name typerep check merge getSubOptions getSubModules substSubModules defaultValues;
-      nestedTypes = if (isNull nestedTypes) then (singleton typerep) else nestedTypes;
-      getSubOptionsPrefixed = if (isNull getSubOptionsPrefixed) then (prefix: getSubOptions) else getSubOptionsPrefixed;
+      inherit name check merge getSubOptions getSubModules substSubModules;
     };
 
 
   types = rec {
 
-    #
-    # Elementary types
-    #
-
     unspecified = mkOptionType {
       name = "unspecified";
-      typerep = "(unspecified)";
     };
 
     bool = mkOptionType {
       name = "boolean";
-      typerep = "(boolean)";
       check = isBool;
       merge = mergeEqualOption;
     };
 
     int = mkOptionType {
       name = "integer";
-      typerep = "(integer)";
       check = isInt;
       merge = mergeOneOption;
     };
 
     str = mkOptionType {
       name = "string";
-      typerep = "(string)";
       check = isString;
       merge = mergeOneOption;
     };
@@ -95,111 +72,73 @@ rec {
     # Merge multiple definitions by concatenating them (with the given
     # separator between the values).
     separatedString = sep: mkOptionType {
-      name = "string" + (optionalString (sep != "") " separated by ${sep}");
-      typerep = "(separatedString(${escape ["(" ")"] sep}))";
+      name = "string";
       check = isString;
-      merge = _module: loc: defs: concatStringsSep sep (getValues defs);
+      merge = loc: defs: concatStringsSep sep (getValues defs);
     };
 
-    lines = separatedString "\n" // { typerep = "(lines)"; };
-    commas = separatedString "," // { typerep = "(commas)"; };
-    envVar = separatedString ":" // { typerep = "(envVar)"; };
+    lines = separatedString "\n";
+    commas = separatedString ",";
+    envVar = separatedString ":";
 
     # Deprecated; should not be used because it quietly concatenates
     # strings, which is usually not what you want.
-    string = separatedString "" // { typerep = "(string)"; };
+    string = separatedString "";
 
     attrs = mkOptionType {
       name = "attribute set";
-      typerep = "(attrs)";
       check = isAttrs;
-      merge = _module: loc: foldl' (res: def: mergeAttrs res def.value) {};
+      merge = loc: foldl' (res: def: mergeAttrs res def.value) {};
     };
 
     # derivation is a reserved keyword.
     package = mkOptionType {
       name = "package";
-      typerep = "(package)";
       check = x: isDerivation x || isStorePath x;
-      merge = _module: loc: defs:
-        let res = mergeOneOption _module loc defs;
+      merge = loc: defs:
+        let res = mergeOneOption loc defs;
         in if isDerivation res then res else toDerivation res;
     };
 
-    # The correct type of packageSet would be:
-    # packageSet = attrsOf (either package packageSet)
-    # (Not sure if nix would allow to define a recursive type.)
-    # However, currently it is not possible to check that a packageSet actually
-    # contains packages (that is derivations). The check 'isDerivation' is too
-    # eager for the current implementation of the assertion mechanism and of the
-    # licenses control mechanism. That means it is not generally possible to go
-    # into the attribute set of packages to check that every attribute would
-    # evaluate to a derivation if the package would actually be evaluated. Maybe
-    # that restriction can be lifted in the future, but for now the content of
-    # the packageSet is not checked.
-    # TODO: The 'merge' function is copied from 'mergeDefaultOption' to keep
-    # backwards compatibility with the 'unspecified' type that was used for
-    # package sets previously. Maybe review if the merge function has to change.
-    packageSet = mkOptionType {
-      name = "derivation set";
-      typerep = "(packageSet)";
-      check = isAttrs;
-      merge = _module: loc: defs: foldl' mergeAttrs {} (map (x: x.value) defs);
-    };
-
     path = mkOptionType {
       name = "path";
-      typerep = "(path)";
       # Hacky: there is no ‘isPath’ primop.
       check = x: builtins.substring 0 1 (toString x) == "/";
       merge = mergeOneOption;
     };
 
-
-    #
-    # Container types
-    #
-
     # drop this in the future:
     list = builtins.trace "`types.list' is deprecated; use `types.listOf' instead" types.listOf;
 
     listOf = elemType: mkOptionType {
       name = "list of ${elemType.name}s";
-      typerep = "(listOf${elemType.typerep})";
       check = isList;
-      merge = _module: loc: defs:
+      merge = loc: defs:
         map (x: x.value) (filter (x: x ? value) (concatLists (imap (n: def: imap (m: def':
-            (mergeDefinitions _module
+            (mergeDefinitions
               (loc ++ ["[definition ${toString n}-entry ${toString m}]"])
               elemType
               [{ inherit (def) file; value = def'; }]
             ).optionalValue
           ) def.value) defs)));
-      getSubOptions = elemType.getSubOptions;
-      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed (prefix ++ ["*"]);
+      getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: listOf (elemType.substSubModules m);
-      nestedTypes = elemType.nestedTypes;
-      defaultValues = [[]];
     };
 
     attrsOf = elemType: mkOptionType {
       name = "attribute set of ${elemType.name}s";
-      typerep = "(attrsOf${elemType.typerep})";
       check = isAttrs;
-      merge = _module: loc: defs:
+      merge = loc: defs:
         mapAttrs (n: v: v.value) (filterAttrs (n: v: v ? value) (zipAttrsWith (name: defs:
-            (mergeDefinitions _module (loc ++ [name]) elemType defs).optionalValue
+            (mergeDefinitions (loc ++ [name]) elemType defs).optionalValue
           )
           # Push down position info.
           (map (def: listToAttrs (mapAttrsToList (n: def':
             { name = n; value = { inherit (def) file; value = def'; }; }) def.value)) defs)));
-      getSubOptions = elemType.getSubOptions;
-      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed (prefix ++ ["<name>"]);
+      getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: attrsOf (elemType.substSubModules m);
-      nestedTypes = elemType.nestedTypes;
-      defaultValues = [{}];
     };
 
     # List or attribute set of ...
@@ -220,23 +159,18 @@ rec {
         attrOnly = attrsOf elemType;
       in mkOptionType {
         name = "list or attribute set of ${elemType.name}s";
-        typerep = "(loaOf${elemType.typerep})";
         check = x: isList x || isAttrs x;
-        merge = _module: loc: defs: attrOnly.merge _module loc (imap convertIfList defs);
-        getSubOptions = elemType.getSubOptions;
-        getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed (prefix ++ ["<name?>"]);
+        merge = loc: defs: attrOnly.merge loc (imap convertIfList defs);
+        getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);
         getSubModules = elemType.getSubModules;
         substSubModules = m: loaOf (elemType.substSubModules m);
-        nestedTypes = elemType.nestedTypes;
-        defaultValues = [{} []];
       };
 
     # List or element of ...
     loeOf = elemType: mkOptionType {
       name = "element or list of ${elemType.name}s";
-      typerep = "(loeOf${elemType.typerep})";
       check = x: isList x || elemType.check x;
-      merge = _module: loc: defs:
+      merge = loc: defs:
         let
           defs' = filterOverrides defs;
           res = (head defs').value;
@@ -247,41 +181,55 @@ rec {
         else if !isString res then
           throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
         else res;
-      nestedTypes = elemType.nestedTypes;
-      defaultValues = [[]] ++ elemType.defaultValues;
     };
 
     uniq = elemType: mkOptionType {
-      inherit (elemType) check;
-      name = "unique ${elemType.name}";
-      typerep = "(uniq${elemType.typerep})";
+      inherit (elemType) name check;
       merge = mergeOneOption;
       getSubOptions = elemType.getSubOptions;
-      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed prefix;
       getSubModules = elemType.getSubModules;
       substSubModules = m: uniq (elemType.substSubModules m);
-      nestedTypes = elemType.nestedTypes;
-      defaultValues = elemType.defaultValues;
     };
 
     nullOr = elemType: mkOptionType {
       name = "null or ${elemType.name}";
-      typerep = "(nullOr${elemType.typerep})";
       check = x: x == null || elemType.check x;
-      merge = _module: loc: defs:
+      merge = loc: defs:
         let nrNulls = count (def: def.value == null) defs; in
         if nrNulls == length defs then null
         else if nrNulls != 0 then
           throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}."
-        else elemType.merge _module loc defs;
+        else elemType.merge loc defs;
       getSubOptions = elemType.getSubOptions;
-      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed prefix;
       getSubModules = elemType.getSubModules;
       substSubModules = m: nullOr (elemType.substSubModules m);
-      nestedTypes = elemType.nestedTypes;
-      defaultValues = [null] ++ elemType.defaultValues;
     };
 
+    submodule = opts:
+      let
+        opts' = toList opts;
+        inherit (import ./modules.nix) evalModules;
+      in
+      mkOptionType rec {
+        name = "submodule";
+        check = x: isAttrs x || isFunction x;
+        merge = loc: defs:
+          let
+            coerce = def: if isFunction def then def else { config = def; };
+            modules = opts' ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
+          in (evalModules {
+            inherit modules;
+            args.name = last loc;
+            prefix = loc;
+          }).config;
+        getSubOptions = prefix: (evalModules
+          { modules = opts'; inherit prefix;
+            # FIXME: hack to get shit to evaluate.
+            args = { name = ""; }; }).options;
+        getSubModules = opts';
+        substSubModules = m: submodule m;
+      };
+
     enum = values:
       let
         show = v:
@@ -291,92 +239,23 @@ rec {
       in
       mkOptionType {
         name = "one of ${concatMapStringsSep ", " show values}";
-        typerep = "(enum${concatMapStrings (x: "(${escape ["(" ")"] (builtins.toString x)})") values})";
         check = flip elem values;
         merge = mergeOneOption;
-        nestedTypes = [];
       };
 
     either = t1: t2: mkOptionType {
       name = "${t1.name} or ${t2.name}";
-      typerep = "(either${t1.typerep}${t2.typerep})";
       check = x: t1.check x || t2.check x;
       merge = mergeOneOption;
-      nestedTypes = t1.nestedTypes ++ t2.nestedTypes;
-      defaultValues = t1.defaultValues ++ t2.defaultValues;
     };
 
-
-    #
-    # Complex types
-    #
-
-    submodule = opts:
-      let
-        opts' = toList opts;
-        inherit (import ./modules.nix) evalModules;
-        filterVisible = filter (opt: (if opt ? visible then opt.visible else true) && (if opt ? internal then !opt.internal else true));
-      in
-      mkOptionType rec {
-        name = "submodule";
-        typerep = "(submodule)";
-        check = x: isAttrs x || isFunction x;
-        merge = _module: loc: defs:
-          let
-            internalModule = [ { inherit _module; } { _module.args.name = lib.mkForce (last loc); } ];
-            coerce = def: if isFunction def then def else { config = def; };
-            modules = opts' ++ internalModule ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
-          in (evalModules {
-            inherit modules;
-            prefix = loc;
-          }).config;
-        getSubOptions = getSubOptionsPrefixed [];
-        getSubOptionsPrefixed = prefix: _module:
-          let
-            # FIXME: hack to get shit to evaluate.
-            internalModule = [ { inherit _module; } { _module.args.name = lib.mkForce ""; } ];
-          in (evalModules {
-            modules = opts' ++ internalModule;
-            inherit prefix;
-          }).options;
-        getSubModules = opts';
-        substSubModules = m: submodule m;
-        nestedTypes = concatMap (opt: opt.type.nestedTypes) (collect (lib.isType "option") (getSubOptions {}));
-        defaultValues = [{}];
-      };
-
-
-
-    #
-    # Legacy types
-    #
-
     # Obsolete alternative to configOf.  It takes its option
     # declarations from the ‘options’ attribute of containing option
     # declaration.
     optionSet = mkOptionType {
       name = /* builtins.trace "types.optionSet is deprecated; use types.submodule instead" */ "option set";
-      typerep = "(optionSet)";
     };
 
-
-    # Try to remove module options of that type wherever possible.
-    # A module option taking a function can not be introspected and documented properly.
-    functionTo = resultType:
-      mkOptionType {
-        name = "function to ${resultType.name}";
-        typerep = "(function${resultType.typerep})";
-        check = builtins.isFunction;
-        merge = mergeOneOption;
-        nestedTypes = resultType.nestedTypes;
-        defaultValues = map (x: {...}:x) resultType.nestedTypes; # INFO: It seems as nix can't compare functions, yet.
-      };
-
-
-    #
-    # misc
-    #
-
     # Augment the given type with an additional type check function.
     addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; };
 
diff --git a/nixos/default.nix b/nixos/default.nix
index 117a7b5d603..5d69b79e13a 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -34,8 +34,6 @@ in
 
   system = eval.config.system.build.toplevel;
 
-  typechecker = eval.config.system.build.typechecker;
-
   vm = vmConfig.system.build.vm;
 
   vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index ea860149736..4ce6ea1c111 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, options, internalModule, version, revision, extraSources ? [] }:
+{ pkgs, options, version, revision, extraSources ? [] }:
 
 with pkgs;
 with pkgs.lib;
@@ -6,10 +6,8 @@ with pkgs.lib;
 let
 
   # Remove invisible and internal options.
-  optionsList = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList internalModule options);
+  optionsList = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList options);
 
-  # INFO: Please add 'defaultText' or 'literalExample' to the option
-  #       definition to avoid this substitution!
   # Replace functions by the string <function>
   substFunction = x:
     if builtins.isAttrs x then mapAttrs (name: substFunction) x
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index 08bde4a275d..ea5d1241876 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -8,7 +8,7 @@
 
 <para>An option declaration specifies the name, type and description
 of a NixOS configuration option.  It is illegal to define an option
-that has not been declared in any module. A option declaration
+that hasn’t been declared in any module.  A option declaration
 generally looks like this:
 
 <programlisting>
@@ -145,108 +145,6 @@ options = {
 
 You can also create new types using the function
 <varname>mkOptionType</varname>.  See
-<filename>lib/types.nix</filename> in Nixpkgs for details.
-
-An option declaration must follow the following rules:
-<itemizedlist mark='bullet'>
-
-  <listitem>
-    <para>A <varname>defaultText</varname> must be defined if and only if the type of the option
-    derives from <varname>package</varname>, <varname>packageSet</varname> or <varname>nixpkgsConfig
-    </varname>, and if and only if a <varname>default</varname> attribute is defined and if and only if
-    the value of the <varname>default</varname> attribute is not the default of the type of the
-    option declaration.
-
-    For example, a <varname>defaultText</varname> must be defined for
-<programlisting>
-type = types.listOf types.package;
-default = [ pkgs.foo; ];
-defaultText = "[ pkgs.foo; ]";
-</programlisting>.
-
-    But no <varname>defaultText</varname> must be defined for
-<programlisting>
-type = types.listOf types.package;
-default = [];
-</programlisting>,
-    as <varname>[]</varname> is the default of <varname>types.listOf types.package</varname>.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>A <varname>defaultText</varname> can be defined if the type of the option derives from
-    <varname>path</varname> and if a <varname>default</varname> attribute is defined.</para>
-  </listitem>
-
-  <listitem>
-    <para>The value of the <varname>example</varname> attribute must be wrapped with <varname>
-    literalExample</varname> if the type of the option derives from <varname>package</varname>,
-    <varname>packageSet</varname> or <varname>nixpkgsConfig</varname>.</para>
-  </listitem>
-
-  <listitem>
-    <para>The value of <varname>defaultText</varname> and <varname>literalExample</varname> must
-    be a string which contains a valid nix expression. The nix expression has to evaluate in
-    <code>{pkgs}: <replaceable>value</replaceable></code>.
-    For example:
-    <itemizedlist>
-      <listitem>
-	<para>A <varname>defaultText</varname> could, e.g., be:
-<programlisting>
-type = types.package;
-default = pkgs.foo;
-defaultText = "pkgs.foo";
-</programlisting>
-        But not <code>defaultText = "pkgs.foo;";</code>, as that
-        corresponds to <code>{pkgs}: pkgs.foo;</code>, which is an
-	invalid nix expression due to the ending with <varname>;</varname>.</para>
-      </listitem>
-    
-      <listitem>
-	<para>A <varname>literalExample</varname> could be used as, e.g.:
-<programlisting>
-type = types.path;
-example = literalExample "\"\${pkgs.bar}/bin/bar\"";
-</programlisting>
-        But not <code>literalExample "\${pkgs.bar}/bin/bar";</code>, as that corresponds
-	to <code>{pkgs}: ${pkgs.bar}/bin/bar</code>, which is an invalid nix expression
-	as the <varname>path</varname> is not a <varname>string</varname> anymore.</para>
-      </listitem>
-    </itemizedlist></para>
-  </listitem>
-
-  <listitem>
-    <para>The <varname>type</varname> attribute must be defined for every option declaration.</para>
-  </listitem>
-
-</itemizedlist>
-
-NixOS ships the tool <varname>nixos-typecheck</varname> that can check an option declaration to:
-
-<itemizedlist mark='bullet'>
-
-  <listitem>
-    <para>Enforce that an option declaration has a <varname>defaultText</varname> if and only if the
-    type of the option derives from <varname>package</varname>, <varname>packageSet</varname> or
-    <varname>nixpkgsConfig</varname> and if a <varname>default</varname> attribute is defined.</para>
-  </listitem>
-
-  <listitem>
-    <para>Enforce that the value of the <varname>example</varname> attribute is wrapped with <varname>
-    literalExample</varname> if the type of the option derives from <varname>package</varname>,
-    <varname>packageSet</varname> or <varname>nixpkgsConfig</varname>.</para>
-  </listitem>
-
-  <listitem>
-    <para>Warn if a <varname>defaultText</varname> is defined in an option declaration if the type of
-    the option does not derive from <varname>package</varname>, <varname>packageSet</varname> or
-    <varname>nixpkgsConfig</varname>.</para>
-  </listitem>
-
-  <listitem>
-    <para>Warn if no <varname>type</varname> is defined in an option declaration.</para>
-  </listitem>
-
-</itemizedlist></para>
+<filename>lib/types.nix</filename> in Nixpkgs for details.</para>
 
 </section>
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 79890e0add7..a87b285c5b7 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -20,13 +20,8 @@
 , # !!! See comment about args in lib/modules.nix
   specialArgs ? {}
 , modules
-, # Pass through a configuration of the internal modules declared
-  # in lib/modules.nix.
-  _module ? {}
-, # !!! See comment about typeInference in lib/modules.nix
-  typeInference ? null
 , # !!! See comment about check in lib/modules.nix
-  check ? null
+  check ? true
 , prefix ? []
 , lib ? import ../../lib
 }:
@@ -46,17 +41,13 @@ let
     };
   };
 
-  internalModule = { _module = (_module
-                     // (if isNull check then {} else { inherit check; })
-                     // (if isNull typeInference then {} else { inherit typeInference; })); };
-
 in rec {
 
   # Merge the option definitions in all modules, forming the full
   # system configuration.
   inherit (lib.evalModules {
-    inherit prefix;
-    modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ] ++ [ internalModule ];
+    inherit prefix check;
+    modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
     args = extraArgs;
     specialArgs = { modulesPath = ../modules; } // specialArgs;
   }) config options;
diff --git a/nixos/lib/typechecker.nix b/nixos/lib/typechecker.nix
deleted file mode 100644
index b4d8277f8fe..00000000000
--- a/nixos/lib/typechecker.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ config, lib, pkgs, baseModules, ... }:
-
-with pkgs;
-with pkgs.lib;
-
-let
-
-  optionsSpecs = inferenceMode:
-    let
-      versionModule =
-        { system.nixosVersionSuffix = config.system.nixosVersionSuffix;
-          system.nixosRevision = config.system.nixosRevision;
-          nixpkgs.system = config.nixpkgs.system;
-        };
-
-      internalModule = { _module = config._module; } // (if isNull inferenceMode then {} else { _module.typeInference = mkForce inferenceMode; });
-
-      eval = evalModules {
-        modules = [ versionModule ] ++ baseModules ++ [ internalModule ];
-        args = (config._module.args) // { modules = [ ]; };
-      };
-
-      # Remove invisible and internal options.
-      optionsSpecs' = filter (opt: opt.visible && !opt.internal) (optionAttrSetToParseableSpecifications config._module eval.options);
-
-      # INFO: Please add 'defaultText' or 'literalExample' to the option
-      #       definition to avoid this exception!
-      substFunction = key: decls: x:
-        if builtins.isAttrs x then mapAttrs (name: substFunction key decls) x
-        else if builtins.isList x then map (substFunction key decls) x
-        else if builtins.isFunction x then throw "Found an unexpected <function> in ${key} declared in ${concatStringsSep " and " decls}."
-        else x;
-
-      prefix = toString ../..;
-
-      stripPrefix = fn:
-        if substring 0 (stringLength prefix) fn == prefix then
-          substring (stringLength prefix + 1) 1000 fn
-        else
-          fn;
-
-      # Clean up declaration sites to not refer to the NixOS source tree.
-      cleanupOptions = x: flip map x (opt:
-        let substFunction' = y: substFunction opt.name opt.declarations y;
-        in opt
-           // { declarations = map (fn: stripPrefix fn) opt.declarations; }
-           // optionalAttrs (opt ? example) { example = substFunction' opt.example; }
-           // optionalAttrs (opt ? default) { default = substFunction' opt.default; }
-           // optionalAttrs (opt ? type) { type = substFunction' opt.type; });
-
-    in
-      cleanupOptions optionsSpecs';
-
-in
-
-{
-
-  system.build.typechecker = {
-
-    # The NixOS options as machine readable specifications in JSON format.
-    specifications = stdenv.mkDerivation {
-      name = "options-specs-json";
-
-      buildCommand = ''
-        # Export list of options in different format.
-        dst=$out/share/doc/nixos
-        mkdir -p $dst
-
-        cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON
-          (listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs null)))))
-        } $dst/options-specs.json
-
-        mkdir -p $out/nix-support
-        echo "file json $dst/options-specs.json" >> $out/nix-support/hydra-build-products
-      ''; # */
-
-      meta.description = "List of NixOS options specifications in JSON format";
-    };
-
-    silent = listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs "silent"));
-    printAll = listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs "printAll"));
-    printUnspecified = listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs "printUnspecified"));
-
-  };
-
-}
-
-
-
-
-
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 3d21bda5734..b20fac6ad3e 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -64,7 +64,6 @@ in
       consoleKeyMap = mkOption {
         type = mkOptionType {
           name = "string or path";
-          typerep = "(stringOrPath)";
           check = t: (isString t || types.path.check t);
         };
 
diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index 174d7014ca8..61b02c5ffa6 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -6,7 +6,6 @@ let
 
   sysctlOption = mkOptionType {
     name = "sysctl option value";
-    typerep = "(sysctl)";
     check = val:
       let
         checkType = x: isBool x || isString x || isInt x || isNull x;
diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index dd21dc71ee2..17c17d05e28 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -115,8 +115,8 @@ let
       let name = head attrsNames; rest = tail attrsNames; in
       if isOption result.options then
         walkOptions rest {
-          options = result.options.type.getSubOptionsPrefix "";
-          opt = ''(\${result.opt}.type.getSubOptionsPrefix "")'';
+          options = result.options.type.getSubOptions "";
+          opt = ''(\${result.opt}.type.getSubOptions "")'';
           cfg = ''\${result.cfg}."\${name}"'';
         }
       else
diff --git a/nixos/modules/installer/tools/nixos-typecheck.sh b/nixos/modules/installer/tools/nixos-typecheck.sh
deleted file mode 100644
index f9557be0c50..00000000000
--- a/nixos/modules/installer/tools/nixos-typecheck.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-#! @shell@
-
-if [ -x "@shell@" ]; then export SHELL="@shell@"; fi;
-
-set -e
-
-showSyntax() {
-cat >&1 << EOF
-nixos-typecheck
-usage:
-  nixos-typecheck [action] [args]
-where:
-  action = silent | printAll | printUnspecified | getSpecs
-    with default action: printUnspecified
-  args = any argument supported by nix-build
-EOF
-}
-
-
-# Parse the command line.
-extraArgs=()
-action=printUnspecified
-
-while [ "$#" -gt 0 ]; do
-    i="$1"; shift 1
-    case "$i" in
-      --help)
-        showSyntax
-        ;;
-      silent|printAll|printUnspecified|getSpecs)
-        action="$i"
-        ;;
-      *)
-        extraArgs="$extraArgs $i"
-        ;;
-    esac
-done
-
-
-if [ "$action" = silent ]; then
-    nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.silent $extraArgs
-elif [ "$action" = printAll ]; then
-    nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.printAll $extraArgs
-elif [ "$action" = printUnspecified ]; then
-    nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.printUnspecified $extraArgs
-elif [ "$action" = getSpecs ]; then
-    ln -s $(nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.specifications $extraArgs)/share/doc/nixos/options-specs.json specifications.json
-else
-    showSyntax
-    exit 1
-fi
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 69bd0d26b77..9ac3b7a5b16 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -54,11 +54,6 @@ let
     inherit (config.system) nixosVersion nixosCodeName nixosRevision;
   };
 
-  nixos-typecheck = makeProg {
-    name = "nixos-typecheck";
-    src = ./nixos-typecheck.sh;
-  };
-
 in
 
 {
@@ -72,11 +67,10 @@ in
         nixos-generate-config
         nixos-option
         nixos-version
-        nixos-typecheck
       ];
 
     system.build = {
-      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-typecheck;
+      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild;
     };
 
   };
diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix
index 9a453172c63..22622706f2c 100644
--- a/nixos/modules/misc/meta.nix
+++ b/nixos/modules/misc/meta.nix
@@ -5,7 +5,6 @@ with lib;
 let
   maintainer = mkOptionType {
     name = "maintainer";
-    typerep = "(maintainer)";
     check = email: elem email (attrValues lib.maintainers);
     merge = loc: defs: listToAttrs (singleton (nameValuePair (last defs).file (last defs).value));
   };
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 511831ae5cd..5eb38c510b4 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -3,35 +3,32 @@
 with lib;
 
 let
-  nixpkgsConfig = pkgs:
+  isConfig = x:
+    builtins.isAttrs x || builtins.isFunction x;
+
+  optCall = f: x:
+    if builtins.isFunction f
+    then f x
+    else f;
+
+  mergeConfig = lhs_: rhs_:
     let
-      isConfig = x:
-        builtins.isAttrs x || builtins.isFunction x;
-
-      optCall = f: x:
-        if builtins.isFunction f
-        then f x
-        else f;
-
-      mergeConfig = lhs_: rhs_:
-        let
-          lhs = optCall lhs_ { inherit pkgs; };
-          rhs = optCall rhs_ { inherit pkgs; };
-        in
-        lhs // rhs //
-        optionalAttrs (lhs ? packageOverrides) {
-          packageOverrides = pkgs:
-            optCall lhs.packageOverrides pkgs //
-            optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
-        };
+      lhs = optCall lhs_ { inherit pkgs; };
+      rhs = optCall rhs_ { inherit pkgs; };
     in
-    mkOptionType {
-      name = "nixpkgs config";
-      typerep = "(nixpkgsConfig)";
-      check = lib.traceValIfNot isConfig;
-      merge = config: args: fold (def: mergeConfig def.value) {};
-      defaultValues = [{}];
+    lhs // rhs //
+    optionalAttrs (lhs ? packageOverrides) {
+      packageOverrides = pkgs:
+        optCall lhs.packageOverrides pkgs //
+        optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
     };
+
+  configType = mkOptionType {
+    name = "nixpkgs config";
+    check = traceValIfNot isConfig;
+    merge = args: fold (def: mergeConfig def.value) {};
+  };
+
 in
 
 {
@@ -49,7 +46,7 @@ in
             };
           }
         '';
-      type = nixpkgsConfig pkgs;
+      type = configType;
       description = ''
         The configuration of the Nix Packages collection.  (For
         details, see the Nixpkgs documentation.)  It allows you to set
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 88e01069b26..ad1636e002d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1,5 +1,4 @@
 [
-  ../lib/typechecker.nix
   ./config/debug-info.nix
   ./config/fonts/corefonts.nix
   ./config/fonts/fontconfig-ultimate.nix
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index e6ebcd6dc14..cc50bfbea53 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -155,21 +155,18 @@ in {
       packages.gitlab = mkOption {
         type = types.package;
         default = pkgs.gitlab;
-        defaultText = "pkgs.gitlab";
         description = "Reference to the gitlab package";
       };
 
       packages.gitlab-shell = mkOption {
         type = types.package;
         default = pkgs.gitlab-shell;
-        defaultText = "pkgs.gitlab-shell";
         description = "Reference to the gitlab-shell package";
       };
 
       packages.gitlab-workhorse = mkOption {
         type = types.package;
         default = pkgs.gitlab-workhorse;
-        defaultText = "pkgs.gitlab-workhorse";
         description = "Reference to the gitlab-workhorse package";
       };
 
diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index c177d68c8fe..d0e9b839e75 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -15,14 +15,12 @@ in
   options = {
     services.ihaskell = {
       enable = mkOption {
-        type = lib.types.bool;
         default = false;
         example = true;
         description = "Autostart an IHaskell notebook service.";
       };
 
       haskellPackages = mkOption {
-        type = lib.types.packageSet;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
@@ -35,9 +33,7 @@ in
       };
 
       extraPackages = mkOption {
-        type = types.functionTo (types.listOf types.package);
         default = self: [];
-        defaultText = "self: []";
         example = literalExample ''
           haskellPackages: [
             haskellPackages.wreq
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 7ba1c319add..37ea339300d 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -17,8 +17,6 @@ let
       nixpkgs.system = config.nixpkgs.system;
     };
 
-  internalModule = { _module = config._module; };
-
   /* For the purpose of generating docs, evaluate options with each derivation
     in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
     It isn't perfect, but it seems to cover a vast majority of use cases.
@@ -31,7 +29,7 @@ let
     options =
       let
         scrubbedEval = evalModules {
-          modules = [ versionModule ] ++ baseModules ++ [ internalModule ];
+          modules = [ versionModule ] ++ baseModules;
           args = (config._module.args) // { modules = [ ]; };
           specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
         };
@@ -45,7 +43,6 @@ let
           )
           pkgSet;
       in scrubbedEval.options;
-    internalModule = config._module;
   };
 
   entry = "${manual.manual}/share/doc/nixos/index.html";
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 8340287df45..60ec49c9e66 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -48,7 +48,8 @@ let
           if svc ? function then svc.function
           else import (toString "${toString ./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix");
         config = (evalModules
-          { modules = [ { options = res.options; config = svc.config or svc; } ] ++ [ { _module.check = false; } ];
+          { modules = [ { options = res.options; config = svc.config or svc; } ];
+            check = false;
           }).config;
         defaults = {
           extraConfig = "";
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index d8acb824f7d..6af88d4f645 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -16,7 +16,6 @@ in
     services.xserver.windowManager.xmonad = {
       enable = mkEnableOption "xmonad";
       haskellPackages = mkOption {
-        type = lib.types.packageSet;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
@@ -29,9 +28,7 @@ in
       };
 
       extraPackages = mkOption {
-        type = lib.types.functionTo (lib.types.listOf lib.types.package);
         default = self: [];
-        defaultText = "self: []";
         example = literalExample ''
           haskellPackages: [
             haskellPackages.xmonad-contrib
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 5b11a3fc61c..a6bbca9b30b 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -20,7 +20,6 @@ in
   options = {
 
     boot.kernelPackages = mkOption {
-      type = types.packageSet;
       default = pkgs.linuxPackages;
       # We don't want to evaluate all of linuxPackages for the manual
       # - some of it might not even evaluate correctly.
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 16d0e098b8c..d4cab93b26b 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -17,15 +17,14 @@ in rec {
 
   unitOption = mkOptionType {
     name = "systemd option";
-    typerep = "(systemdOption)";
-    merge = _module: loc: defs:
+    merge = loc: defs:
       let
         defs' = filterOverrides defs;
         defs'' = getValues defs';
       in
         if isList (head defs'')
         then concatLists defs''
-        else mergeOneOption _module loc defs';
+        else mergeOneOption loc defs';
   };
 
   sharedOptions = {
diff --git a/nixos/release.nix b/nixos/release.nix
index 521cae760ae..d8ef23199cb 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -101,8 +101,6 @@ in rec {
   manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages);
   options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;
 
-  optionsSpecs = (buildFromConfig ({ pkgs, ... }: { _module.typeInference = "silent"; }) (config: config.system.build.typechecker.specifications)).x86_64-linux;
-
 
   # Build the initial ramdisk so Hydra can keep track of its size over time.
   initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);

From 18a4ca2d052c49d97d900c217d68f08eb7ffc18c Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 1 Mar 2016 19:50:23 +0000
Subject: [PATCH 165/338] zathura-ps: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index 31ffbf628dd..630f45a1e41 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "zathura-ps-0.2.2";
+  name = "zathura-ps-0.2.3";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1a6ps5v1wk18qvslbkjln6w8wfzzr6fi13ls96vbdc03vdhn4m76";
+    sha256 = "18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9";
   };
 
   buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ];

From 7ad9370f0863c0c995b6dd102ea7ce6cbc738430 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 1 Mar 2016 19:49:27 +0000
Subject: [PATCH 166/338] zathura-djvu: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index 00c5464b7d1..21e482b1fd2 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "zathura-djvu-0.2.4";
+  name = "zathura-djvu-0.2.5";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1g1lafmrjbx0xv7fljdmyqxx0k334sq4q6jy4a0q5xfrgz0bh45c";
+    sha256 = "03cw54d2fipvbrnbqy0xccqkx6s77dyhyymx479aj5ryy4513dq8";
   };
 
   buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ];

From 9c86acc479d58785790f9292356a8344e3d70869 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 1 Mar 2016 19:49:46 +0000
Subject: [PATCH 167/338] zathura-pdf-mupdf: 0.2.8 -> 0.3.0

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

diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index ad5993cf581..2b74fc21b8c 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.8";
+  version = "0.3.0";
   name = "zathura-pdf-mupdf-${version}";
 
   src = fetchurl {
     url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz";
-    sha256 = "0439ls8xqnq6hqa53hd0wqxh1qf0xmccfi3pb0m4mlfs5iv952wz";
+    sha256 = "1j3j3wbp49walb19f0966qsnlqbd26wnsjpcxfbf021dav8vk327";
   };
 
   buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf ];

From df32c2d0c8250e8f0e6bb6ff1eb4d7130012364e Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 1 Mar 2016 19:52:16 +0000
Subject: [PATCH 168/338] zathura-pdf-poppler: 0.2.5 -> 0.2.6

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

diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index caaab9ec3c7..6c390d1ed85 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.5";
+  version = "0.2.6";
   name = "zathura-pdf-poppler-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0";
+    sha256 = "1maqiv7yv8d8hymlffa688c5z71v85kbzmx2j88i8z349xx0rsyi";
   };
 
   buildInputs = [ pkgconfig poppler zathura_core girara ];

From ede005ad3fc121042139c7f3a10aca8fb993509c Mon Sep 17 00:00:00 2001
From: Marko Poikonen <marko@poikonen.de>
Date: Tue, 16 Feb 2016 22:44:23 +0100
Subject: [PATCH 169/338] Enabling Media PCI adapters (needed for PCI DVB
 cards)

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

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4de27fd3000..254910cf842 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -478,6 +478,7 @@ with stdenv.lib;
   ''}
   ${optionalString (versionAtLeast version "3.7") ''
     MEDIA_USB_SUPPORT y
+    MEDIA_PCI_SUPPORT y
   ''}
 
   # Our initrd init uses shebang scripts, so can't be modular.

From c523cec12c0672666c507143505a7ed7c63bba13 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 1 Mar 2016 21:02:36 +0100
Subject: [PATCH 170/338] josm: 9329 -> 9900

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 9bd7bbb4385..99e337baa1a 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "9329";
+  version = "9900";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "084a3pizmz09abn2n7brhx6757bq9k3xq3jy8ip2ifbl2hcrw7pq";
+    sha256 = "1dsfamh2bsiz3xkhmh7g4jz6bbh25x22k3zgj1k0v0gj8k6yl7dy";
   };
 
   phases = [ "installPhase" ];

From 32e751d61648dfc0ede626dc6e93a0f8ed77049d Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Tue, 1 Mar 2016 20:42:09 +0100
Subject: [PATCH 171/338] sauce-connect: fix hashes and phases

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

diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index cc904153baf..3818020d931 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -9,18 +9,18 @@ stdenv.mkDerivation rec {
   src = fetchurl (
     if stdenv.system == "x86_64-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz";
-      sha1 = "0d7d2dc12766ac137e62a3e4dad3025b590f9782";
+      sha256 = "1flhsssb7wvfbwyvhc9k2di3nd7dlq832xp6dg658xbqk7mr9rvw";
     } else if stdenv.system == "i686-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz";
-      sha1 = "ee2c3002eae3b29df801a2ac1db77bb5f1c97bcc";
+      sha256 = "1hy0riljgjf4sf4cg7kn0hd18w393bdwhp0ajyimzvscg05nx8fq";
     } else {
       url = "https://saucelabs.com/downloads/sc-${version}-osx.zip";
-      sha1 = "ihr4ynnyi464pafgqyl5xkhfi13yi76j";
+      sha256 = "1fhclbc79rk6pmf5qzc2pkz1z3nsawr9pfi5bzqs8r1514ki4m4p";
     }
   );
 
   buildInputs = [ unzip ];
-  phases = "unpackPhase installPhase" + (if stdenv.system == "x86_64-darwin" then "" else "patchPhase");
+  phases = "unpackPhase installPhase " + (if stdenv.system == "x86_64-darwin" then "" else "patchPhase");
 
   patchPhase = ''
     patchelf \

From 02891a0de97d965be5b792c60d8287794d3c2e5f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Mar 2016 22:03:37 +0100
Subject: [PATCH 172/338] gnome: Drop installerIso from nix-env evaluation

This makes nix-env -qa depend on NixOS, which is not a good thing.

@lethalman
---
 pkgs/desktops/gnome-3/3.18/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix
index 11e2c7e9beb..de8b6a5e0dc 100644
--- a/pkgs/desktops/gnome-3/3.18/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/default.nix
@@ -66,7 +66,7 @@ let
   defaultIconTheme = adwaita-icon-theme;
 
 # ISO installer
-  installerIso = callPackage ./installer.nix {};
+# installerIso = callPackage ./installer.nix {};
 
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 

From b2197b84c2d140a802cb5b6f009490f76f034010 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Mar 2016 22:07:54 +0100
Subject: [PATCH 173/338] Fix NixOS eval

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

diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index 150056b8ab0..9cf46345c22 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -62,7 +62,7 @@ in
       };
 
       plugins = mkOption {
-        type = types.functionTo (types.listOf types.package);
+        #type = types.functionTo (types.listOf types.package);
         default = plugins: [];
         defaultText = "plugins: []";
         example = literalExample "plugins: [ m3d-fio ]";

From d2e15a02d71ec8746d134d2fe5d552d3fb969e6b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 1 Mar 2016 22:06:58 +0100
Subject: [PATCH 174/338] mujs: 2015-09-29 -> 2016-02-22

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

diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index 2e8e9b4f985..c321de4dc9a 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, clang }:
 
 stdenv.mkDerivation rec {
-  name = "mujs-2015-09-29";
+  name = "mujs-2016-02-22";
 
   src = fetchgit {
     url = git://git.ghostscript.com/mujs.git;
-    rev  = "08276111f575ac6142e922d62aa264dc1f30b69e";
-    sha256 = "18w7yayrn5p8amack4p23wcz49x9cjh1pmzalrf16fhy3n753hbb";
+    rev  = "624f975aae6b451e35406d8cdde808626052ce2c";
+    sha256 = "0vaskzpi84g56yjfkfri1r0lbkawhn556v0b69xjfls7ngsw346y";
   };
 
   buildInputs = [ clang ];

From 7f8d50b4435941a6895195a14739ec29b1c6aa59 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 1 Mar 2016 12:14:33 -0500
Subject: [PATCH 175/338] openssh: 7.1p2 -> 7.2p1

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

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index a6aed5169c8..5bd9c4b7acb 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -23,11 +23,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "openssh-7.1p2";
+  name = "openssh-7.2p1";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1gbbvszz74lkc7b2mqr3ccgpm65zj0k5h7a2ssh0c7pjvhjg0xfx";
+    sha256 = "1hsa1f3641pdj57a55gmnvcya3wwww2fc2cvb77y95rm5xxw6g4p";
   };
 
   prePatch = optionalString hpnSupport

From cc71804ab0647839ee4467763fd37397e05a52c6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Mar 2016 22:24:07 +0100
Subject: [PATCH 176/338] openssh: Fix build

---
 pkgs/tools/networking/openssh/default.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 5bd9c4b7acb..4d3ffb1257f 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -37,15 +37,7 @@ stdenv.mkDerivation rec {
     '';
 
   patches =
-    [ ./locale_archive.patch
-
-      # Fix "HostKeyAlgoritms +...", which we need to enable DSA
-      # host key support.
-      (fetchurl {
-        url = "https://pkgs.fedoraproject.org/cgit/rpms/openssh.git/plain/openssh-7.1p1-hostkeyalgorithms.patch?id=c98f5597250d6f9a8e8d96960beb6306d150ef0f";
-        sha256 = "029lzp9qv1af8wdm0wwj7qwjj1nimgsjj214jqm3amwz0857qgvp";
-      })
-    ]
+    [ ./locale_archive.patch ]
     ++ optional withGssapiPatches gssapiSrc;
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]

From afa7d8452903318dd09e742e57899ba745c516cf Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 1 Mar 2016 22:53:49 +0100
Subject: [PATCH 177/338] instead: 2.3.0 -> 2.4.0

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

diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index 6d55f2a2d5c..3dbda395dd6 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
 
 let
-  version = "2.3.0";
+  version = "2.4.0";
 
   # I took several games at random from http://instead.syscall.ru/games/
   games = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
-    sha256 = "1ldisjkmmcpnmv4vsd25dc1sfiwbr9fcn3hxhl78i4jwlyqgrms8";
+    sha256 = "1xxga3ppgjshxzd0p53vsbaqkpzmjnm4vw0j1v7qbqzjgi3r44ix";
   };
 
   NIX_LDFLAGS = "-llua -lgcc_s";

From e50da7ee6a44fcdb846139b2b902c202959c5f61 Mon Sep 17 00:00:00 2001
From: Maxwell <mhuan13@gmail.com>
Date: Sat, 30 Jan 2016 21:09:37 -0500
Subject: [PATCH 178/338] bspwm: add startThroughSession & sessionScript option

Add ability to do a more traditional bspwm startup (using the bspwm-session
script provided by nixpkgs.bspwm) as an alternative to directly starting
sxhkd & bspwm

Also added the ability to specify a custom startup script, instead of
relying on the provided bspwm-session
---
 .../services/x11/window-managers/bspwm.nix    | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix
index 1edf6ba4deb..271b1b6cf5d 100644
--- a/nixos/modules/services/x11/window-managers/bspwm.nix
+++ b/nixos/modules/services/x11/window-managers/bspwm.nix
@@ -8,16 +8,39 @@ in
 
 {
   options = {
-    services.xserver.windowManager.bspwm.enable = mkEnableOption "bspwm";
+    services.xserver.windowManager.bspwm = {
+        enable = mkEnableOption "bspwm";
+        startThroughSession = mkOption {
+            type = with types; bool;
+            default = false;
+            description = "
+                Start the window manager through the script defined in 
+                sessionScript. Defaults to the the bspwm-session script
+                provided by bspwm
+            ";
+        };
+        sessionScript = mkOption {
+            default = "${pkgs.bspwm}/bin/bspwm-session";
+            defaultText = "(pkgs.bspwm)/bin/bspwm-session";
+            description = "
+                The start-session script to use. Defaults to the
+                provided bspwm-session script from the bspwm package.
+
+                Does nothing unless `bspwm.startThroughSession` is enabled
+            ";
+        };
+    };
   };
 
   config = mkIf cfg.enable {
     services.xserver.windowManager.session = singleton {
       name = "bspwm";
-      start = "
-        SXHKD_SHELL=/bin/sh ${pkgs.sxhkd}/bin/sxhkd -f 100 &
-        ${pkgs.bspwm}/bin/bspwm
-      ";
+      start = if cfg.startThroughSession
+        then cfg.sessionScript
+        else ''
+            SXHKD_SHELL=/bin/sh ${pkgs.sxhkd}/bin/sxhkd -f 100 &
+            ${pkgs.bspwm}/bin/bspwm
+        '';
     };
     environment.systemPackages = [ pkgs.bspwm ];
   };

From 995475944f4213ddef3382ed09ba2fdc10687e1d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Mar 2016 22:44:31 +0000
Subject: [PATCH 179/338] qt_gstreamer1: add upstream patch to build with
 current gstreamer

---
 .../libraries/gstreamer/qt-gstreamer/default.nix      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
index b306e737df1..3bd840dcd7e 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gst_all_1, boost, glib, qt4, cmake
+{ stdenv, fetchurl, fetchpatch, gst_all_1, boost, glib, qt4, cmake
 , automoc4, flex, bison, pkgconfig }:
 
 stdenv.mkDerivation rec {
@@ -10,13 +10,20 @@ stdenv.mkDerivation rec {
     sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://cgit.freedesktop.org/gstreamer/qt-gstreamer/patch/?id=e2ca8094aa8d0eac1c3a98df66fe94ce0c754088";
+      sha256 = "1qps0nlc26d74wk8h96xl5s3d9qrdx6c0ph0zpl1dnc691lgyf6s";
+    })
+  ];
+
   buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ];
   propagatedBuildInputs = [ boost ];
   nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
 
   cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
 
-  meta = { 
+  meta = {
     platforms = stdenv.lib.platforms.linux;
   };
 }

From 4686bc54a61e332129574adf4a1063937a66e4ac Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 1 Mar 2016 16:06:29 -0800
Subject: [PATCH 180/338] add socket.io to interactive ghcjs environments

---
 pkgs/development/compilers/ghcjs/default.nix  |   8 +-
 .../ghcjs/node-packages-generated.nix         | 943 ++++++++++++++++++
 .../compilers/ghcjs/node-packages.json        |   1 +
 .../haskell-modules/generic-builder.nix       |   5 +-
 4 files changed, 954 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/ghcjs/node-packages-generated.nix
 create mode 100644 pkgs/development/compilers/ghcjs/node-packages.json

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 7401a23ddae..77b3a15cb32 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -125,11 +125,17 @@ in mkDerivation (rec {
         --with-gmp-includes ${gmp}/include \
         --with-gmp-libraries ${gmp}/lib
   '';
-  passthru = {
+  passthru = let
+    ghcjsNodePkgs = pkgs.nodePackages.override {
+      generated = ./node-packages-generated.nix;
+      self = ghcjsNodePkgs;
+    };
+  in {
     inherit bootPkgs;
     isCross = true;
     isGhcjs = true;
     inherit nodejs ghcjsBoot;
+    inherit (ghcjsNodePkgs) "socket.io";
   };
 
   homepage = "https://github.com/ghcjs/ghcjs";
diff --git a/pkgs/development/compilers/ghcjs/node-packages-generated.nix b/pkgs/development/compilers/ghcjs/node-packages-generated.nix
new file mode 100644
index 00000000000..a3c882ff76c
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs/node-packages-generated.nix
@@ -0,0 +1,943 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."accepts"."1.1.4" =
+    self.by-version."accepts"."1.1.4";
+  by-version."accepts"."1.1.4" = self.buildNodePackage {
+    name = "accepts-1.1.4";
+    version = "1.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
+      name = "accepts-1.1.4.tgz";
+      sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
+    };
+    deps = {
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
+      "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."after"."0.8.1" =
+    self.by-version."after"."0.8.1";
+  by-version."after"."0.8.1" = self.buildNodePackage {
+    name = "after-0.8.1";
+    version = "0.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz";
+      name = "after-0.8.1.tgz";
+      sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."arraybuffer.slice"."0.0.6" =
+    self.by-version."arraybuffer.slice"."0.0.6";
+  by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage {
+    name = "arraybuffer.slice-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz";
+      name = "arraybuffer.slice-0.0.6.tgz";
+      sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."backo2"."1.0.2" =
+    self.by-version."backo2"."1.0.2";
+  by-version."backo2"."1.0.2" = self.buildNodePackage {
+    name = "backo2-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
+      name = "backo2-1.0.2.tgz";
+      sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64-arraybuffer"."0.1.2" =
+    self.by-version."base64-arraybuffer"."0.1.2";
+  by-version."base64-arraybuffer"."0.1.2" = self.buildNodePackage {
+    name = "base64-arraybuffer-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
+      name = "base64-arraybuffer-0.1.2.tgz";
+      sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64id"."0.1.0" =
+    self.by-version."base64id"."0.1.0";
+  by-version."base64id"."0.1.0" = self.buildNodePackage {
+    name = "base64id-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+      name = "base64id-0.1.0.tgz";
+      sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."benchmark"."1.0.0" =
+    self.by-version."benchmark"."1.0.0";
+  by-version."benchmark"."1.0.0" = self.buildNodePackage {
+    name = "benchmark-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
+      name = "benchmark-1.0.0.tgz";
+      sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."better-assert"."~1.0.0" =
+    self.by-version."better-assert"."1.0.2";
+  by-version."better-assert"."1.0.2" = self.buildNodePackage {
+    name = "better-assert-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz";
+      name = "better-assert-1.0.2.tgz";
+      sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
+    };
+    deps = {
+      "callsite-1.0.0" = self.by-version."callsite"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."blob"."0.0.4" =
+    self.by-version."blob"."0.0.4";
+  by-version."blob"."0.0.4" = self.buildNodePackage {
+    name = "blob-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/blob/-/blob-0.0.4.tgz";
+      name = "blob-0.0.4.tgz";
+      sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."callsite"."1.0.0" =
+    self.by-version."callsite"."1.0.0";
+  by-version."callsite"."1.0.0" = self.buildNodePackage {
+    name = "callsite-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
+      name = "callsite-1.0.0.tgz";
+      sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."component-bind"."1.0.0" =
+    self.by-version."component-bind"."1.0.0";
+  by-version."component-bind"."1.0.0" = self.buildNodePackage {
+    name = "component-bind-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
+      name = "component-bind-1.0.0.tgz";
+      sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."component-emitter"."1.1.2" =
+    self.by-version."component-emitter"."1.1.2";
+  by-version."component-emitter"."1.1.2" = self.buildNodePackage {
+    name = "component-emitter-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
+      name = "component-emitter-1.1.2.tgz";
+      sha1 = "296594f2753daa63996d2af08d15a95116c9aec3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."component-emitter"."1.2.0" =
+    self.by-version."component-emitter"."1.2.0";
+  by-version."component-emitter"."1.2.0" = self.buildNodePackage {
+    name = "component-emitter-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz";
+      name = "component-emitter-1.2.0.tgz";
+      sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."component-inherit"."0.0.3" =
+    self.by-version."component-inherit"."0.0.3";
+  by-version."component-inherit"."0.0.3" = self.buildNodePackage {
+    name = "component-inherit-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
+      name = "component-inherit-0.0.3.tgz";
+      sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."0.7.4" =
+    self.by-version."debug"."0.7.4";
+  by-version."debug"."0.7.4" = self.buildNodePackage {
+    name = "debug-0.7.4";
+    version = "0.7.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
+      name = "debug-0.7.4.tgz";
+      sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."2.2.0" =
+    self.by-version."debug"."2.2.0";
+  by-version."debug"."2.2.0" = self.buildNodePackage {
+    name = "debug-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+      name = "debug-2.2.0.tgz";
+      sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+    };
+    deps = {
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."engine.io"."1.6.8" =
+    self.by-version."engine.io"."1.6.8";
+  by-version."engine.io"."1.6.8" = self.buildNodePackage {
+    name = "engine.io-1.6.8";
+    version = "1.6.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/engine.io/-/engine.io-1.6.8.tgz";
+      name = "engine.io-1.6.8.tgz";
+      sha1 = "de05a06b757e7517695e088c7b051c47819f511b";
+    };
+    deps = {
+      "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "ws-1.0.1" = self.by-version."ws"."1.0.1";
+      "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4";
+      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."engine.io-client"."1.6.8" =
+    self.by-version."engine.io-client"."1.6.8";
+  by-version."engine.io-client"."1.6.8" = self.buildNodePackage {
+    name = "engine.io-client-1.6.8";
+    version = "1.6.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.8.tgz";
+      name = "engine.io-client-1.6.8.tgz";
+      sha1 = "6e2db11648b45e405c46b172ea3e3dac37cc0ceb";
+    };
+    deps = {
+      "has-cors-1.1.0" = self.by-version."has-cors"."1.1.0";
+      "ws-1.0.1" = self.by-version."ws"."1.0.1";
+      "xmlhttprequest-ssl-1.5.1" = self.by-version."xmlhttprequest-ssl"."1.5.1";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
+      "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4";
+      "parsejson-0.0.1" = self.by-version."parsejson"."0.0.1";
+      "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2";
+      "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3";
+      "yeast-0.1.2" = self.by-version."yeast"."0.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."engine.io-parser"."1.2.4" =
+    self.by-version."engine.io-parser"."1.2.4";
+  by-version."engine.io-parser"."1.2.4" = self.buildNodePackage {
+    name = "engine.io-parser-1.2.4";
+    version = "1.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz";
+      name = "engine.io-parser-1.2.4.tgz";
+      sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42";
+    };
+    deps = {
+      "after-0.8.1" = self.by-version."after"."0.8.1";
+      "arraybuffer.slice-0.0.6" = self.by-version."arraybuffer.slice"."0.0.6";
+      "base64-arraybuffer-0.1.2" = self.by-version."base64-arraybuffer"."0.1.2";
+      "blob-0.0.4" = self.by-version."blob"."0.0.4";
+      "has-binary-0.1.6" = self.by-version."has-binary"."0.1.6";
+      "utf8-2.1.0" = self.by-version."utf8"."2.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-binary"."0.1.6" =
+    self.by-version."has-binary"."0.1.6";
+  by-version."has-binary"."0.1.6" = self.buildNodePackage {
+    name = "has-binary-0.1.6";
+    version = "0.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
+      name = "has-binary-0.1.6.tgz";
+      sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10";
+    };
+    deps = {
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-binary"."0.1.7" =
+    self.by-version."has-binary"."0.1.7";
+  by-version."has-binary"."0.1.7" = self.buildNodePackage {
+    name = "has-binary-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz";
+      name = "has-binary-0.1.7.tgz";
+      sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
+    };
+    deps = {
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-cors"."1.1.0" =
+    self.by-version."has-cors"."1.1.0";
+  by-version."has-cors"."1.1.0" = self.buildNodePackage {
+    name = "has-cors-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
+      name = "has-cors-1.1.0.tgz";
+      sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."indexof"."0.0.1" =
+    self.by-version."indexof"."0.0.1";
+  by-version."indexof"."0.0.1" = self.buildNodePackage {
+    name = "indexof-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
+      name = "indexof-0.0.1.tgz";
+      sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."isarray"."0.0.1" =
+    self.by-version."isarray"."0.0.1";
+  by-version."isarray"."0.0.1" = self.buildNodePackage {
+    name = "isarray-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+      name = "isarray-0.0.1.tgz";
+      sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."json3"."3.2.6" =
+    self.by-version."json3"."3.2.6";
+  by-version."json3"."3.2.6" = self.buildNodePackage {
+    name = "json3-3.2.6";
+    version = "3.2.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
+      name = "json3-3.2.6.tgz";
+      sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."json3"."3.3.2" =
+    self.by-version."json3"."3.3.2";
+  by-version."json3"."3.3.2" = self.buildNodePackage {
+    name = "json3-3.3.2";
+    version = "3.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
+      name = "json3-3.3.2.tgz";
+      sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-db"."~1.12.0" =
+    self.by-version."mime-db"."1.12.0";
+  by-version."mime-db"."1.12.0" = self.buildNodePackage {
+    name = "mime-db-1.12.0";
+    version = "1.12.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
+      name = "mime-db-1.12.0.tgz";
+      sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~2.0.4" =
+    self.by-version."mime-types"."2.0.14";
+  by-version."mime-types"."2.0.14" = self.buildNodePackage {
+    name = "mime-types-2.0.14";
+    version = "2.0.14";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
+      name = "mime-types-2.0.14.tgz";
+      sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
+    };
+    deps = {
+      "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ms"."0.7.1" =
+    self.by-version."ms"."0.7.1";
+  by-version."ms"."0.7.1" = self.buildNodePackage {
+    name = "ms-0.7.1";
+    version = "0.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+      name = "ms-0.7.1.tgz";
+      sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."negotiator"."0.4.9" =
+    self.by-version."negotiator"."0.4.9";
+  by-version."negotiator"."0.4.9" = self.buildNodePackage {
+    name = "negotiator-0.4.9";
+    version = "0.4.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
+      name = "negotiator-0.4.9.tgz";
+      sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."object-component"."0.0.3" =
+    self.by-version."object-component"."0.0.3";
+  by-version."object-component"."0.0.3" = self.buildNodePackage {
+    name = "object-component-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
+      name = "object-component-0.0.3.tgz";
+      sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."options".">=0.0.5" =
+    self.by-version."options"."0.0.6";
+  by-version."options"."0.0.6" = self.buildNodePackage {
+    name = "options-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz";
+      name = "options-0.0.6.tgz";
+      sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."parsejson"."0.0.1" =
+    self.by-version."parsejson"."0.0.1";
+  by-version."parsejson"."0.0.1" = self.buildNodePackage {
+    name = "parsejson-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
+      name = "parsejson-0.0.1.tgz";
+      sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
+    };
+    deps = {
+      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."parseqs"."0.0.2" =
+    self.by-version."parseqs"."0.0.2";
+  by-version."parseqs"."0.0.2" = self.buildNodePackage {
+    name = "parseqs-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
+      name = "parseqs-0.0.2.tgz";
+      sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7";
+    };
+    deps = {
+      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."parseuri"."0.0.4" =
+    self.by-version."parseuri"."0.0.4";
+  by-version."parseuri"."0.0.4" = self.buildNodePackage {
+    name = "parseuri-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
+      name = "parseuri-0.0.4.tgz";
+      sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350";
+    };
+    deps = {
+      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socket.io"."*" =
+    self.by-version."socket.io"."1.4.5";
+  by-version."socket.io"."1.4.5" = self.buildNodePackage {
+    name = "socket.io-1.4.5";
+    version = "1.4.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io/-/socket.io-1.4.5.tgz";
+      name = "socket.io-1.4.5.tgz";
+      sha1 = "f202f49eeb9cf7cf6c0971ad75d8d96d451ea4f7";
+    };
+    deps = {
+      "engine.io-1.6.8" = self.by-version."engine.io"."1.6.8";
+      "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6";
+      "socket.io-client-1.4.5" = self.by-version."socket.io-client"."1.4.5";
+      "socket.io-adapter-0.4.0" = self.by-version."socket.io-adapter"."0.4.0";
+      "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "socket.io" = self.by-version."socket.io"."1.4.5";
+  by-spec."socket.io-adapter"."0.4.0" =
+    self.by-version."socket.io-adapter"."0.4.0";
+  by-version."socket.io-adapter"."0.4.0" = self.buildNodePackage {
+    name = "socket.io-adapter-0.4.0";
+    version = "0.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz";
+      name = "socket.io-adapter-0.4.0.tgz";
+      sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "socket.io-parser-2.2.2" = self.by-version."socket.io-parser"."2.2.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socket.io-client"."1.4.5" =
+    self.by-version."socket.io-client"."1.4.5";
+  by-version."socket.io-client"."1.4.5" = self.buildNodePackage {
+    name = "socket.io-client-1.4.5";
+    version = "1.4.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.5.tgz";
+      name = "socket.io-client-1.4.5.tgz";
+      sha1 = "400d630c31e7c9579e45173f977e4f5bd8dc7d2e";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "engine.io-client-1.6.8" = self.by-version."engine.io-client"."1.6.8";
+      "component-bind-1.0.0" = self.by-version."component-bind"."1.0.0";
+      "component-emitter-1.2.0" = self.by-version."component-emitter"."1.2.0";
+      "object-component-0.0.3" = self.by-version."object-component"."0.0.3";
+      "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6";
+      "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7";
+      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
+      "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4";
+      "to-array-0.1.4" = self.by-version."to-array"."0.1.4";
+      "backo2-1.0.2" = self.by-version."backo2"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socket.io-parser"."2.2.2" =
+    self.by-version."socket.io-parser"."2.2.2";
+  by-version."socket.io-parser"."2.2.2" = self.buildNodePackage {
+    name = "socket.io-parser-2.2.2";
+    version = "2.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
+      name = "socket.io-parser-2.2.2.tgz";
+      sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417";
+    };
+    deps = {
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "json3-3.2.6" = self.by-version."json3"."3.2.6";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socket.io-parser"."2.2.6" =
+    self.by-version."socket.io-parser"."2.2.6";
+  by-version."socket.io-parser"."2.2.6" = self.buildNodePackage {
+    name = "socket.io-parser-2.2.6";
+    version = "2.2.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz";
+      name = "socket.io-parser-2.2.6.tgz";
+      sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "json3-3.3.2" = self.by-version."json3"."3.3.2";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."to-array"."0.1.4" =
+    self.by-version."to-array"."0.1.4";
+  by-version."to-array"."0.1.4" = self.buildNodePackage {
+    name = "to-array-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
+      name = "to-array-0.1.4.tgz";
+      sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ultron"."1.0.x" =
+    self.by-version."ultron"."1.0.2";
+  by-version."ultron"."1.0.2" = self.buildNodePackage {
+    name = "ultron-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz";
+      name = "ultron-1.0.2.tgz";
+      sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."utf8"."2.1.0" =
+    self.by-version."utf8"."2.1.0";
+  by-version."utf8"."2.1.0" = self.buildNodePackage {
+    name = "utf8-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz";
+      name = "utf8-2.1.0.tgz";
+      sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ws"."1.0.1" =
+    self.by-version."ws"."1.0.1";
+  by-version."ws"."1.0.1" = self.buildNodePackage {
+    name = "ws-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ws/-/ws-1.0.1.tgz";
+      name = "ws-1.0.1.tgz";
+      sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9";
+    };
+    deps = {
+      "options-0.0.6" = self.by-version."options"."0.0.6";
+      "ultron-1.0.2" = self.by-version."ultron"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xmlhttprequest-ssl"."1.5.1" =
+    self.by-version."xmlhttprequest-ssl"."1.5.1";
+  by-version."xmlhttprequest-ssl"."1.5.1" = self.buildNodePackage {
+    name = "xmlhttprequest-ssl-1.5.1";
+    version = "1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz";
+      name = "xmlhttprequest-ssl-1.5.1.tgz";
+      sha1 = "3b7741fea4a86675976e908d296d4445961faa67";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."yeast"."0.1.2" =
+    self.by-version."yeast"."0.1.2";
+  by-version."yeast"."0.1.2" = self.buildNodePackage {
+    name = "yeast-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz";
+      name = "yeast-0.1.2.tgz";
+      sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+}
diff --git a/pkgs/development/compilers/ghcjs/node-packages.json b/pkgs/development/compilers/ghcjs/node-packages.json
new file mode 100644
index 00000000000..55fa86675e7
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs/node-packages.json
@@ -0,0 +1 @@
+[ "socket.io" ]
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 8b54a19c2b5..2700caa1a5b 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused
-, jailbreak-cabal, hscolour, cpphs
+, jailbreak-cabal, hscolour, cpphs, nodePackages
 }:
 
 { pname
@@ -282,7 +282,8 @@ stdenv.mkDerivation ({
 
     env = stdenv.mkDerivation {
       name = "interactive-${pname}-${version}-environment";
-      nativeBuildInputs = [ ghcEnv systemBuildInputs ];
+      nativeBuildInputs = [ ghcEnv systemBuildInputs ]
+        ++ optional isGhcjs ghc."socket.io"; # for ghcjsi
       LANG = "en_US.UTF-8";
       LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
       shellHook = ''

From a429444a75f0ece433b6653b2f82a4876f8b07c8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 2 Mar 2016 02:18:35 +0100
Subject: [PATCH 181/338] nixos/release: Replace a: b: a // b by mergeAttrs

No change in functionality, it just looks nicer that way.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index fb74766e67c..069cf3727de 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -31,7 +31,7 @@ let
   # If the test is only for a particular system, use only the specified
   # system instead of generating attributes for all available systems.
   in if args ? system then discover (import fn args)
-     else foldAttrs (a: b: a // b) {} (map discoverForSystem supportedSystems);
+     else foldAttrs mergeAttrs {} (map discoverForSystem supportedSystems);
 
   pkgs = import nixpkgs { system = "x86_64-linux"; };
 

From f681ceb5935ac8688b9d707b92c49fdf8ca589b3 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Tue, 1 Mar 2016 23:14:25 -0500
Subject: [PATCH 182/338] uzbl: version 20120514 -> v0.9.0

---
 .../networking/browsers/uzbl/default.nix       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 318b9576392..9e3b44f4083 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -1,27 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, python, makeWrapper, pygtk
-, webkit, glib_networking, gsettings_desktop_schemas
+{ stdenv, fetchurl, pkgconfig, python3, makeWrapper, pygtk
+, webkit, glib_networking, gsettings_desktop_schemas, pythonPackages
 }:
 
 stdenv.mkDerivation rec {
-  name = "uzbl-20120514";
+  name = "uzbl-v0.9.0";
 
   meta = with stdenv.lib; {
     description = "Tiny externally controllable webkit browser";
     homepage    = "http://uzbl.org/";
     license     = licenses.gpl3;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [ raskin ];
+    maintainers = with maintainers; [ raskin dgonyeo ];
   };
 
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "https://github.com/uzbl/uzbl/archive/2012.05.14.tar.gz";
-    sha256 = "1flpf0rg0c3n9bjifr37zxljn9yxslg8vkll7ghkm341x76cbkwn";
+    url = "https://github.com/uzbl/uzbl/archive/v0.9.0.tar.gz";
+    sha256 = "0iskhv653fdm5raiidimh9fzlsw28zjqx7b5n3fl1wgbj6yz074k";
   };
 
   preConfigure = ''
     makeFlags="$makeFlags PREFIX=$out"
     makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out"
+    mkdir -p $out/lib/python3.4/site-packages/
+    export PYTHONPATH=$PYTHONPATH:$out/lib/python3.4/site-packages/
   '';
 
   preFixup = ''
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  nativeBuildInputs = [ pkgconfig python makeWrapper ];
+  nativeBuildInputs = [ pkgconfig python3 makeWrapper ];
 
-  buildInputs = [ gsettings_desktop_schemas webkit pygtk ];
+  buildInputs = [ gsettings_desktop_schemas webkit pygtk pythonPackages.six ];
 }

From 8f4a7d6c4c4eae6fb82ccf2fc33a88e03d5fd8c4 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 26 Feb 2016 17:33:45 +0100
Subject: [PATCH 183/338] pkgs.motuclient: move application away from
 pythonPackages

---
 .../science/misc/motu-client/default.nix      | 23 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            | 26 -------------------
 3 files changed, 24 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/applications/science/misc/motu-client/default.nix

diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix
new file mode 100644
index 00000000000..b5e9fa6a51e
--- /dev/null
+++ b/pkgs/applications/science/misc/motu-client/default.nix
@@ -0,0 +1,23 @@
+{ python27Packages, fetchurl, lib } :
+python27Packages.buildPythonApplication rec {
+  name = "motu-client-${version}";
+  version = "1.0.8";
+
+  src = fetchurl {
+    url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${name}.tar.gz";
+    sha256 = "1naqmav312agn72iad9kyxwscn2lz4v1cfcqqi1qcgvc82vnwkw2";
+  };
+
+  meta = with lib; {
+    homepage = https://github.com/quiet-oceans/motuclient-setuptools;
+    description = "CLI to query oceanographic data to Motu servers";
+    longDescription = ''
+      Access data from (motu)[http://sourceforge.net/projects/cls-motu/] servers.
+      This is a refactored fork of the original release in order to simplify integration,
+      deployment and packaging. Upstream code can be found at
+      http://sourceforge.net/projects/cls-motu/ .
+    '';
+    license = licenses.lgpl3Plus;
+    maintainers = [ maintainers.lsix ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd24b79e54b..976063d8dd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2458,7 +2458,7 @@ let
     inherit (perlPackages) IOTty;
   };
 
-  motuclient = python27Packages.motuclient;
+  motuclient = callPackage ../applications/science/misc/motu-client { };
 
   mpage = callPackage ../tools/text/mpage { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ff2fe1e840a..ce794867e27 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6397,32 +6397,6 @@ in modules // {
     };
   };
 
-  motuclient = buildPythonPackage rec {
-    name = "motu-client-${version}";
-    version = "1.0.8";
-
-    namePrefix = "";
-    disabled = !isPy27;
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${name}.tar.gz";
-      sha256 = "1naqmav312agn72iad9kyxwscn2lz4v1cfcqqi1qcgvc82vnwkw2";
-    };
-
-    meta = {
-      homepage = https://github.com/quiet-oceans/motuclient-setuptools;
-      description = "CLI to query oceanographic data to Motu servers";
-      longDescription = ''
-        Access data from (motu)[http://sourceforge.net/projects/cls-motu/] servers.
-        This is a refactored fork of the original release in order to simplify integration,
-        deployment and packaging. Upstream code can be found at
-        http://sourceforge.net/projects/cls-motu/ .
-      '';
-      license = licenses.lgpl3Plus;
-      maintainers = [ maintainers.lsix ];
-    };
-  };
-
   mwlib-ext = buildPythonPackage rec {
     version = "0.13.2";
     name = "mwlib.ext-${version}";

From a95e65b1eb966249b40f5c3d840f4cc58e67d53d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 2 Mar 2016 12:42:20 +0100
Subject: [PATCH 184/338] gtkwave: update to 3.3.70

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

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 36c3b7e899d..32d39d8a609 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
 stdenv.mkDerivation rec {
-  name = "gtkwave-3.3.66";
+  name = "gtkwave-3.3.70";
 
   src = fetchurl {
     url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "17mrmgr6zzl1x1qml0wmjjhcbw7bg3w4mqy60rsy0z6gxd8hikh4";
+    sha256 = "1akzf1sq8mwarrbrbz5chrvgwlsp444h5za8rg1dfyqk733s7piz";
   };
 
   buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ];

From 49f23a602817745a222cb59de1375cdd92b2e1f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Mar 2016 12:48:28 +0100
Subject: [PATCH 185/338] m2crypto: 0.21.1 -> 0.23.0

The previous version broke because it required SSLv2 support in OpenSSL:

ImportError: /nix/store/c0z7qlycaa2jhqjq0v9vy3j4nw4layw2-python2.7-m2crypto-0.21.1/lib/python2.7/site-packages/M2Crypto/__m2crypto.so: undefined symbol: SSLv2_method
---
 pkgs/top-level/python-packages.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ff2fe1e840a..760cb9df68f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11236,17 +11236,19 @@ in modules // {
 
 
   m2crypto = buildPythonPackage rec {
-    version = "0.21.1";
+    version = "0.23.0";
     name = "m2crypto-${version}";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${version}.tar.gz";
-      md5 = "f93d8462ff7646397a9f77a2fe602d17";
+      md5 = "89557730e245294a6cab06de8ad4fb42";
     };
 
     buildInputs = with self; [ pkgs.swig2 pkgs.openssl ];
 
-    preBuild = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}";
+    preConfigure = ''
+      substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${pkgs.openssl}'"
+    '';
 
     doCheck = false; # another test that depends on the network.
 

From 7ddd6fc1c3672e82bcc2dba8d10cc83565d873c3 Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Wed, 2 Mar 2016 14:49:23 +0100
Subject: [PATCH 186/338] epson-escpr: 1.6.3 -> 1.6.4

---
 pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch | 2 +-
 pkgs/misc/drivers/epson-escpr/default.nix                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
index 3065ed1a10f..78d278f186b 100644
--- a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
+++ b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
@@ -1,5 +1,5 @@
 diff --git a/configure b/configure_new
-index c3e7199..ccbf290 100755
+index 3d6f68c..c2b10ff 100755
 --- a/configure
 +++ b/configure_new
 @@ -11585,55 +11585,8 @@ else
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index 1f403947acb..305f0d78a0b 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, cups }:
 
 let
-  version = "1.6.3";
+  version = "1.6.4";
 in
   stdenv.mkDerivation {
 
     name = "epson-escpr-${version}";
   
     src = fetchurl {
-      url = "https://download3.ebz.epson.net/dsc/f/03/00/04/33/53/0177a44361d3dfeacf7f15ff4a347cef373688da/epson-inkjet-printer-escpr-1.6.3-1lsb3.2.tar.gz";
-      sha256 = "4988479ce7dd5513bfa1cce4a83f82348572d8d69d6aa3b2c6e154a58a04ad86"; 
+      url = "https://download3.ebz.epson.net/dsc/f/03/00/04/37/97/88177bc0dc7025905eae4a0da1e841408f82e33c/epson-inkjet-printer-escpr-1.6.4-1lsb3.2.tar.gz"; 
+      sha256 = "76c66461a30be82b9cc37d663147a72f488fe060ef54578120602bb87a3f7754"; 
     }; 
 
     patches = [ ./cups-filter-ppd-dirs.patch ]; 

From 4e906f9fb25b8bcf2355f2545a2476430ec4ecb5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Mar 2016 14:51:41 +0100
Subject: [PATCH 187/338] perl-packages.nix: Remove unnecessary variable
 quotations

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 41e46f32342..e61f24ae3c2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1415,7 +1415,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "CGI" = buildPerlPackage rec {
+  CGI = buildPerlPackage rec {
     name = "CGI-4.26";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
@@ -3521,7 +3521,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "DevelDeclare" = buildPerlPackage rec {
+  DevelDeclare = buildPerlPackage rec {
     name = "Devel-Declare-0.006018";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
@@ -6900,7 +6900,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "LWP" = buildPerlPackage rec {
+  LWP = buildPerlPackage rec {
     name = "libwww-perl-6.15";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
@@ -8239,7 +8239,7 @@ let self = _self // overrides; _self = with self; {
       [ ClassMOP Moose namespaceautoclean ListMoreUtils ];
   };
 
-  "MooseXTypes" = buildPerlPackage rec {
+  MooseXTypes = buildPerlPackage rec {
     name = "MooseX-Types-0.46";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
@@ -8255,7 +8255,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "MooseXTypesCommon" = buildPerlPackage rec {
+  MooseXTypesCommon = buildPerlPackage rec {
     name = "MooseX-Types-Common-0.001013";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
@@ -10716,7 +10716,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "SubExporterForMethods" = buildPerlPackage rec {
+  SubExporterForMethods = buildPerlPackage rec {
     name = "Sub-Exporter-ForMethods-0.100052";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
@@ -11975,7 +11975,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "TestWarnings" = buildPerlPackage rec {
+  TestWarnings = buildPerlPackage rec {
     name = "Test-Warnings-0.026";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
@@ -13002,7 +13002,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "URI" = buildPerlPackage rec {
+  URI = buildPerlPackage rec {
     name = "URI-1.71";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";

From bd7f379a3f4d661a0ae611e7ca4d7d85297f13d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Mar 2016 15:00:32 +0100
Subject: [PATCH 188/338] LWP::Protocol::https: Fix SSL cert handling

We lost this in 9f358f809d1db46f3206d4a09a5366f13c93e777. Updated to
use /etc/ssl/certs/ca-certificates.crt if it exists and SSL_CERT_FILE
is not set.
---
 .../lwp-protocol-https-cert-file.patch            | 15 +++++++++++++++
 pkgs/top-level/perl-packages.nix                  |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch

diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
new file mode 100644
index 00000000000..119c8b61da3
--- /dev/null
+++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
@@ -0,0 +1,15 @@
+diff -ru -x '*~' LWP-Protocol-https-6.04-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm
+--- LWP-Protocol-https-6.04-orig/lib/LWP/Protocol/https.pm	2013-04-29 23:16:18.000000000 +0200
++++ LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm	2016-03-02 14:59:01.639844511 +0100
+@@ -24,6 +24,11 @@
+     }
+     if ($ssl_opts{SSL_verify_mode}) {
+ 	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
++	    $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'};
++	    $ssl_opts{SSL_ca_file} = "/etc/ssl/certs/ca-certificates.crt"
++		if !defined $ssl_opts{SSL_ca_file} && -e "/etc/ssl/certs/ca-certificates.crt";
++	}
++	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
+ 	    eval {
+ 		require Mozilla::CA;
+ 	    };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e61f24ae3c2..18ef6145df0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6950,6 +6950,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-https-6.04.tar.gz;
       sha256 = "0agnga5dg94222h6rlzqxa0dri2sh3gayncvfb7jad9nxr87gxhy";
     };
+    patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ];
     propagatedBuildInputs = [ LWP IOSocketSSL ];
     doCheck = false; # tries to connect to https://www.apache.org/.
     meta = {

From 69d8cb4a6bf85b2a6546a20a9e8b9c9c0f2943ec Mon Sep 17 00:00:00 2001
From: Alex Franchuk <alex.franchuk@gmail.com>
Date: Tue, 23 Feb 2016 23:06:45 -0500
Subject: [PATCH 189/338] libreswan: add package and service to nixos

---
 lib/maintainers.nix                           |   1 +
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/networking/libreswan.nix | 126 ++++++++++++++++++
 pkgs/tools/networking/libreswan/default.nix   |  73 ++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 203 insertions(+)
 create mode 100644 nixos/modules/services/networking/libreswan.nix
 create mode 100644 pkgs/tools/networking/libreswan/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 226c41d4806..cd40b17cdfb 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -15,6 +15,7 @@
   aespinosa = "Allan Espinosa <allan.espinosa@outlook.com>";
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   aflatter = "Alexander Flatter <flatter@fastmail.fm>";
+  afranchuk = "Alex Franchuk <alex.franchuk@gmail.com>";
   aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
   ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
   akaWolf = "Artjom Vejsel <akawolf0@gmail.com>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 30e716c2ef4..c8d3aaf5cfe 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -328,6 +328,7 @@
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/kippo.nix
   ./services/networking/lambdabot.nix
+  ./services/networking/libreswan.nix
   ./services/networking/mailpile.nix
   ./services/networking/minidlna.nix
   ./services/networking/miniupnpd.nix
diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix
new file mode 100644
index 00000000000..3866b216f8e
--- /dev/null
+++ b/nixos/modules/services/networking/libreswan.nix
@@ -0,0 +1,126 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.libreswan;
+
+  libexec = "${pkgs.libreswan}/libexec/ipsec";
+  ipsec = "${pkgs.libreswan}/sbin/ipsec";
+
+  trim = chars: str: let
+      nonchars = filter (x : !(elem x.value chars))
+                  (imap (i: v: {ind = (sub i 1); value = v;}) (stringToCharacters str));
+    in
+      if length nonchars == 0 then ""
+      else substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str;
+  indent = str: concatStrings (concatMap (s: ["  " (trim [" " "\t"] s) "\n"]) (splitString "\n" str));
+  configText = indent (toString cfg.configSetup);
+  connectionText = concatStrings (mapAttrsToList (n: v: 
+    ''
+      conn ${n}
+      ${indent v}
+
+    '') cfg.connections);
+  configFile = pkgs.writeText "ipsec.conf"
+    ''
+      config setup
+      ${configText}
+      
+      ${connectionText}
+    '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.libreswan = {
+
+      enable = mkEnableOption "libreswan ipsec service";
+
+      configSetup = mkOption {
+        type = types.lines;
+        default = ''
+            protostack=netkey
+            nat_traversal=yes
+            virtual_private=%v4:10.0.0.0/8,%v4:192.168.0.0/16,%v4:172.16.0.0/12,%v4:25.0.0.0/8,%v4:100.64.0.0/10,%v6:fd00::/8,%v6:fe80::/10
+        '';
+        example = ''
+            secretsfile=/root/ipsec.secrets
+            protostack=netkey
+            nat_traversal=yes
+            virtual_private=%v4:10.0.0.0/8,%v4:192.168.0.0/16,%v4:172.16.0.0/12,%v4:25.0.0.0/8,%v4:100.64.0.0/10,%v6:fd00::/8,%v6:fe80::/10
+        '';
+        description = "Options to go in the 'config setup' section of the libreswan ipsec configuration";
+      };
+
+      connections = mkOption {
+        type = types.attrsOf types.lines;
+        default = {};
+        example = {
+          myconnection = ''
+            auto=add
+            left=%defaultroute
+            leftid=@user
+
+            right=my.vpn.com
+
+            ikev2=no
+            ikelifetime=8h
+          '';
+        };
+        description = "A set of connections to define for the libreswan ipsec service";
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.libreswan pkgs.iproute ];
+
+    systemd.services.ipsec = {
+      description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec";
+      path = [
+        "${pkgs.libreswan}"
+        "${pkgs.iproute}"
+        "${pkgs.procps}"
+      ];
+
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        Type = "simple";
+        Restart = "always";
+        EnvironmentFile = "${pkgs.libreswan}/etc/sysconfig/pluto";
+        ExecStartPre = [
+          "${libexec}/addconn --config ${configFile} --checkconfig"
+          "${libexec}/_stackmanager start"
+          "${ipsec} --checknss"
+          "${ipsec} --checknflog"
+        ];
+        ExecStart = "${libexec}/pluto --config ${configFile} --nofork \$PLUTO_OPTIONS";
+        ExecStop = "${libexec}/whack --shutdown";
+        ExecStopPost = [
+          "${pkgs.iproute}/bin/ip xfrm policy flush"
+          "${pkgs.iproute}/bin/ip xfrm state flush"
+          "${ipsec} --stopnflog"
+        ];
+        ExecReload = "${libexec}/whack --listen";
+      };
+
+    };
+
+  };
+
+}
diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
new file mode 100644
index 00000000000..700e6293d42
--- /dev/null
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, makeWrapper,
+  pkgconfig, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr,
+  bash, iproute, iptables, procps, coreutils, gnused, gawk, nssTools, which, python,
+  docs ? false, xmlto
+  }:
+
+let
+  optional = stdenv.lib.optional;
+  version = "3.16";
+  name = "libreswan-${version}";
+  binPath = stdenv.lib.makeBinPath [
+    bash iproute iptables procps coreutils gnused gawk nssTools which python
+  ];
+in
+
+assert docs -> xmlto != null;
+
+stdenv.mkDerivation {
+  inherit name;
+  inherit version;
+
+  src = fetchurl {
+    url = "https://download.libreswan.org/${name}.tar.gz";
+    sha256 = "15qv4101p1jw591l04gsfscb3farzd278mgi8yph015vmifyjxrd";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ pkgconfig bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent
+                  libcap_ng curl nspr nssTools python ]
+                ++ optional docs xmlto;
+
+  prePatch = ''
+    # Correct bash path
+    sed -i -e 's|/bin/bash|/usr/bin/env bash|' mk/config.mk
+
+    # Fix systemd unit directory, and prevent the makefile from trying to reload the systemd daemon
+    sed -i -e 's|UNITDIR=.*$|UNITDIR=$\{out}/etc/systemd/system/|' -e 's|systemctl --system daemon-reload|true|' initsystems/systemd/Makefile
+
+    # Fix the ipsec program from crushing the PATH
+    sed -i -e 's|\(PATH=".*"\):.*$|\1:$PATH|' programs/ipsec/ipsec.in
+
+    # Fix python script to use the correct python
+    sed -i -e 's|#!/usr/bin/python|#!/usr/bin/env python|' -e 's/^\(\W*\)installstartcheck()/\1sscmd = "ss"\n\0/' programs/verify/verify.in
+  '';
+  
+  # Set appropriate paths for build
+  preBuild = "export INC_USRLOCAL=\${out}";
+
+  makeFlags = [ 
+    "INITSYSTEM=systemd"
+    (if docs then "all" else "base")
+  ];
+
+  installTargets = [ (if docs then "install" else "install-base") ];
+  # Hack to make install work
+  installFlags = [
+    "FINALVARDIR=\${out}/var"
+    "FINALSYSCONFDIR=\${out}/etc"
+  ];
+
+  postInstall = ''
+    for i in $out/bin/* $out/libexec/ipsec/*; do
+      wrapProgram "$i" --prefix PATH ':' "$out/bin:${binPath}"
+    done
+  '';
+
+  meta = {
+    homepage = "https://libreswan.org";
+    description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange";
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.freebsd;
+    maintainers = [ stdenv.lib.maintainers.afranchuk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37f1098a823..398c6c68320 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2279,6 +2279,8 @@ let
 
   librdmacm = callPackage ../development/libraries/librdmacm { };
 
+  libreswan = callPackage ../tools/networking/libreswan { };
+
   libwebsockets = callPackage ../development/libraries/libwebsockets { };
 
   limesurvey = callPackage ../servers/limesurvey { };

From da4f05c589cb85b7fc6adbbe231f07bd9e31ed68 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Wed, 2 Mar 2016 12:59:28 +0000
Subject: [PATCH 190/338] libsodium: 1.0.6 -> 1.0.8

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

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index c6f10a5531c..660ea280912 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.6";
+  name = "libsodium-1.0.8";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "0ngvcjwg6m9nivzi208yvz8yvmk6kxnvyr25w907kaicgpm063cl";
+    sha256 = "09hr604k9gdss2r321x5dv3wn11fdl87nswr18g68lkqab993wf0";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lssp";

From ed5eb2aed8343e0bd5d635e46514daa9a34a8bde Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Mar 2016 16:10:59 +0100
Subject: [PATCH 191/338] Fix Emacs syntax highlighting in NixOS dovecot
 module.

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

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 333a03315bc..3935c14dc8c 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -254,7 +254,7 @@ in
         ${concatStringsSep "\n" (mapAttrsToList (to: from: ''
           if [ -d '${from}' ]; then
             mkdir '${stateDir}/sieve/${to}'
-            cp ${from}/*.sieve '${stateDir}/sieve/${to}'
+            cp "${from}/"*.sieve '${stateDir}/sieve/${to}'
           else
             cp '${from}' '${stateDir}/sieve/${to}'
           fi

From c5f177cb5d18e6c72338da335e6896b6f72a670e Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Wed, 2 Mar 2016 12:59:42 +0000
Subject: [PATCH 192/338] dnscrypt-proxy: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index ca19c335a1c..b98570a7341 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-proxy-${version}";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "http://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
-    sha256 = "0zfw9vi9qbsc55awncyigqfqp25v5adqk6jpg1jdfkmbqqfykk70";
+    sha256 = "16lif3qhyfjpgg54vjlwpslxk90akmbhlpnn1szxm628bmpw6nl9";
   };
 
   configureFlags = ''

From 7f543c4b611ca3e0226fe42c37c80c10fbeb01d9 Mon Sep 17 00:00:00 2001
From: Kevin Marsh <kevinmarsh3@gmail.com>
Date: Wed, 2 Mar 2016 15:19:23 +0000
Subject: [PATCH 193/338] django: 1.9.2 -> 1.9.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 68deac847db..da2c8cdd181 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7838,12 +7838,12 @@ in modules // {
 
   django_1_9 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.9.2";
+    version = "1.9.3";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz";
-      sha256 = "0bwapyjdl1w62cdv3kx27kj1s5zj93fyby8mhgysapdkxqi368vs";
+      sha256 = "0miv4jb2p4xpcdif0zqimmqw1jypzyq6q5v4m79jc9yyhwj1l685";
     };
 
     # patch only $out/bin to avoid problems with starter templates (see #3134)

From 061c62a38cfd5185671fe5bc609f0144b18e46df Mon Sep 17 00:00:00 2001
From: Kevin Marsh <kevinmarsh3@gmail.com>
Date: Wed, 2 Mar 2016 15:19:49 +0000
Subject: [PATCH 194/338] django: 1.8.9 -> 1.8.10

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da2c8cdd181..12c5b52addb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7862,12 +7862,12 @@ in modules // {
 
   django_1_8 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.8.9";
+    version = "1.8.10";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
-      sha256 = "1qyjpdpsj1n5lx10vak9bwl554br01wbn0kjhy7646i00y2js0gw";
+      sha256 = "08qsgnqq97rg4v80kmbkccr9hm90nw4zh6c46xblk64lnqgb3rfj";
     };
 
     # too complicated to setup

From 5936d6dbbbee3b0fb1933f0cff05470b6365e8e7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 2 Mar 2016 15:24:43 +0000
Subject: [PATCH 195/338] Revert "rubygems: 2.4.8 -> 2.5.2"

This reverts commit 7e8faf022f343901301c912c5f0c7fa1d830a08d.

This breaks the rake call in gitlab see
https://github.com/NixOS/nixpkgs/pull/13468#issuecomment-191286066
---
 pkgs/development/interpreters/ruby/rubygems.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From f442830c55517c73a5e320d2bd892776db4216df Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 2 Mar 2016 18:36:22 +0300
Subject: [PATCH 196/338] libreswan: specify that we don't support parallel
 building

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

diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index 700e6293d42..1a040652ff4 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -64,6 +64,8 @@ stdenv.mkDerivation {
     done
   '';
 
+  enableParallelBuilding = false;
+
   meta = {
     homepage = "https://libreswan.org";
     description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange";

From 50e1e69c0a91004706c15891d6ad8d49a65bb7cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Mar 2016 17:14:49 +0100
Subject: [PATCH 197/338] Remove unmaintained gnupdate script

---
 maintainers/scripts/gnu/gnupdate | 1122 ------------------------------
 1 file changed, 1122 deletions(-)
 delete mode 100755 maintainers/scripts/gnu/gnupdate

diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate
deleted file mode 100755
index 6bb379f4fd2..00000000000
--- a/maintainers/scripts/gnu/gnupdate
+++ /dev/null
@@ -1,1122 +0,0 @@
-#!/bin/sh
-# This is actually -*- mode: scheme; coding: utf-8; -*- text.
-main='(module-ref (resolve-module '\''(gnupdate)) '\'gnupdate')'
-exec ${GUILE-guile} -L "$PWD" -l "$0"    \
-         -c "(apply $main (command-line))" "$@"
-!#
-;;; GNUpdate -- Update GNU packages in Nixpkgs.
-;;; Copyright (C) 2010, 2011  Ludovic Courtès <ludo@gnu.org>
-;;;
-;;; This program is free software: you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation, either version 3 of the License, or
-;;; (at your option) any later version.
-;;;
-;;; This program is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-(cond-expand (guile-2 #t)
-             (else (error "GNU Guile 2.0 is required")))
-
-(define-module (gnupdate)
-  #:use-module (sxml ssax)
-  #:use-module (ice-9 popen)
-  #:use-module (ice-9 match)
-  #:use-module (ice-9 rdelim)
-  #:use-module (ice-9 format)
-  #:use-module (ice-9 regex)
-  #:use-module (ice-9 vlist)
-  #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-9)
-  #:use-module (srfi srfi-11)
-  #:use-module (srfi srfi-26)
-  #:use-module (srfi srfi-37)
-  #:use-module (system foreign)
-  #:use-module (rnrs bytevectors)
-  #:export (gnupdate))
-
-
-;;;
-;;; SNix.
-;;;
-
-(define-record-type <location>
-  (make-location file line column)
-  location?
-  (file          location-file)
-  (line          location-line)
-  (column        location-column))
-
-(define (->loc line column path)
-  (and line column path
-       (make-location path (string->number line) (string->number column))))
-
-;; Nix object types visible in the XML output of `nix-instantiate' and
-;; mapping to S-expressions (we map to sexps, not records, so that we
-;; can do pattern matching):
-;;
-;;   at               (at varpat attrspat)
-;;   attr             (attribute loc name value)
-;;   attrs            (attribute-set attributes)
-;;   attrspat         (attribute-set-pattern patterns)
-;;   bool             #f|#t
-;;   derivation       (derivation drv-path out-path attributes)
-;;   ellipsis         '...
-;;   expr             (snix loc body ...)
-;;   function         (function loc at|attrspat|varpat)
-;;   int              int
-;;   list             list
-;;   null             'null
-;;   path             string
-;;   string           string
-;;   unevaluated      'unevaluated
-;;   varpat           (varpat name)
-;;
-;; Initially ATTRIBUTES in `derivation' and `attribute-set' was a promise;
-;; however, handling `repeated' nodes makes it impossible to do anything
-;; lazily because the whole SXML tree has to be traversed to maintain the
-;; list of known derivations.
-
-(define (xml-element->snix elem attributes body derivations)
-  ;; Return an SNix element corresponding to XML element ELEM.
-
-  (define (loc)
-    (->loc (assq-ref attributes 'line)
-           (assq-ref attributes 'column)
-           (assq-ref attributes 'path)))
-
-  (case elem
-    ((at)
-     (values `(at ,(car body) ,(cadr body)) derivations))
-    ((attr)
-     (let ((name (assq-ref attributes 'name)))
-       (cond ((null? body)
-              (values `(attribute-pattern ,name) derivations))
-             ((and (pair? body) (null? (cdr body)))
-              (values `(attribute ,(loc) ,name ,(car body))
-                      derivations))
-             (else
-              (error "invalid attribute body" name (loc) body)))))
-    ((attrs)
-     (values `(attribute-set ,(reverse body)) derivations))
-    ((attrspat)
-     (values `(attribute-set-pattern ,body) derivations))
-    ((bool)
-     (values (string-ci=? "true" (assq-ref attributes 'value))
-             derivations))
-    ((derivation)
-     (let ((drv-path (assq-ref attributes 'drvPath))
-           (out-path (assq-ref attributes 'outPath)))
-       (if (equal? body '(repeated))
-           (let ((body (vhash-assoc drv-path derivations)))
-             (if (pair? body)
-                 (values `(derivation ,drv-path ,out-path ,(cdr body))
-                         derivations)
-
-                 ;; DRV-PATH hasn't been encountered yet but may be later
-                 ;; (see <http://article.gmane.org/gmane.linux.distributions.nixos/5946>.)
-                 ;; Return an `unresolved' node.
-                 (values `(unresolved
-                           ,(lambda (derivations)
-                              (let ((body (vhash-assoc drv-path derivations)))
-                                (if (pair? body)
-                                    `(derivation ,drv-path ,out-path
-                                                 ,(cdr body))
-                                    (error "no previous occurrence of derivation"
-                                           drv-path)))))
-                         derivations)))
-           (values `(derivation ,drv-path ,out-path ,body)
-                   (vhash-cons drv-path body derivations)))))
-    ((ellipsis)
-     (values '... derivations))
-    ((expr)
-     (values `(snix ,(loc) ,@body) derivations))
-    ((function)
-     (values `(function ,(loc) ,body) derivations))
-    ((int)
-     (values (string->number (assq-ref attributes 'value))
-             derivations))
-    ((list)
-     (values body derivations))
-    ((null)
-     (values 'null derivations))
-    ((path)
-     (values (assq-ref attributes 'value) derivations))
-    ((repeated)
-     (values 'repeated derivations))
-    ((string)
-     (values (assq-ref attributes 'value) derivations))
-    ((unevaluated)
-     (values 'unevaluated derivations))
-    ((varpat)
-     (values `(varpat ,(assq-ref attributes 'name)) derivations))
-    (else (error "unhandled Nix XML element" elem))))
-
-(define (resolve snix derivations)
-  "Return a new SNix tree where `unresolved' nodes from SNIX have been
-replaced by the result of their application to DERIVATIONS, a vhash."
-  (let loop ((node snix)
-             (seen vlist-null))
-    (if (vhash-assq node seen)
-        (values node seen)
-        (match node
-          (('unresolved proc)
-           (let ((n (proc derivations)))
-             (values n seen)))
-          ((tag body ...)
-           (let ((body+seen (fold (lambda (n body+seen)
-                                    (call-with-values
-                                        (lambda ()
-                                          (loop n (cdr body+seen)))
-                                      (lambda (n* seen)
-                                        (cons (cons n* (car body+seen))
-                                              (vhash-consq n #t seen)))))
-                                  (cons '() (vhash-consq node #t seen))
-                                  body)))
-             (values (cons tag (reverse (car body+seen)))
-                     (vhash-consq node #t (cdr body+seen)))))
-          (anything
-           (values anything seen))))))
-
-(define xml->snix
-  ;; Return the SNix represention of TREE, an SXML tree as returned by
-  ;; parsing the XML output of `nix-instantiate' on Nixpkgs.
-  (let ((parse
-         (ssax:make-parser NEW-LEVEL-SEED
-                           (lambda (elem-gi attributes namespaces expected-content
-                                    seed)
-                             (cons '() (cdr seed)))
-
-                           FINISH-ELEMENT
-                           (lambda (elem-gi attributes namespaces parent-seed
-                                            seed)
-                             (let ((snix        (car seed))
-                                   (derivations (cdr seed)))
-                               (let-values (((snix derivations)
-                                             (xml-element->snix elem-gi
-                                                                attributes
-                                                                snix
-                                                                derivations)))
-                                 (cons (cons snix (car parent-seed))
-                                       derivations))))
-
-                           CHAR-DATA-HANDLER
-                           (lambda (string1 string2 seed)
-                             ;; Discard inter-node strings, which are blanks.
-                             seed))))
-    (lambda (port)
-      (match (parse port (cons '() vlist-null))
-        (((snix) . derivations)
-         (resolve snix derivations))))))
-
-(define (call-with-package snix proc)
-  (match snix
-    (('attribute _ (and attribute-name (? string?))
-                 ('derivation _ _ body))
-     ;; Ugly pattern matching.
-     (let ((meta
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "meta" ('attribute-set metas)) metas)
-                     (_ #f)))
-                 body))
-           (package-name
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "name" (and name (? string?)))
-                      name)
-                     (_ #f)))
-                 body))
-           (location
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute loc "name" (? string?))
-                      loc)
-                     (_ #f)))
-                 body))
-           (src
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "src" src)
-                      src)
-                     (_ #f)))
-                 body)))
-       (proc attribute-name package-name location meta src)))))
-
-(define (call-with-src snix proc)
-  ;; Assume SNIX contains the SNix expression for the value of an `src'
-  ;; attribute, as returned by `call-with-package', and call PROC with the
-  ;; relevant SRC information, or #f if SNIX doesn't match.
-  (match snix
-    (('derivation _ _ body)
-     (let ((name
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "name" (and name (? string?)))
-                      name)
-                     (_ #f)))
-                 body))
-           (output-hash
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "outputHash" (and hash (? string?)))
-                      hash)
-                     (_ #f)))
-                 body))
-           (urls
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "urls" (and urls (? pair?)))
-                      urls)
-                     (_ #f)))
-                 body)))
-       (proc name output-hash urls)))
-    (_ (proc #f #f #f))))
-
-(define (src->values snix)
-  (call-with-src snix values))
-
-(define (attribute-value attribute)
-  ;; Return the value of ATTRIBUTE.
-  (match attribute
-    (('attribute _ _ value) value)))
-
-(define (derivation-source derivation)
-  ;; Return the "src" attribute of DERIVATION or #f if not found.
-  (match derivation
-    (('derivation _ _ (attributes ...))
-     (find-attribute-by-name "src" attributes))))
-
-(define (derivation-output-path derivation)
-  ;; Return the output path of DERIVATION.
-  (match derivation
-    (('derivation _ out-path _)
-     out-path)
-    (_ #f)))
-
-(define (source-output-path src)
-  ;; Return the output path of SRC, the "src" attribute of a derivation.
-  (derivation-output-path (attribute-value src)))
-
-(define (derivation-source-output-path derivation)
-  ;; Return the output path of the "src" attribute of DERIVATION or #f if
-  ;; DERIVATION lacks an "src" attribute.
-  (and=> (derivation-source derivation) source-output-path))
-
-(define* (open-nixpkgs nixpkgs #:optional attribute)
-  ;; Return an input pipe to the XML representation of Nixpkgs.  When
-  ;; ATTRIBUTE is true, only that attribute is considered.
-  (let ((script  (string-append nixpkgs
-                                "/maintainers/scripts/eval-release.nix")))
-    (apply open-pipe* OPEN_READ
-           "nix-instantiate" "--strict" "--eval-only" "--xml"
-           `(,@(if attribute
-                   `("-A" ,attribute)
-                   '())
-             ,script))))
-
-(define (pipe-failed? pipe)
-  "Close pipe and return its status if it failed."
-  (let ((status (close-pipe pipe)))
-    (if (or (status:term-sig status)
-            (not (= (status:exit-val status) 0)))
-        status
-        #f)))
-
-(define (memoize proc)
-  "Return a memoizing version of PROC."
-  (let ((cache (make-hash-table)))
-    (lambda args
-      (let ((results (hash-ref cache args)))
-        (if results
-            (apply values results)
-            (let ((results (call-with-values (lambda ()
-                                               (apply proc args))
-                             list)))
-              (hash-set! cache args results)
-              (apply values results)))))))
-
-(define nix-prefetch-url
-  (memoize
-   (lambda (url)
-     "Download URL in the Nix store and return the base32-encoded SHA256 hash of
-the file at URL."
-     (let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url))
-            (hash (read-line pipe)))
-       (if (or (pipe-failed? pipe)
-               (eof-object? hash))
-           (values #f #f)
-           (let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path"
-                                    "sha256" hash (basename url)))
-                  (path (read-line pipe)))
-             (if (or (pipe-failed? pipe)
-                     (eof-object? path))
-                 (values #f #f)
-                 (values (string-trim-both hash) (string-trim-both path)))))))))
-
-(define (update-nix-expression file
-                               old-version old-hash
-                               new-version new-hash)
-  ;; Modify FILE in-place.  Ugly: we call out to sed(1).
-  (let ((cmd (format #f "sed -i \"~a\" -e 's/~A/~a/g ; s/~A/~A/g'"
-                     file
-                     (regexp-quote old-version) new-version
-                     old-hash
-                     (or new-hash "new hash not available, check the log"))))
-    (format #t "running `~A'...~%" cmd)
-    (system cmd)))
-
-(define (find-attribute-by-name name attributes)
-  ;; Return attribute NAME in ATTRIBUTES, a list of SNix attributes, or #f if
-  ;; NAME cannot be found.
-  (find (lambda (a)
-          (match a
-            (('attribute _ (? (cut string=? <> name)) _)
-             a)
-            (_ #f)))
-        attributes))
-
-(define (find-package-by-attribute-name name packages)
-  ;; Return the package bound to attribute NAME in PACKAGES, a list of
-  ;; packages (SNix attributes), or #f if NAME cannot be found.
-  (find (lambda (package)
-          (match package
-            (('attribute _ (? (cut string=? <> name))
-                         ('derivation _ _ _))
-             package)
-            (_ #f)))
-        packages))
-
-(define (stdenv-package packages)
-  ;; Return the `stdenv' package from PACKAGES, a list of SNix attributes.
-  (find-package-by-attribute-name "stdenv" packages))
-
-(define (package-requisites package)
-  ;; Return the list of derivations required to build PACKAGE (including that
-  ;; of PACKAGE) by recurring into its derivation attributes.
-  (let loop ((snix   package)
-             (result '()))
-    (match snix
-      (('attribute _ _ body)
-       (loop body result))
-      (('derivation _ out-path body)
-       (if (any (lambda (d)
-                  (match d
-                    (('derivation _ (? (cut string=? out-path <>)) _) #t)
-                    (_ #f)))
-                result)
-           result
-           (loop body (cons snix result))))
-      ((things ...)
-       (fold loop result things))
-      (_ result))))
-
-(define (package-source-output-path package)
-  ;; Return the output path of the "src" derivation of PACKAGE.
-  (derivation-source-output-path (attribute-value package)))
-
-
-;;;
-;;; GnuPG interface.
-;;;
-
-(define %gpg-command "gpg2")
-(define %openpgp-key-server "keys.gnupg.net")
-
-(define (gnupg-verify sig file)
-  "Verify signature SIG for FILE.  Return a status s-exp if GnuPG failed."
-
-  (define (status-line->sexp line)
-    ;; See file `doc/DETAILS' in GnuPG.
-    (define sigid-rx
-      (make-regexp
-       "^\\[GNUPG:\\] SIG_ID ([A-Za-z0-9/]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+)"))
-    (define goodsig-rx
-      (make-regexp "^\\[GNUPG:\\] GOODSIG ([[:xdigit:]]+) (.+)$"))
-    (define validsig-rx
-      (make-regexp
-       "^\\[GNUPG:\\] VALIDSIG ([[:xdigit:]]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+) .*$"))
-    (define expkeysig-rx                    ; good signature, but expired key
-      (make-regexp "^\\[GNUPG:\\] EXPKEYSIG ([[:xdigit:]]+) (.*)$"))
-    (define errsig-rx
-      (make-regexp
-       "^\\[GNUPG:\\] ERRSIG ([[:xdigit:]]+) ([^ ]+) ([^ ]+) ([^ ]+) ([[:digit:]]+) ([[:digit:]]+)"))
-
-    (cond ((regexp-exec sigid-rx line)
-           =>
-           (lambda (match)
-             `(signature-id ,(match:substring match 1) ; sig id
-                            ,(match:substring match 2) ; date
-                            ,(string->number           ; timestamp
-                              (match:substring match 3)))))
-          ((regexp-exec goodsig-rx line)
-           =>
-           (lambda (match)
-             `(good-signature ,(match:substring match 1)    ; key id
-                              ,(match:substring match 2)))) ; user name
-          ((regexp-exec validsig-rx line)
-           =>
-           (lambda (match)
-             `(valid-signature ,(match:substring match 1) ; fingerprint
-                               ,(match:substring match 2) ; sig creation date
-                               ,(string->number           ; timestamp
-                                 (match:substring match 3)))))
-          ((regexp-exec expkeysig-rx line)
-           =>
-           (lambda (match)
-             `(expired-key-signature ,(match:substring match 1) ; fingerprint
-                                     ,(match:substring match 2)))) ; user name
-          ((regexp-exec errsig-rx line)
-           =>
-           (lambda (match)
-             `(signature-error ,(match:substring match 1) ; key id or fingerprint
-                               ,(match:substring match 2) ; pubkey algo
-                               ,(match:substring match 3) ; hash algo
-                               ,(match:substring match 4) ; sig class
-                               ,(string->number           ; timestamp
-                                 (match:substring match 5))
-                               ,(let ((rc
-                                       (string->number ; return code
-                                        (match:substring match 6))))
-                                  (case rc
-                                    ((9) 'missing-key)
-                                    ((4) 'unknown-algorithm)
-                                    (else rc))))))
-          (else
-           `(unparsed-line ,line))))
-
-  (define (parse-status input)
-    (let loop ((line   (read-line input))
-               (result '()))
-      (if (eof-object? line)
-          (reverse result)
-          (loop (read-line input)
-                (cons (status-line->sexp line) result)))))
-
-  (let* ((pipe   (open-pipe* OPEN_READ %gpg-command "--status-fd=1"
-                             "--verify" sig file))
-         (status (parse-status pipe)))
-    ;; Ignore PIPE's exit status since STATUS above should contain all the
-    ;; info we need.
-    (close-pipe pipe)
-    status))
-
-(define (gnupg-status-good-signature? status)
-  "If STATUS, as returned by `gnupg-verify', denotes a good signature, return
-a key-id/user pair; return #f otherwise."
-  (any (lambda (sexp)
-         (match sexp
-           (((or 'good-signature 'expired-key-signature) key-id user)
-            (cons key-id user))
-           (_ #f)))
-       status))
-
-(define (gnupg-status-missing-key? status)
-  "If STATUS denotes a missing-key error, then return the key-id of the
-missing key."
-  (any (lambda (sexp)
-         (match sexp
-           (('signature-error key-id _ ...)
-            key-id)
-           (_ #f)))
-       status))
-
-(define (gnupg-receive-keys key-id)
-  (system* %gpg-command "--keyserver" %openpgp-key-server "--recv-keys" key-id))
-
-(define (gnupg-verify* sig file)
-  "Like `gnupg-verify', but try downloading the public key if it's missing.
-Return #t if the signature was good, #f otherwise."
-  (let ((status (gnupg-verify sig file)))
-    (or (gnupg-status-good-signature? status)
-        (let ((missing (gnupg-status-missing-key? status)))
-          (and missing
-               (begin
-                 ;; Download the missing key and try again.
-                 (gnupg-receive-keys missing)
-                 (gnupg-status-good-signature? (gnupg-verify sig file))))))))
-
-
-;;;
-;;; FTP client.
-;;;
-
-(define-record-type <ftp-connection>
-  (%make-ftp-connection socket addrinfo)
-  ftp-connection?
-  (socket    ftp-connection-socket)
-  (addrinfo  ftp-connection-addrinfo))
-
-(define %ftp-ready-rx
-  (make-regexp "^([0-9]{3}) (.+)$"))
-
-(define (%ftp-listen port)
-  (let loop ((line (read-line port)))
-    (cond ((eof-object? line) (values line #f))
-          ((regexp-exec %ftp-ready-rx line)
-           =>
-           (lambda (match)
-             (values (string->number (match:substring match 1))
-                     (match:substring match 2))))
-          (else
-           (loop (read-line port))))))
-
-(define (%ftp-command command expected-code port)
-  (format port "~A~A~A" command (string #\return) (string #\newline))
-  (let-values (((code message) (%ftp-listen port)))
-    (if (eqv? code expected-code)
-        message
-        (throw 'ftp-error port command code message))))
-
-(define (%ftp-login user pass port)
-  (let ((command (string-append "USER " user (string #\newline))))
-    (display command port)
-    (let-values (((code message) (%ftp-listen port)))
-      (case code
-        ((230)  #t)
-        ((331) (%ftp-command (string-append "PASS " pass) 230 port))
-        (else  (throw 'ftp-error port command code message))))))
-
-(define (ftp-open host)
-  (catch 'getaddrinfo-error
-    (lambda ()
-      (let* ((ai (car (getaddrinfo host "ftp")))
-             (s  (socket (addrinfo:fam ai) (addrinfo:socktype ai)
-                         (addrinfo:protocol ai))))
-        (connect s (addrinfo:addr ai))
-        (setvbuf s _IOLBF)
-        (let-values (((code message) (%ftp-listen s)))
-          (if (eqv? code 220)
-              (begin
-                ;(%ftp-command "OPTS UTF8 ON" 200 s)
-                (%ftp-login "anonymous" "ludo@example.com" s)
-                (%make-ftp-connection s ai))
-              (begin
-                (format (current-error-port) "FTP to `~a' failed: ~A: ~A~%"
-                        host code message)
-                (close s)
-                #f)))))
-    (lambda (key errcode)
-      (format (current-error-port) "failed to resolve `~a': ~a~%"
-              host (gai-strerror errcode))
-      #f)))
-
-(define (ftp-close conn)
-  (close (ftp-connection-socket conn)))
-
-(define (ftp-chdir conn dir)
-  (%ftp-command (string-append "CWD " dir) 250
-                (ftp-connection-socket conn)))
-
-(define (ftp-pasv conn)
-  (define %pasv-rx
-    (make-regexp "([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+)"))
-
-  (let ((message (%ftp-command "PASV" 227 (ftp-connection-socket conn))))
-    (cond ((regexp-exec %pasv-rx message)
-           =>
-           (lambda (match)
-             (+ (* (string->number (match:substring match 5)) 256)
-                (string->number (match:substring match 6)))))
-          (else
-           (throw 'ftp-error conn "PASV" 227 message)))))
-
-
-(define* (ftp-list conn #:optional directory)
-  (define (address-with-port sa port)
-    (let ((fam  (sockaddr:fam sa))
-          (addr (sockaddr:addr sa)))
-      (cond ((= fam AF_INET)
-             (make-socket-address fam addr port))
-            ((= fam AF_INET6)
-             (make-socket-address fam addr port
-                                  (sockaddr:flowinfo sa)
-                                  (sockaddr:scopeid sa)))
-            (else #f))))
-
-  (if directory
-      (ftp-chdir conn directory))
-
-  (let* ((port (ftp-pasv conn))
-         (ai   (ftp-connection-addrinfo conn))
-         (s    (socket (addrinfo:fam ai) (addrinfo:socktype ai)
-                       (addrinfo:protocol ai))))
-    (connect s (address-with-port (addrinfo:addr ai) port))
-    (setvbuf s _IOLBF)
-
-    (dynamic-wind
-      (lambda () #t)
-      (lambda ()
-        (%ftp-command "LIST" 150 (ftp-connection-socket conn))
-
-        (let loop ((line   (read-line s))
-                   (result '()))
-          (cond ((eof-object? line) (reverse result))
-                ((regexp-exec %ftp-ready-rx line)
-                 =>
-                 (lambda (match)
-                   (let ((code (string->number (match:substring match 1))))
-                     (if (= 126 code)
-                         (reverse result)
-                         (throw 'ftp-error conn "LIST" code)))))
-                (else
-                 (loop (read-line s)
-                       (match (reverse (string-tokenize line))
-                         ((file _ ... permissions)
-                          (let ((type (case (string-ref permissions 0)
-                                        ((#\d) 'directory)
-                                        (else 'file))))
-                            (cons (list file type) result)))
-                         ((file _ ...)
-                          (cons (cons file 'file) result))))))))
-      (lambda ()
-        (close s)
-        (let-values (((code message) (%ftp-listen (ftp-connection-socket conn))))
-          (or (eqv? code 226)
-              (throw 'ftp-error conn "LIST" code message)))))))
-
-
-;;;
-;;; GNU.
-;;;
-
-(define %ignored-package-attributes
-  ;; Attribute name of packages to be ignored.
-  '("bash" "bashReal" "bashInteractive" ;; the full versioned name is incorrect
-    "autoconf213"
-    "automake17x"
-    "automake19x"
-    "automake110x"
-    "bison1875"
-    "bison23"
-    "bison24"
-    "bison" ;; = 2.4
-    "ccrtp_1_8"
-    "emacs22"
-    "emacsSnapshot"
-    "gcc295"
-    "gcc33"
-    "gcc34"
-    "gcc40"
-    "gcc41"
-    "gcc42"
-    "gcc43"
-    "gcc44"
-    "gcc45"
-    "gcc45_real"
-    "gcc45_realCross"
-    "gfortran45"
-    "gcj45"
-    "gcc46"
-    "gcc46_real"
-    "gcc46_realCross"
-    "gfortran46"
-    "gcj46"
-    "glibc25"
-    "glibc27"
-    "glibc29"
-    "guile_1_8"
-    "icecat3"
-    "icecat3Xul" ;; redundant with `icecat'
-    "icecatWrapper"
-    "icecat3Wrapper"
-    "icecatXulrunner3"
-    "libzrtpcpp_1_6"
-    "parted_2_3"
-    ))
-
-(define (gnu? package)
-  ;; Return true if PACKAGE (a snix expression) is a GNU package (according
-  ;; to a simple heuristic.)  Otherwise return #f.
-  (match package
-    (('attribute _ _ ('derivation _ _ body))
-     (any (lambda (attr)
-            (match attr
-              (('attribute _ "meta" ('attribute-set metas))
-               (any (lambda (attr)
-                      (match attr
-                        (('attribute _ "description" value)
-                         (string-prefix? "GNU" value))
-                        (('attribute _ "homepage" (? string? value))
-                         (or (string-contains value "gnu.org")
-                             (string-contains value "gnupg.org")))
-                        (('attribute _ "homepage" ((? string? value) ...))
-                         (any (cut string-contains <> "www.gnu.org") value))
-                        (_ #f)))
-                    metas))
-              (_ #f)))
-          body))
-    (_ #f)))
-
-(define (gnu-packages packages)
-  (fold (lambda (package gnu)
-          (match package
-            (('attribute _ "emacs23Packages" emacs-packages)
-             ;; XXX: Should prepend `emacs23Packages.' to attribute names.
-             (append (gnu-packages emacs-packages) gnu))
-            (('attribute _ attribute-name ('derivation _ _ body))
-             (if (member attribute-name %ignored-package-attributes)
-                 gnu
-                 (if (gnu? package)
-                     (cons package gnu)
-                     gnu)))
-            (_ gnu)))
-        '()
-        packages))
-
-(define (ftp-server/directory project)
-  (define quirks
-    '(("commoncpp2"   "ftp.gnu.org"   "/gnu/commoncpp" #f)
-      ("ucommon"      "ftp.gnu.org"   "/gnu/commoncpp" #f)
-      ("libzrtpcpp"   "ftp.gnu.org"   "/gnu/ccrtp" #f)
-      ("libosip2"     "ftp.gnu.org"   "/gnu/osip" #f)
-      ("libgcrypt"    "ftp.gnupg.org" "/gcrypt" #t)
-      ("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t)
-      ("libassuan"    "ftp.gnupg.org" "/gcrypt" #t)
-      ("freefont-ttf" "ftp.gnu.org"   "/gnu/freefont" #f)
-      ("gnupg"        "ftp.gnupg.org" "/gcrypt" #t)
-      ("gnu-ghostscript" "ftp.gnu.org"  "/gnu/ghostscript" #f)
-      ("mit-scheme"   "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg" #f)
-      ("icecat"       "ftp.gnu.org" "/gnu/gnuzilla" #f)
-      ("source-highlight" "ftp.gnu.org" "/gnu/src-highlite" #f)
-      ("TeXmacs"      "ftp.texmacs.org" "/TeXmacs/targz" #f)))
-
-  (let ((quirk (assoc project quirks)))
-    (match quirk
-      ((_ server directory subdir?)
-       (values server (if (not subdir?)
-                          directory
-                          (string-append directory "/" project))))
-      (_
-       (values "ftp.gnu.org" (string-append "/gnu/" project))))))
-
-(define (nixpkgs->gnu-name project)
-  (define quirks
-    '(("gcc-wrapper" . "gcc")
-      ("ghostscript" . "gnu-ghostscript") ;; ../ghostscript/gnu-ghoscript-X.Y.tar.gz
-      ("gnum4"       . "m4")
-      ("gnugrep"     . "grep")
-      ("gnumake"     . "make")
-      ("gnused"      . "sed")
-      ("gnutar"      . "tar")
-      ("mitscheme"   . "mit-scheme")
-      ("texmacs"     . "TeXmacs")))
-
-  (or (assoc-ref quirks project) project))
-
-(define (releases project)
-  "Return the list of releases of PROJECT as a list of release name/directory
-pairs.  Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). "
-  ;; TODO: Parse something like fencepost.gnu.org:/gd/gnuorg/packages-ftp.
-  (define release-rx
-    (make-regexp (string-append "^" project
-                                "-([0-9]|[^-])*(-src)?\\.tar\\.")))
-
-  (define alpha-rx
-    (make-regexp "^.*-.*[0-9](-|~)?(alpha|beta|rc|cvs|svn|git)-?[0-9\\.]*\\.tar\\."))
-
-  (define (sans-extension tarball)
-    (let ((end (string-contains tarball ".tar")))
-      (substring tarball 0 end)))
-
-  (catch 'ftp-error
-    (lambda ()
-      (let-values (((server directory) (ftp-server/directory project)))
-        (define conn (ftp-open server))
-
-        (let loop ((directories (list directory))
-                   (result      '()))
-          (if (null? directories)
-              (begin
-                (ftp-close conn)
-                result)
-              (let* ((directory (car directories))
-                     (files     (ftp-list conn directory))
-                     (subdirs   (filter-map (lambda (file)
-                                              (match file
-                                                ((name 'directory . _) name)
-                                                (_ #f)))
-                                            files)))
-                (loop (append (map (cut string-append directory "/" <>)
-                                   subdirs)
-                              (cdr directories))
-                      (append
-                       ;; Filter out signatures, deltas, and files which are potentially
-                       ;; not releases of PROJECT (e.g., in /gnu/guile, filter out
-                       ;; guile-oops and guile-www; in mit-scheme, filter out
-                       ;; binaries).
-                       (filter-map (lambda (file)
-                                     (match file
-                                       ((file 'file . _)
-                                        (and (not (string-suffix? ".sig" file))
-                                             (regexp-exec release-rx file)
-                                             (not (regexp-exec alpha-rx file))
-                                             (let ((s (sans-extension file)))
-                                               (and (regexp-exec
-                                                     %package-name-rx s)
-                                                    (cons s directory)))))
-                                       (_ #f)))
-                                   files)
-                       result)))))))
-    (lambda (key subr message . args)
-      (format (current-error-port)
-              "failed to get release list for `~A': ~S ~S~%"
-              project message args)
-      '())))
-
-(define version-string>?
-  (let ((strverscmp
-         (let ((sym (or (dynamic-func "strverscmp" (dynamic-link))
-                        (error "could not find `strverscmp' (from GNU libc)"))))
-           (pointer->procedure int sym (list '* '*)))))
-    (lambda (a b)
-      (> (strverscmp (string->pointer a) (string->pointer b)) 0))))
-
-(define (latest-release project)
-  "Return (\"FOO-X.Y\" . \"/bar/foo\") or #f."
-  (let ((releases (releases project)))
-    (and (not (null? releases))
-         (fold (lambda (release latest)
-                 (if (version-string>? (car release) (car latest))
-                     release
-                     latest))
-               '("" . "")
-               releases))))
-
-(define %package-name-rx
-  ;; Regexp for a package name, e.g., "foo-X.Y".  Since TeXmacs uses
-  ;; "TeXmacs-X.Y-src", the `-src' suffix is allowed.
-  (make-regexp "^(.*)-(([0-9]|\\.)+)(-src)?"))
-
-(define (package/version name+version)
-  "Return the package name and version number extracted from NAME+VERSION."
-  (let ((match (regexp-exec %package-name-rx name+version)))
-    (if (not match)
-        (values name+version #f)
-        (values (match:substring match 1) (match:substring match 2)))))
-
-(define (file-extension file)
-  (let ((dot (string-rindex file #\.)))
-    (and dot (substring file (+ 1 dot) (string-length file)))))
-
-(define (packages-to-update gnu-packages)
-  (define (unpack latest)
-    (call-with-values (lambda ()
-                        (package/version (car latest)))
-      (lambda (name version)
-        (list name version (cdr latest)))))
-
-  (fold (lambda (pkg result)
-          (call-with-package pkg
-            (lambda (attribute name+version location meta src)
-              (let-values (((name old-version)
-                            (package/version name+version)))
-                (let ((latest (latest-release (nixpkgs->gnu-name name))))
-                  (if (not latest)
-                      (begin
-                        (format #t "~A [unknown latest version]~%"
-                                name+version)
-                        result)
-                      (match (unpack latest)
-                        ((_ (? (cut string=? old-version <>)) _)
-                         (format #t "~A [up to date]~%" name+version)
-                         result)
-                        ((project new-version directory)
-                         (let-values (((old-name old-hash old-urls)
-                                       (src->values src)))
-                           (format #t "~A -> ~A [~A]~%"
-                                   name+version (car latest)
-                                   (and (pair? old-urls) (car old-urls)))
-                           (let* ((url      (and (pair? old-urls)
-                                                 (car old-urls)))
-                                  (new-hash (fetch-gnu project directory
-                                                       new-version
-                                                       (if url
-                                                           (file-extension url)
-                                                           "gz"))))
-                             (cons (list name attribute
-                                         old-version old-hash
-                                         new-version new-hash
-                                         location)
-                                   result)))))))))))
-        '()
-        gnu-packages))
-
-(define (fetch-gnu project directory version archive-type)
-  "Download PROJECT's tarball over FTP."
-  (let* ((server  (ftp-server/directory project))
-         (base    (string-append project "-" version ".tar." archive-type))
-         (url     (string-append "ftp://" server "/" directory "/" base))
-         (sig     (string-append base ".sig"))
-         (sig-url (string-append url ".sig")))
-    (let-values (((hash path) (nix-prefetch-url url)))
-      (pk 'prefetch-url url hash path)
-      (and hash path
-           (begin
-             (false-if-exception (delete-file sig))
-             (system* "wget" sig-url)
-             (if (file-exists? sig)
-                 (let ((ret (gnupg-verify* sig path)))
-                   (false-if-exception (delete-file sig))
-                   (if ret
-                       hash
-                       (begin
-                         (format (current-error-port)
-                                 "signature verification failed for `~a'~%"
-                                 base)
-                         (format (current-error-port)
-                                 "(could be because the public key is not in your keyring)~%")
-                         #f)))
-                 (begin
-                   (format (current-error-port)
-                           "no signature for `~a'~%" base)
-                   hash)))))))
-
-
-;;;
-;;; Main program.
-;;;
-
-(define %options
-  ;; Specifications of the command-line options.
-  (list (option '(#\h "help") #f #f
-                (lambda (opt name arg result)
-                  (format #t "Usage: gnupdate [OPTIONS...]~%")
-                  (format #t "GNUpdate -- update Nix expressions of GNU packages in Nixpkgs~%")
-                  (format #t "~%")
-                  (format #t "  -x, --xml=FILE      Read XML output of `nix-instantiate'~%")
-                  (format #t "                      from FILE.~%")
-                  (format #t "  -A, --attribute=ATTR~%")
-                  (format #t "                      Update only the package pointed to by attribute~%")
-                  (format #t "                      ATTR.~%")
-                  (format #t "  -s, --select=SET    Update only packages from SET, which may~%")
-                  (format #t "                      be either `all', `stdenv', or `non-stdenv'.~%")
-                  (format #t "  -d, --dry-run       Don't actually update Nix expressions~%")
-                  (format #t "  -h, --help          Give this help list.~%~%")
-                  (format #t "Report bugs to <ludo@gnu.org>~%")
-                  (exit 0)))
-        (option '(#\A "attribute") #t #f
-                (lambda (opt name arg result)
-                  (alist-cons 'attribute arg result)))
-        (option '(#\s "select") #t #f
-                (lambda (opt name arg result)
-                  (cond ((string-ci=? arg "stdenv")
-                         (alist-cons 'filter 'stdenv result))
-                        ((string-ci=? arg "non-stdenv")
-                         (alist-cons 'filter 'non-stdenv result))
-                        ((string-ci=? arg "all")
-                         (alist-cons 'filter #f result))
-                        (else
-                         (format (current-error-port)
-                                 "~A: unrecognized selection type~%"
-                                 arg)
-                         (exit 1)))))
-
-        (option '(#\d "dry-run") #f #f
-                (lambda (opt name arg result)
-                  (alist-cons 'dry-run #t result)))
-
-        (option '(#\x "xml") #t #f
-                (lambda (opt name arg result)
-                  (alist-cons 'xml-file arg result)))))
-
-(define (gnupdate . args)
-  ;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs.
-
-  (define (nixpkgs->snix xml-file attribute)
-    (format (current-error-port) "evaluating Nixpkgs...~%")
-    (let* ((home (getenv "HOME"))
-           (xml  (if xml-file
-                     (open-input-file xml-file)
-                     (open-nixpkgs (or (getenv "NIXPKGS")
-                                       (string-append home "/src/nixpkgs"))
-                                   attribute)))
-           (snix (xml->snix xml)))
-      (if (not xml-file)
-          (let ((status (pipe-failed? xml)))
-            (if status
-                (begin
-                  (format (current-error-port) "`nix-instantiate' failed: ~A~%"
-                          status)
-                  (exit 1)))))
-
-      ;; If we asked for a specific attribute, rewrap the thing in an
-      ;; attribute set to match the expectations of `packages-to-update' & co.
-      (if attribute
-          (match snix
-            (('snix loc ('derivation args ...))
-             `(snix ,loc
-                    (attribute-set
-                     ((attribute #f ,attribute
-                                 (derivation ,@args)))))))
-          snix)))
-
-  (define (selected-gnu-packages packages stdenv selection)
-    ;; Return the subset of PACKAGES that are/aren't in STDENV, according to
-    ;; SELECTION.  To do that reliably, we check whether their "src"
-    ;; derivation is a requisite of STDENV.
-    (define gnu
-      (gnu-packages packages))
-
-    (case selection
-      ((stdenv)
-       (filter (lambda (p)
-                 (member (package-source-output-path p)
-                         (force stdenv)))
-               gnu))
-      ((non-stdenv)
-       (filter (lambda (p)
-                 (not (member (package-source-output-path p)
-                              (force stdenv))))
-               gnu))
-      (else gnu)))
-
-  (let* ((opts      (args-fold (cdr args) %options
-                               (lambda (opt name arg result)
-                                 (error "unrecognized option `~A'" name))
-                               (lambda (operand result)
-                                 (error "extraneous argument `~A'" operand))
-                               '()))
-         (snix      (nixpkgs->snix (assq-ref opts 'xml-file)
-                                   (assq-ref opts 'attribute)))
-         (packages  (match snix
-                      (('snix _ ('attribute-set attributes))
-                       attributes)
-                      (_ #f)))
-         (stdenv    (delay
-                      ;; The source tarballs that make up stdenv.
-                      (filter-map derivation-source-output-path
-                                  (package-requisites (stdenv-package packages)))))
-         (attribute (assq-ref opts 'attribute))
-         (selection (assq-ref opts 'filter))
-         (to-update (if attribute
-                        packages                  ; already a subset
-                        (selected-gnu-packages packages stdenv selection)))
-         (updates   (packages-to-update to-update)))
-
-    (format #t "~%~A packages to update...~%" (length updates))
-    (for-each (lambda (update)
-                (match update
-                  ((name attribute
-                    old-version old-hash
-                    new-version new-hash
-                    location)
-                   (if (assoc-ref opts 'dry-run)
-                       (format #t "`~a' would be updated from ~a to ~a (~a -> ~a)~%"
-                               name old-version new-version
-                               old-hash new-hash)
-                       (update-nix-expression (location-file location)
-                                              old-version old-hash
-                                              new-version new-hash)))
-                  (_ #f)))
-              updates)
-    #t))
-
-;;; Local Variables:
-;;; eval: (put 'call-with-package 'scheme-indent-function 1)
-;;; End:

From b1031dea94709cf90e88739ea12911e87135629c Mon Sep 17 00:00:00 2001
From: David Keijser <david.keijser@klarna.com>
Date: Wed, 2 Mar 2016 17:25:06 +0100
Subject: [PATCH 198/338] logrus: 0.8.6 -> 0.9.0

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ddf18dd3b8f..1f10b8f9038 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2102,10 +2102,10 @@ let
   };
 
   logrus = buildFromGitHub rec {
-    rev = "v0.8.6";
+    rev = "v0.9.0";
     owner = "Sirupsen";
     repo = "logrus";
-    sha256 = "1v2qcjy6w24jgdm7kk0f8lqpa25qxzll2x6ycqwidd3pzjhrkifa";
+    sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4";
     propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ];
   };
 

From d72e93f59dc12a3753454427608c8df02d2b8e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Mar 2016 16:54:30 +0000
Subject: [PATCH 199/338] remove lvm_33, fixes #12310

---
 .../compilers/llvm/3.3/clang-purity.patch     | 162 ------------------
 .../llvm/3.3/clang-tablegen-dir.patch         |   9 -
 pkgs/development/compilers/llvm/3.3/clang.nix |  45 -----
 pkgs/development/compilers/llvm/3.3/llvm.nix  |  63 -------
 .../llvm/3.3/more-memory-for-bugpoint.patch   |  15 --
 .../compilers/llvm/3.3/no-rule-aarch64.patch  |   8 -
 pkgs/top-level/all-packages.nix               |   3 -
 7 files changed, 305 deletions(-)
 delete mode 100644 pkgs/development/compilers/llvm/3.3/clang-purity.patch
 delete mode 100644 pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch
 delete mode 100644 pkgs/development/compilers/llvm/3.3/clang.nix
 delete mode 100644 pkgs/development/compilers/llvm/3.3/llvm.nix
 delete mode 100644 pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
 delete mode 100644 pkgs/development/compilers/llvm/3.3/no-rule-aarch64.patch

diff --git a/pkgs/development/compilers/llvm/3.3/clang-purity.patch b/pkgs/development/compilers/llvm/3.3/clang-purity.patch
deleted file mode 100644
index e82305189e8..00000000000
--- a/pkgs/development/compilers/llvm/3.3/clang-purity.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -Naur cfe-3.3.src-orig/lib/Driver/ToolChains.cpp cfe-3.3.src/lib/Driver/ToolChains.cpp
---- cfe-3.3.src-orig/lib/Driver/ToolChains.cpp	2013-05-06 12:26:41.000000000 -0400
-+++ cfe-3.3.src/lib/Driver/ToolChains.cpp	2013-06-21 19:28:12.120364372 -0400
-@@ -2318,17 +2318,6 @@
-                       Paths);
-     }
-   }
--  addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
--  addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
--  addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
--  addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
--
--  // Try walking via the GCC triple path in case of multiarch GCC
--  // installations with strange symlinks.
--  if (GCCInstallation.isValid())
--    addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
--                    "/../../" + Multilib, Paths);
--
-   // Add the non-multilib suffixed paths (if potentially different).
-   if (GCCInstallation.isValid()) {
-     const std::string &LibPath = GCCInstallation.getParentLibPath();
-@@ -2341,8 +2330,6 @@
-       addPathIfExists(LibPath, Paths);
-     }
-   }
--  addPathIfExists(SysRoot + "/lib", Paths);
--  addPathIfExists(SysRoot + "/usr/lib", Paths);
- 
-   IsPIEDefault = SanitizerArgs(*this, Args).hasZeroBaseShadow();
- }
-@@ -2395,9 +2382,6 @@
-   if (DriverArgs.hasArg(options::OPT_nostdinc))
-     return;
- 
--  if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
--    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
--
-   if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
-     llvm::sys::Path P(D.ResourceDir);
-     P.appendComponent("include");
-@@ -2479,26 +2463,6 @@
-     "/usr/include/powerpc64-linux-gnu"
-   };
-   ArrayRef<StringRef> MultiarchIncludeDirs;
--  if (getTriple().getArch() == llvm::Triple::x86_64) {
--    MultiarchIncludeDirs = X86_64MultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::x86) {
--    MultiarchIncludeDirs = X86MultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::aarch64) {
--    MultiarchIncludeDirs = AArch64MultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::arm) {
--    if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
--      MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs;
--    else
--      MultiarchIncludeDirs = ARMMultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::mips) {
--    MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::mipsel) {
--    MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::ppc) {
--    MultiarchIncludeDirs = PPCMultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::ppc64) {
--    MultiarchIncludeDirs = PPC64MultiarchIncludeDirs;
--  }
-   for (ArrayRef<StringRef>::iterator I = MultiarchIncludeDirs.begin(),
-                                      E = MultiarchIncludeDirs.end();
-        I != E; ++I) {
-@@ -2510,13 +2474,6 @@
- 
-   if (getTriple().getOS() == llvm::Triple::RTEMS)
-     return;
--
--  // Add an include of '/include' directly. This isn't provided by default by
--  // system GCCs, but is often used with cross-compiling GCCs, and harmless to
--  // add even when Clang is acting as-if it were a system compiler.
--  addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include");
--
--  addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
- }
- 
- /// \brief Helper to add the three variant paths for a libstdc++ installation.
-diff -Naur cfe-3.3.src-orig/lib/Driver/Tools.cpp cfe-3.3.src/lib/Driver/Tools.cpp
---- cfe-3.3.src-orig/lib/Driver/Tools.cpp	2013-05-30 14:01:30.000000000 -0400
-+++ cfe-3.3.src/lib/Driver/Tools.cpp	2013-06-21 19:30:51.604726574 -0400
-@@ -5976,43 +5976,6 @@
-     }
-   }
- 
--  if (ToolChain.getArch() == llvm::Triple::arm ||
--      ToolChain.getArch() == llvm::Triple::thumb ||
--      (!Args.hasArg(options::OPT_static) &&
--       !Args.hasArg(options::OPT_shared))) {
--    CmdArgs.push_back("-dynamic-linker");
--    if (isAndroid)
--      CmdArgs.push_back("/system/bin/linker");
--    else if (ToolChain.getArch() == llvm::Triple::x86)
--      CmdArgs.push_back("/lib/ld-linux.so.2");
--    else if (ToolChain.getArch() == llvm::Triple::aarch64)
--      CmdArgs.push_back("/lib/ld-linux-aarch64.so.1");
--    else if (ToolChain.getArch() == llvm::Triple::arm ||
--             ToolChain.getArch() == llvm::Triple::thumb) {
--      if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
--        CmdArgs.push_back("/lib/ld-linux-armhf.so.3");
--      else
--        CmdArgs.push_back("/lib/ld-linux.so.3");
--    }
--    else if (ToolChain.getArch() == llvm::Triple::mips ||
--             ToolChain.getArch() == llvm::Triple::mipsel)
--      CmdArgs.push_back("/lib/ld.so.1");
--    else if (ToolChain.getArch() == llvm::Triple::mips64 ||
--             ToolChain.getArch() == llvm::Triple::mips64el) {
--      if (hasMipsN32ABIArg(Args))
--        CmdArgs.push_back("/lib32/ld.so.1");
--      else
--        CmdArgs.push_back("/lib64/ld.so.1");
--    }
--    else if (ToolChain.getArch() == llvm::Triple::ppc)
--      CmdArgs.push_back("/lib/ld.so.1");
--    else if (ToolChain.getArch() == llvm::Triple::ppc64 ||
--	     ToolChain.getArch() == llvm::Triple::systemz)
--      CmdArgs.push_back("/lib64/ld64.so.1");
--    else
--      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
--  }
--
-   CmdArgs.push_back("-o");
-   CmdArgs.push_back(Output.getFilename());
- 
-diff -Naur cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp
---- cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp	2013-04-29 21:21:43.000000000 -0400
-+++ cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp	2013-06-21 19:32:47.627016565 -0400
-@@ -225,20 +225,6 @@
-                                             const HeaderSearchOptions &HSOpts) {
-   llvm::Triple::OSType os = triple.getOS();
- 
--  if (HSOpts.UseStandardSystemIncludes) {
--    switch (os) {
--    case llvm::Triple::FreeBSD:
--    case llvm::Triple::NetBSD:
--    case llvm::Triple::OpenBSD:
--    case llvm::Triple::Bitrig:
--      break;
--    default:
--      // FIXME: temporary hack: hard-coded paths.
--      AddPath("/usr/local/include", System, false);
--      break;
--    }
--  }
--
-   // Builtin includes use #include_next directives and should be positioned
-   // just prior C include dirs.
-   if (HSOpts.UseBuiltinIncludes) {
-@@ -332,9 +318,6 @@
-   default:
-     break;
-   }
--
--  if ( os != llvm::Triple::RTEMS )
--    AddPath("/usr/include", ExternCSystem, false);
- }
- 
- void InitHeaderSearch::
diff --git a/pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch b/pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch
deleted file mode 100644
index de6a468b239..00000000000
--- a/pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/utils/TableGen/CMakeLists.txt       (revision 190146)
-+++ b/utils/TableGen/CMakeLists.txt       (working copy)
-@@ -1,4 +1,5 @@
- set(LLVM_LINK_COMPONENTS Support)
-+set(LLVM_TOOLS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
- 
- add_tablegen(clang-tblgen CLANG
-   ClangASTNodesEmitter.cpp
-
diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix
deleted file mode 100644
index 316730fe3ba..00000000000
--- a/pkgs/development/compilers/llvm/3.3/clang.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2, python }:
-
-let
-  version = "3.3";
-  gccReal = if (stdenv.cc.cc or null) == null then stdenv.cc else stdenv.cc.cc;
-in
-
-stdenv.mkDerivation {
-  name = "clang-${version}";
-
-  buildInputs = [ perl llvm groff cmake libxml2 python ];
-
-  patches = [ ./clang-tablegen-dir.patch ] ++
-            stdenv.lib.optional (stdenv.cc.libc != null) ./clang-purity.patch;
-
-  cmakeFlags = [
-    "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DLLVM_TARGETS_TO_BUILD=all"
-    "-DGCC_INSTALL_PREFIX=${gccReal}"
-  ] ++ stdenv.lib.optionals (stdenv.cc.libc != null) [
-    "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include/"
-  ];
-
-  enableParallelBuilding = true;
-
-  src = fetchurl {
-      url = "http://llvm.org/releases/${version}/cfe-${version}.src.tar.gz";
-      sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi";
-  };
-
-  passthru = {
-    isClang = true;
-    cc = stdenv.cc.cc;
-    gcc = gccReal;
-  };
-
-  meta = {
-    homepage = http://clang.llvm.org/;
-    description = "A C language family frontend for LLVM";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; all;
-  };
-}
diff --git a/pkgs/development/compilers/llvm/3.3/llvm.nix b/pkgs/development/compilers/llvm/3.3/llvm.nix
deleted file mode 100644
index c19955ddaf0..00000000000
--- a/pkgs/development/compilers/llvm/3.3/llvm.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils, debugVersion ? false }:
-let
-  version = "3.3";
-in stdenv.mkDerivation rec {
-  name = "llvm-${version}";
-
-  src = fetchurl {
-    url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
-    sha256 = "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8";
-  };
-
-  patches = [
-    ./more-memory-for-bugpoint.patch # The default rlimits in 3.3 are too low for shared libraries.
-    ./no-rule-aarch64.patch          # http://llvm.org/bugs/show_bug.cgi?id=16625
-    # Patch needed for Julia, backports fixes from LLVM 3.5
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/JuliaLang/julia/release-0.4/deps/llvm-3.3.patch";
-      sha256 = "0j6chyx4k8zr1qha5dks8lqlcraqrj4q1hwnk2kj3qi6cajsd8k3";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/JuliaLang/julia/release-0.4/deps/instcombine-llvm-3.3.patch";
-      sha256 = "161frq3wxrkxah78krb24hp4zkcnphzcgnvkwfq1abq2vjx3f8sn";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/JuliaLang/julia/release-0.4/deps/int128-vector.llvm-3.3.patch";
-      sha256 = "0lzkv6hvsdaalwsyf6sq0vdrf8x5nk58qg6nn5dlw7n3hxaxpm4m";
-    })
-  ];
-
-  buildInputs = [ perl groff cmake python libffi ];
-
-  # hacky fix: created binaries need to be run before installation
-  preBuild = let LD = if stdenv.isDarwin then "DYLD" else "LD";
-    in "export ${LD}_LIBRARY_PATH='$$${LD}_LIBRARY_PATH:'`pwd`/lib";
-
-  cmakeFlags = with stdenv; [
-    "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
-    "-DLLVM_BUILD_TESTS=ON"
-    "-DLLVM_ENABLE_FFI=ON"
-    "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
-    "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=R600" # for mesa
-  ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
-
-  postBuild = ''
-    paxmark m bin/{lli,llvm-rtdyld}
-
-    paxmark m unittests/ExecutionEngine/JIT/JITTests
-    paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
-    paxmark m unittests/Support/SupportTests
-  '';
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "Collection of modular and reusable compiler and toolchain technologies";
-    homepage    = http://llvm.org/;
-    license     = licenses.bsd3;
-    maintainers = with maintainers; [ lovek323 raskin viric ];
-    platforms   = platforms.all;
-  };
-}
diff --git a/pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch b/pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
deleted file mode 100644
index fa19ce4f587..00000000000
--- a/pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur llvm-3.3.src-orig/tools/bugpoint/bugpoint.cpp llvm-3.3.src/tools/bugpoint/bugpoint.cpp
---- llvm-3.3.src-orig/tools/bugpoint/bugpoint.cpp	2013-01-27 20:35:51.000000000 -0500
-+++ llvm-3.3.src/tools/bugpoint/bugpoint.cpp	2013-06-21 18:29:47.612731499 -0400
-@@ -48,9 +48,9 @@
-                       "is killed (default is 300s), 0 disables timeout"));
- 
- static cl::opt<int>
--MemoryLimit("mlimit", cl::init(-1), cl::value_desc("MBytes"),
-+MemoryLimit("mlimit", cl::init(0), cl::value_desc("MBytes"),
-              cl::desc("Maximum amount of memory to use. 0 disables check."
--                      " Defaults to 100MB (800MB under valgrind)."));
-+                      " Check disabled by default."));
- 
- static cl::opt<bool>
- UseValgrind("enable-valgrind",
diff --git a/pkgs/development/compilers/llvm/3.3/no-rule-aarch64.patch b/pkgs/development/compilers/llvm/3.3/no-rule-aarch64.patch
deleted file mode 100644
index ea7214febe5..00000000000
--- a/pkgs/development/compilers/llvm/3.3/no-rule-aarch64.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- llvm/lib/Target/AArch64/Utils/CMakeLists.txt	2013/05/18 04:32:15	182189
-+++ llvm/lib/Target/AArch64/Utils/CMakeLists.txt	2013/05/18 08:17:47	182190
-@@ -3,3 +3,5 @@
- add_llvm_library(LLVMAArch64Utils
-   AArch64BaseInfo.cpp
-   )
-+
-+add_dependencies(LLVMAArch64Utils AArch64CommonTableGen)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b016f8ae98..6b8c502b7f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4024,7 +4024,6 @@ let
   clang_36 = llvmPackages_36.clang;
   clang_35 = wrapCC llvmPackages_35.clang;
   clang_34 = wrapCC llvmPackages_34.clang;
-  clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix);
 
   clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer {
     clang = clang_34;
@@ -4508,7 +4507,6 @@ let
 
   julia = callPackage ../development/compilers/julia {
     gmp = gmp6;
-    llvm = llvm_33;
     openblas = openblasCompat;
   };
 
@@ -4532,7 +4530,6 @@ let
   llvm_36 = llvmPackages_36.llvm;
   llvm_35 = llvmPackages_35.llvm;
   llvm_34 = llvmPackages_34.llvm;
-  llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { };
 
   llvmPackages = recurseIntoAttrs llvmPackages_37;
 

From ba0582670796acdeeb9ab0001a7edd0b08290d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Mar 2016 17:30:42 +0000
Subject: [PATCH 200/338] Attempt to fix transient grub1 test kernel panics

Example: http://hydra.nixos.org/build/32469819/nixlog/26/raw
---
 nixos/tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 84fdb027ed8..9e5a6ad04e1 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -46,7 +46,7 @@ let
                   , grubIdentifier, preBootCommands, extraConfig
                   }:
     let
-      iface = if grubVersion == 1 then "scsi" else "virtio";
+      iface = if grubVersion == 1 then "ide" else "virtio";
       qemuFlags =
         (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") +
         (optionalString (system == "x86_64-linux") "-cpu kvm64 ");

From c3fa090616d45dbca9ce709d0e66279566303509 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 2 Mar 2016 18:45:45 +0100
Subject: [PATCH 201/338] gentium-book-basic: init at 1.102

---
 .../data/fonts/gentium-book-basic/default.nix | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/data/fonts/gentium-book-basic/default.nix

diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix
new file mode 100644
index 00000000000..8bc9ec5e2f3
--- /dev/null
+++ b/pkgs/data/fonts/gentium-book-basic/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "gentium-book-basic-${version}";
+  major = "1";
+  minor = "102";
+  version = "${major}.${minor}";
+
+  src = fetchzip {
+    name = "${name}.zip";
+    url = "http://software.sil.org/downloads/gentium/GentiumBasic_${major}${minor}.zip";
+    sha256 = "109yiqwdfb1bn7d6bjp8d50k1h3z3kz86p3faz11f9acvsbsjad0";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    mkdir -p $out/share/doc/${name}
+    cp -v *.ttf $out/share/fonts/truetype/
+    cp -v FONTLOG.txt GENTIUM-FAQ.txt $out/share/doc/${name}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://software.sil.org/gentium/";
+    description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
+    maintainers = with maintainers; [ DamienCassou ];
+    license = licenses.ofl;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef6dc1f6f3b..019e09e2b0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11112,6 +11112,8 @@ let
 
   gentium = callPackage ../data/fonts/gentium {};
 
+  gentium-book-basic = callPackage ../data/fonts/gentium-book-basic {};
+
   geolite-legacy = callPackage ../data/misc/geolite-legacy { };
 
   gohufont = callPackage ../data/fonts/gohufont { };

From a855ef85ea7f43cd81013ed1ba3e6e0c48b2ed99 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Wed, 2 Mar 2016 13:48:27 -0400
Subject: [PATCH 202/338] multimc: fix building under chroot

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 40836647553..f4cbd25da80 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -68,6 +68,7 @@
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   chattered = "Phil Scott <me@philscotted.com>";
   christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
+  cleverca22 = "Michael Bishop <cleverca22@gmail.com>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   codsl = "codsl <codsl@riseup.net>";
   codyopel = "Cody Opel <codyopel@gmail.com>";
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index c07a76d397d..2e528a8203f 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk7, zlib, file, makeWrapper, xorg, libpulseaudio }:
+{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk7, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }:
 
 let
   libnbt = fetchFromGitHub {
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
     rmdir $sourceRoot/depends/libnbtplusplus
     cp -r ${libnbt} $sourceRoot/depends/libnbtplusplus
     chmod 755 -R $sourceRoot/depends/libnbtplusplus
+    mkdir -pv $sourceRoot/build/
+    cp -v ${qt5.quazip.src} $sourceRoot/build/quazip-0.7.1.tar.gz
   '';
 
   patches = [ ./multimc.patch ];
@@ -51,5 +53,6 @@ stdenv.mkDerivation {
     '';
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.lgpl21Plus;
+    maintainers = stdenv.lib.maintainers.cleverca22;
   };
 }

From c2bce0cd029cd7068f75b8025b0fdddb34881a26 Mon Sep 17 00:00:00 2001
From: Anders Lundstedt <git@anderslundstedt.se>
Date: Wed, 2 Mar 2016 19:26:48 +0100
Subject: [PATCH 203/338] Respect umask settings in Transmission config

In NixOS/nixpkgs@da6bc44 @thoughtpolice
made the Transmission NixOS module override the umask setting in the
Transmission config. This commit removes that override.

I want a different umask setting and I guess it is possible that other
people might want it to. Thus I think it is a good idea to respect the
umask settings in the Transmission config.
---
 nixos/modules/services/torrent/transmission.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index b3f1f906636..5ae12ac1e95 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -21,7 +21,7 @@ let
     else toString ''"${x}"'';
 
   # for users in group "transmission" to have access to torrents
-  fullSettings = { download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings // { umask = 2; };
+  fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings;
 in
 {
   options = {

From ccc64c20e6f9e8382eac2bf666a700a8be9270fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 28 Feb 2016 08:57:08 -0300
Subject: [PATCH 204/338] tint2: 0.12 -> 0.12.7

---
 pkgs/applications/misc/tint2/default.nix | 25 ++++++++++++------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index e8412ce1916..f4162147258 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -1,27 +1,31 @@
-{ stdenv, fetchurl, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama
+{ stdenv, fetchFromGitLab, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama
 , libXrender, libXcomposite, libXdamage, libX11, libXrandr, gtk, libpthreadstubs
-, libXdmcp, librsvg, fetchgit
+, libXdmcp, librsvg, libstartup_notification
 }:
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "0.12";
+  version = "0.12.7";
 
-  src = fetchgit {
-    url = "https://gitlab.com/o9000/tint2.git";
+  src = fetchFromGitLab {
+    owner = "o9000";
+    repo = "tint2";
     rev = version;
-    sha256 = "0pd84ydpqz2l6gkhj565nqi2xyiph8zfpn4xha60xshqpsg3pqjq";
+    sha256 = "01wb1yy7zfi01fl34yzpn1d30fykcf8ivmdlynnxp5znqrdsqm2r";
   };
-        
+
+  enableParallelBuilding = true;
+
   buildInputs = [ pkgconfig cmake pango cairo glib imlib2 libXinerama
     libXrender libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs
-    libXdmcp librsvg
+    libXdmcp librsvg libstartup_notification
   ];
 
   preConfigure =
     ''
       substituteInPlace CMakeLists.txt --replace /etc $out/etc
     '';
+
   prePatch =
     ''
       substituteInPlace ./src/tint2conf/properties.c --replace /usr/share/ /run/current-system/sw/share/
@@ -29,11 +33,6 @@ stdenv.mkDerivation rec {
       substituteInPlace ./src/launcher/icon-theme-common.c --replace /usr/share/ /run/current-system/sw/share/
     '';
 
-  cmakeFlags = [
-    "-DENABLE_TINT2CONF=0"
-    "-DENABLE_SN=0"
-  ];
-
   meta = {
     homepage = https://gitlab.com/o9000/tint2;
     license = stdenv.lib.licenses.gpl2;

From 1904ef7f09bac1ed9a4fc17ee4c6e94d9c4dc981 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Mon, 21 Dec 2015 12:09:38 +0100
Subject: [PATCH 205/338] systemd: enable upstream systemd-binfmt.service

Since we don't restart sysinit.service in switch-to-configuration, this
additionally overrides systemd-binfmt.service to depend on
proc-sys-fs-binfmt_misc.automount, which is normally provided by
sysinit.service.
---
 nixos/modules/system/boot/systemd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index c5ee95f4c9a..a3c83521c35 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -160,6 +160,7 @@ let
       "systemd-timedated.service"
       "systemd-localed.service"
       "systemd-hostnamed.service"
+      "systemd-binfmt.service"
     ]
 
     ++ cfg.additionalUpstreamSystemUnits;
@@ -779,6 +780,7 @@ in
     systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions.
     systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;
     systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
+    systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ];
 
     # Don't bother with certain units in containers.
     systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";

From 03f2888b98c6a89cba6a5111c22a508d274b1b34 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Wed, 2 Mar 2016 15:32:39 -0500
Subject: [PATCH 206/338] sweethome3d: 4.6.2 -> 5.2

Also updated editors to latest version.

Tested the applications and everything seem to
work at least as well as previous version.
---
 pkgs/applications/misc/sweethome3d/default.nix | 4 ++--
 pkgs/applications/misc/sweethome3d/editors.nix | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 0c9b6e8c08a..a6ba0062210 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -51,14 +51,14 @@ let
 in rec {
 
   application = mkSweetHome3D rec {
-    version = "4.6.2";
+    version = "5.2";
     module = "SweetHome3D";
     name = stdenv.lib.toLower module + "-application-" + version;
     description = "Design and visualize your future home";
     license = stdenv.lib.licenses.gpl2Plus;
     src = fetchcvs {
       cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
-      sha256 = "0pm0rl5y90cjwyjma7g6nnaz6dv4bqcy8vl3zzxfj0q02ww01gbz";
+      sha256 = "0vws3lj5lgix5fz2hpqvz6p79py5gbfpkhmqpfb1knx1a12310bb";
       module = module;
       tag = "V_" + d2u version;
     };
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 87da1c6643b..fb164aab111 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -61,28 +61,28 @@ let
 in {
 
   textures-editor = mkEditorProject rec {
-    version = "1.4";
+    version = "1.5";
     module = "TexturesLibraryEditor";
     name = sweetName module version;
     description = "Easily create SH3T files and edit the properties of the texture images it contain";
     license = stdenv.lib.licenses.gpl2Plus;
     src = fetchcvs {
       cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
-      sha256 = "1j1ygb32dca48hng5bsna9f84vyin5qc3ds44xi39057izmw8499";
+      sha256 = "15wxdns3hc8yq362x0rj53bcxran2iynxznfcb9js85psd94zq7h";
       module = module;
       tag = "V_" + d2u version;
     };
   };
 
   furniture-editor = mkEditorProject rec {
-    version = "1.16";
+    version = "1.19";
     module = "FurnitureLibraryEditor";
     name = sweetName module version;
     description = "Quickly create SH3F files and edit the properties of the 3D models it contain";
     license = stdenv.lib.licenses.gpl2;
     src = fetchcvs {
       cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
-      sha256 = "09dmb0835kncs1ngszhyp1pgvj7vqjjrp9q405gakm8ylrzym374";
+      sha256 = "0rr4nqil1mngak3ds5vz7f1whrgcgzpk6fb0qcr5ljms0jx0ylvs";
       module = module;
       tag = "V_" + d2u version;
     };

From 6c1e3a82decfd499ac0248c55cee5b239d625fd8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Mar 2016 19:42:39 +0100
Subject: [PATCH 207/338] cudatoolkit: Merge into one file and use callPackages

---
 .../development/compilers/cudatoolkit/5.5.nix |   6 -
 .../development/compilers/cudatoolkit/6.0.nix |   6 -
 .../development/compilers/cudatoolkit/6.5.nix |   6 -
 .../development/compilers/cudatoolkit/7.0.nix |   7 --
 .../compilers/cudatoolkit/default.nix         | 103 ++++++++++++++++++
 .../compilers/cudatoolkit/generic.nix         |  75 -------------
 pkgs/top-level/all-packages.nix               |  16 +--
 7 files changed, 108 insertions(+), 111 deletions(-)
 delete mode 100644 pkgs/development/compilers/cudatoolkit/5.5.nix
 delete mode 100644 pkgs/development/compilers/cudatoolkit/6.0.nix
 delete mode 100644 pkgs/development/compilers/cudatoolkit/6.5.nix
 delete mode 100644 pkgs/development/compilers/cudatoolkit/7.0.nix
 create mode 100644 pkgs/development/compilers/cudatoolkit/default.nix
 delete mode 100644 pkgs/development/compilers/cudatoolkit/generic.nix

diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix
deleted file mode 100644
index c3eb1b6efcf..00000000000
--- a/pkgs/development/compilers/cudatoolkit/5.5.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "5.5.22";
-  sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4";
-})
diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix
deleted file mode 100644
index 200311703a0..00000000000
--- a/pkgs/development/compilers/cudatoolkit/6.0.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "6.0.37";
-  sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40";
-})
diff --git a/pkgs/development/compilers/cudatoolkit/6.5.nix b/pkgs/development/compilers/cudatoolkit/6.5.nix
deleted file mode 100644
index 3d9a3a50349..00000000000
--- a/pkgs/development/compilers/cudatoolkit/6.5.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "6.5.19";
-  sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj";
-})
diff --git a/pkgs/development/compilers/cudatoolkit/7.0.nix b/pkgs/development/compilers/cudatoolkit/7.0.nix
deleted file mode 100644
index 152dd6e9274..00000000000
--- a/pkgs/development/compilers/cudatoolkit/7.0.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "7.0.28";
-  sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi";
-  url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run";
-})
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
new file mode 100644
index 00000000000..a0b34592bf0
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -0,0 +1,103 @@
+{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python26, python27, zlib
+, xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
+}:
+
+let
+
+  common =
+    { version, url, sha256
+    , python ? python27
+    }:
+
+    stdenv.mkDerivation rec {
+      name = "cudatoolkit-${version}";
+
+      dontPatchELF = true;
+      dontStrip = true;
+
+      src =
+        if stdenv.system == "x86_64-linux" then
+          fetchurl {
+            inherit url sha256;
+          }
+        else throw "cudatoolkit does not support platform ${stdenv.system}";
+
+      outputs = [ "out" "sdk" ];
+
+      buildInputs = [ perl ];
+
+      runtimeDependencies = [
+        ncurses expat python zlib glibc
+        xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
+        gtk2 glib fontconfig freetype unixODBC alsaLib
+      ];
+
+      rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
+
+      unpackPhase = ''
+        sh $src --keep --noexec
+        cd pkg/run_files
+        sh cuda-linux64-rel-${version}-*.run --keep --noexec
+        sh cuda-samples-linux-${version}-*.run --keep --noexec
+        cd pkg
+      '';
+
+      buildPhase = ''
+        find . -type f -executable -exec patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          '{}' \; || true
+        find . -type f -exec patchelf \
+          --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \
+          --force-rpath \
+          '{}' \; || true
+      '';
+
+      installPhase = ''
+        mkdir $out $sdk
+        perl ./install-linux.pl --prefix="$out"
+        rm $out/tools/CUDA_Occupancy_Calculator.xls
+        perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
+
+        # let's remove the 32-bit libraries, they confuse the lib64->lib mover
+        rm -rf $out/lib
+
+        # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
+        if [ -d "$out"/cuda-samples ]; then
+            mv "$out"/cuda-samples "$out"/samples
+        fi
+      '';
+
+      meta = {
+        license = lib.licenses.unfree;
+      };
+    };
+
+in {
+
+  cudatoolkit5 = common {
+    version = "5.5.22";
+    url = http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run;
+    sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4";
+    python = python26;
+  };
+
+  cudatoolkit6 = common {
+    version = "6.0.37";
+    url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run;
+    sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40";
+  };
+
+  cudatoolkit65 = common {
+    version = "6.5.19";
+    url = http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run;
+    sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj";
+  };
+
+  cudatoolkit7 = common {
+    version = "7.0.28";
+    url = http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run;
+    sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi";
+  };
+
+}
+
diff --git a/pkgs/development/compilers/cudatoolkit/generic.nix b/pkgs/development/compilers/cudatoolkit/generic.nix
deleted file mode 100644
index a02c917ab24..00000000000
--- a/pkgs/development/compilers/cudatoolkit/generic.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
-, xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
-# generic inputs
-, version, sha256, url ? null, ...
-} :
-
-let
-  # eg, 5.5.22 => 5_5
-  mkShort = let str  = stdenv.lib.strings;
-                take = stdenv.lib.lists.take;
-            in v: str.concatStringsSep "_" (take 2 (str.splitString "." v));
-  shortVer = mkShort version;
-in stdenv.mkDerivation rec {
-  name = "cudatoolkit-${version}";
-
-  dontPatchELF = true;
-  dontStrip = true;
-
-  src =
-    if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = if url != null then url else "http://developer.download.nvidia.com/compute/cuda/${shortVer}/rel/installers/cuda_${version}_linux_64.run";
-        sha256 = sha256;
-      }
-    else throw "cudatoolkit does not support platform ${stdenv.system}";
-
-  outputs = [ "out" "sdk" ];
-
-  buildInputs = [ perl ];
-
-  runtimeDependencies = [
-    ncurses expat python zlib glibc
-    xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
-    gtk2 glib fontconfig freetype unixODBC alsaLib
-  ];
-
-  rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
-
-  unpackPhase = ''
-    sh $src --keep --noexec
-    cd pkg/run_files
-    sh cuda-linux64-rel-${version}-*.run --keep --noexec
-    sh cuda-samples-linux-${version}-*.run --keep --noexec
-    cd pkg
-  '';
-
-  buildPhase = ''
-    find . -type f -executable -exec patchelf \
-      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      '{}' \; || true
-    find . -type f -exec patchelf \
-      --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-      --force-rpath \
-      '{}' \; || true
-  '';
-
-  installPhase = ''
-    mkdir $out $sdk
-    perl ./install-linux.pl --prefix="$out"
-    rm $out/tools/CUDA_Occupancy_Calculator.xls
-    perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
-
-    # let's remove the 32-bit libraries, they confuse the lib64->lib mover
-    rm -rf $out/lib
-
-    # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
-    if [ -d "$out"/cuda-samples ]; then
-        mv "$out"/cuda-samples "$out"/samples
-    fi
-  '';
-
-  meta = {
-    license = lib.licenses.unfree;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee3d6d7d8a3..9efdc15aaba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1266,17 +1266,11 @@ let
 
   cron = callPackage ../tools/system/cron { };
 
-  cudatoolkit5 = callPackage ../development/compilers/cudatoolkit/5.5.nix {
-    python = python26;
-  };
-
-  cudatoolkit6 = callPackage ../development/compilers/cudatoolkit/6.0.nix {
-    python = python26;
-  };
-
-  cudatoolkit65 = callPackage ../development/compilers/cudatoolkit/6.5.nix { };
-
-  cudatoolkit7 = callPackage ../development/compilers/cudatoolkit/7.0.nix { };
+  inherit (callPackages ../development/compilers/cudatoolkit { })
+    cudatoolkit5
+    cudatoolkit6
+    cudatoolkit65
+    cudatoolkit7;
 
   cudatoolkit = cudatoolkit7;
 

From 6d97de951df1c4b80c99c31a81d3ed89a329d999 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Mar 2016 20:36:13 +0100
Subject: [PATCH 208/338] cudatoolkit: Add version 7.5.18

---
 pkgs/development/compilers/cudatoolkit/default.nix | 6 ++++++
 pkgs/top-level/all-packages.nix                    | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index a0b34592bf0..0ab3f52f2bf 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -99,5 +99,11 @@ in {
     sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi";
   };
 
+  cudatoolkit75 = common {
+    version = "7.5.18";
+    url = http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run;
+    sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88";
+  };
+
 }
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9efdc15aaba..a99998b1519 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1270,7 +1270,8 @@ let
     cudatoolkit5
     cudatoolkit6
     cudatoolkit65
-    cudatoolkit7;
+    cudatoolkit7
+    cudatoolkit75;
 
   cudatoolkit = cudatoolkit7;
 

From 369ede9235e8e0f9b6f766a9cbc647067482252a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 2 Mar 2016 22:36:37 +0100
Subject: [PATCH 209/338] mcabber: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index abe9b78904f..f32bdf96257 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mcabber-${version}";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
-    sha256 = "14rd17rs26knmwinfv63w2xzlkj5ygvhicx95h0mai4lpji4b6jp";
+    sha256 = "1phzfsl6cfzaga140dm8bb8q678j0qsw29cc03rw4vkcxa8kh577";
   };
 
   buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];

From ba7b5ad530c5af5031ba957b957424b14304de47 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 2 Mar 2016 23:14:31 +0100
Subject: [PATCH 210/338] filezilla: 3.15.0.2 -> 3.16.0

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

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 8f53102d5f5..57b93bfd656 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla }:
 
-let version = "3.15.0.2"; in
+let version = "3.16.0"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "0kvwkz01v73qi8y6n8wlidglwh0vg7pajsjm8xq7gch6jmq4cg1k";
+    sha256 = "0ilv4xhgav4srx6iqn0v0kv8rifgkysyx1hb9bnm45dc0skmbgbx";
   };
 
   configureFlags = [

From 18d43d74f6d3a538bacc6c49d844a2e439cf6cba Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Mar 2016 03:58:51 +0200
Subject: [PATCH 211/338] azure-image: provide configuration.nix which allows
 nixos-rebuild to build a working generation and add helpful comments

---
 nixos/modules/virtualisation/azure-config-user.nix | 12 ++++++++++++
 nixos/modules/virtualisation/azure-image.nix       |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/virtualisation/azure-config-user.nix

diff --git a/nixos/modules/virtualisation/azure-config-user.nix b/nixos/modules/virtualisation/azure-config-user.nix
new file mode 100644
index 00000000000..de1b3857923
--- /dev/null
+++ b/nixos/modules/virtualisation/azure-config-user.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, modulesPath, ... }:
+
+{
+  # To build the configuration or use nix-env, you need to run
+  # either nixos-rebuild --upgrade or nix-channel --update
+  # to fetch the nixos channel.
+
+  # This configures everything but bootstrap services,
+  # which only need to be run once and have already finished
+  # if you are able to see this comment.
+  imports = [ "${modulesPath}/virtualisation/azure-common.nix" ];
+}
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index f0a739bc95d..79d1f7d7cc4 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -78,7 +78,7 @@ in
 
           echo Install a configuration.nix.
           mkdir -p /mnt/etc/nixos /mnt/boot/grub
-          cp ${./azure-config.nix} /mnt/etc/nixos/configuration.nix
+          cp ${./azure-config-user.nix} /mnt/etc/nixos/configuration.nix
 
           echo Generate the GRUB menu.
           ln -s vda /dev/sda

From bd71f511e58e73ef43d991b44ed781c108331293 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Thu, 3 Mar 2016 02:18:07 -0300
Subject: [PATCH 212/338] libqtelegram-aseman-edition: 6.0 -> 6.1

---
 .../telegram/libqtelegram-aseman-edition/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
index 8166514bb3a..957c59b88e5 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
@@ -2,14 +2,13 @@
 , qtbase, qtmultimedia, qtquick1 }:
 
 stdenv.mkDerivation rec {
-  name = "libqtelegram-aseman-edition-${version}";
-  version = "6.0";
+  name = "libqtelegram-aseman-edition-${meta.version}";
 
   src = fetchFromGitHub {
     owner = "Aseman-Land";
     repo = "libqtelegram-aseman-edition";
-    rev = "v${version}";
-    sha256 = "17hlxf43xwic8m06q3gwbxjpvz31ks6laffjw6ny98d45zfnfwra";
+    rev = "v${meta.version}-stable";
+    sha256 = "1pfd4pvh51639zk9shv1s4f6pf0ympnhar8a302vhrkga9i4cbx6";
   };
 
   buildInputs = [ qtbase qtmultimedia qtquick1 ];
@@ -25,6 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "6.1";
     description = "A fork of libqtelegram by Aseman, using qmake";
     homepage = src.meta.homepage;
     license = stdenv.lib.licenses.gpl3;

From f70ba914ef24f582ffaaebae8fdbc0ecaddeb967 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Thu, 3 Mar 2016 02:19:07 -0300
Subject: [PATCH 213/338] telegram-qml: 0.9.1 -> 0.9.2

---
 .../telegram/telegram-qml/default.nix                  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
index 6bf550d4766..aa442cbe8b2 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
@@ -3,17 +3,16 @@
 , libqtelegram-aseman-edition }:
 
 stdenv.mkDerivation rec {
-  name = "telegram-qml-${version}";
-  version = "0.9.1-stable";
+  name = "telegram-qml-${meta.version}";
 
   src = fetchFromGitHub {
     owner = "Aseman-Land";
     repo = "TelegramQML";
-    rev = "v${version}";
-    sha256 = "077j06lfr6qccqv664hn0ln023xlh5cfm50kapjc2inapxj2yqmn";
+    rev = "v${meta.version}";
+    sha256 = "0j8vn845f2virvddk9yjbljy6vkr9ikyn6iy7hpj8nvr2xls3499";
   };
 
-  buildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ];
+  propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ];
   enableParallelBuild = true;
 
   patchPhase = ''
@@ -26,6 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "0.9.2";
     description = "Telegram API tools for QtQml and Qml";
     homepage = src.meta.homepage;
     license = stdenv.lib.licenses.gpl3;

From 14aa382f03f7581326847acd9dfafcf17499073c Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Thu, 3 Mar 2016 02:20:07 -0300
Subject: [PATCH 214/338] cutegram: 2.7.0 -> 2.7.1

And some minor changes
---
 .../telegram/cutegram/default.nix             | 38 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  8 ++--
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index 507094f7c05..fa03b8d21ad 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -1,31 +1,37 @@
-{ stdenv, fetchFromGitHub
-, qtbase, qtquick1, qtmultimedia, qtquickcontrols, qtgraphicaleffects, makeQtWrapper
-, telegram-qml, libqtelegram-aseman-edition }:
+{ stdenv, fetchgit
+, qtbase, qtmultimedia, qtquick1, qtquickcontrols, qtgraphicaleffects
+, telegram-qml, libqtelegram-aseman-edition
+, gst_plugins_base, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly
+, makeQtWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "cutegram-${version}";
-  version = "2.7.0-stable";
+  name = "cutegram-${meta.version}";
 
-  src = fetchFromGitHub {
-    owner = "Aseman-Land";
-    repo = "Cutegram";
-    rev = "v${version}";
-    sha256 = "0qhy30gb8zdrphz1b7zcnv8hmm5fd5qwlvrg7wpsh3hk5niz3zxk";
+  src = fetchgit {
+    url = "https://github.com/Aseman-Land/Cutegram.git";
+    rev = "1dbe2792fb5a1760339379907f906e236c09db84";
+    sha256 = "080153bpa92jpi0zdrfajrn0yqy3jp8m4704sirbz46dv7471rzl";
   };
-  # TODO appindicator, for system tray plugin
-  buildInputs = [ qtbase qtquick1 qtmultimedia qtquickcontrols qtgraphicaleffects telegram-qml libqtelegram-aseman-edition ];
+
+  buildInputs =
+  [ qtbase qtmultimedia qtquick1 qtquickcontrols qtgraphicaleffects
+    telegram-qml libqtelegram-aseman-edition
+    gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly ];
   nativeBuildInputs = [ makeQtWrapper ];
   enableParallelBuild = true;
 
-  fixupPhase = "wrapQtProgram $out/bin/cutegram";
-
   configurePhase = "qmake -r PREFIX=$out";
 
+  fixupPhase = "wrapQtProgram $out/bin/cutegram";
+
   meta = with stdenv.lib; {
+    version = "2.7.1";
     description = "Telegram client forked from sigram";
     homepage = "http://aseman.co/en/products/cutegram/";
     license = licenses.gpl3;
-    maintainers = [ maintainers.profpatsch ];
+    maintainers = with maintainers; [ profpatsch AndersonTorres ];
   };
-
 }
+#TODO: appindicator, for system tray plugin (by @profpatsch)
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f756a175ac..1cb28017ae5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11653,10 +11653,10 @@ let
   cutecom = callPackage ../tools/misc/cutecom { };
 
   cutegram =
-    let cp = qt5.callPackage;
-    in cp ../applications/networking/instant-messengers/telegram/cutegram rec {
-      libqtelegram-aseman-edition = cp ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { };
-      telegram-qml = cp ../applications/networking/instant-messengers/telegram/telegram-qml {
+    let callpkg = qt55.callPackage;
+    in callpkg ../applications/networking/instant-messengers/telegram/cutegram rec {
+      libqtelegram-aseman-edition = callpkg ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { };
+      telegram-qml = callpkg ../applications/networking/instant-messengers/telegram/telegram-qml {
         inherit libqtelegram-aseman-edition;
       };
     };

From ebc3f4bdf31507bbe7a8dd27a3d476ab4093dadd Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Thu, 3 Mar 2016 00:22:46 -0500
Subject: [PATCH 215/338] sweethome3d: Improvements

 -  Replace non freedesktop `CAD` desktop category
    by categories taken from debian's desktop item.

    This make the desktop items appear under the
    `Graphic` category in DE menus instead of `Others`.

 -  Moved to new package icons as specified by
    upstream release notes.

 -  Moved to icon name instead of full path to
    a single icon as specified by freedesktop
    specification.

 -  Human readable desktop item names.
---
 .../applications/misc/sweethome3d/default.nix | 42 +++++++++++++++----
 .../applications/misc/sweethome3d/editors.nix | 12 ++++--
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 0c9b6e8c08a..d937dd78c05 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -1,20 +1,33 @@
-{ stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
+{ lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
 , gtk3, gsettings_desktop_schemas, p7zip }:
 
 let
 
+  getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
+
+  # TODO: Should we move this to `lib`? Seems like its would be useful in many cases.
+  extensionOf = filePath: 
+    lib.concatStringsSep "." (lib.tail (lib.splitString "." 
+      (builtins.baseNameOf filePath)));
+
+  installIcons = iconName: icons: lib.concatStringsSep "\n" (lib.mapAttrsToList (size: iconFile: ''
+    mkdir -p "$out/share/icons/hicolor/${size}/apps"
+    ln -s -T "${iconFile}" "$out/share/icons/hicolor/${size}/apps/${iconName}.${extensionOf iconFile}"
+  '') icons);
+
   mkSweetHome3D =
-  { name, module, version, src, license, description, icon }:
+  { name, module, version, src, license, description, desktopName, icons }:
 
   stdenv.mkDerivation rec {
-    inherit name version src description icon;
+    inherit name version src description;
     exec = stdenv.lib.toLower module;
     sweethome3dItem = makeDesktopItem {
-      inherit name exec icon;
+      inherit exec desktopName;
+      name = getDesktopFileName name;
+      icon = getDesktopFileName name;
       comment =  description;
-      desktopName = name;
       genericName = "Computer Aided (Interior) Design";
-      categories = "Application;CAD;";
+      categories = "Application;Graphics;2DGraphics;3DGraphics;";
     };
 
     buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ];
@@ -29,7 +42,11 @@ let
     installPhase = ''
       mkdir -p $out/bin
       cp install/${module}-${version}.jar $out/share/java/.
+
+      ${installIcons (getDesktopFileName name) icons}
+
       cp "${sweethome3dItem}/share/applications/"* $out/share/applications
+
       makeWrapper ${jre}/bin/java $out/bin/$exec \
         --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
         --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}"
@@ -62,9 +79,16 @@ in rec {
       module = module;
       tag = "V_" + d2u version;
     };
-    icon = fetchurl {
-      url = "http://sweethome3d.cvs.sourceforge.net/viewvc/sweethome3d/SweetHome3D/src/com/eteks/sweethome3d/viewcontroller/resources/help/images/sweethome3d.png";
-      sha256 = "0lnv2sz2d3m8jx25hz92gzardf0iblykhy5q0q2cyb7mw2qb2p92";
+    desktopName = "Sweet Home 3D";
+    icons = {
+      "32x32" = fetchurl {
+        url = "http://sweethome3d.cvs.sourceforge.net/viewvc/sweethome3d/SweetHome3D/deploy/SweetHome3DIcon32x32.png";
+        sha256 = "1r2fhfg27mx00nfv0qj66rhf719s2g1vhdis7bdc9mqk9x0mb0ir";
+      };
+      "48x48" = fetchurl {
+        url = "http://sweethome3d.cvs.sourceforge.net/viewvc/sweethome3d/SweetHome3D/deploy/SweetHome3DIcon48x48.png";
+        sha256 = "1ap6d75dyqqvx21wddvn8vw2apq3v803vmbxdriwd0dw9rq3zn4g";
+      };
     };
   };
 
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 87da1c6643b..d8c6461843e 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -9,19 +9,21 @@ let
     + "-editor";
   sweetName = m: v: sweetExec m + "-" + v;
 
+  getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
+
   mkEditorProject =
-  { name, module, version, src, license, description }:
+  { name, module, version, src, license, description, desktopName }:
 
   stdenv.mkDerivation rec {
     application = sweethome3dApp;
     inherit name module version src description;
     exec = sweetExec module;
     editorItem = makeDesktopItem {
-      inherit name exec;
+      inherit exec desktopName;
+      name = getDesktopFileName name;
       comment =  description;
-      desktopName = name;
       genericName = "Computer Aided (Interior) Design";
-      categories = "Application;CAD;";
+      categories = "Application;Graphics;2DGraphics;3DGraphics;";
     };
 
     buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ];
@@ -72,6 +74,7 @@ in {
       module = module;
       tag = "V_" + d2u version;
     };
+    desktopName = "Sweet Home 3D - Textures Library Editor";
   };
 
   furniture-editor = mkEditorProject rec {
@@ -86,6 +89,7 @@ in {
       module = module;
       tag = "V_" + d2u version;
     };
+    desktopName = "Sweet Home 3D - Furniture Library Editor";
   };
 
 }

From 5f57d2dc506d27da999756666466f81eef6e3c98 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Sat, 19 Sep 2015 22:03:11 -0400
Subject: [PATCH 216/338] maintainers: add a maintainer to the set

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f4cbd25da80..d8a5adf5f98 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -166,6 +166,7 @@
   joelmo = "Joel Moberg <joel.moberg@gmail.com>";
   joelteon = "Joel Taylor <me@joelt.io>";
   jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
+  jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
   jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
   jzellner = "Jeff Zellner <jeffz@eml.cc>";

From 4f347ca8fe5cb120cab2916e14770e3e3416a6e5 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Sat, 19 Sep 2015 22:04:16 -0400
Subject: [PATCH 217/338] keepass: improvements

`*.desktop` file now:
 -  Refers to an icon.
 -  Is placed in the proper category (based on comparison with `keepassx2`.
 -  Has proper mime type (also based on comparison).

Also, now use `icoutils` to extract icons from the application ressouces
and transform them from `*.ico` to `*.png`. Created and used a generic
script that has the ability to move the extracted `*.png` to their
appropriate standard freedesktop location.

Tested this on nixos. `keepass` now has a icon and is categorized
in the same bin as `keepassx2`. The program still execute and
function prefectly.
---
 pkgs/applications/misc/keepass/default.nix    | 28 +++++++--
 .../extractWinRscIconsToStdFreeDesktopDir.sh  | 61 +++++++++++++++++++
 2 files changed, 84 insertions(+), 5 deletions(-)
 create mode 100755 pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh

diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 8f16283d391..948d03262b6 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, plugins ? [] }:
+{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, plugins ? [] }:
 
 # KeePass looks for plugins in under directory in which KeePass.exe is
 # located. It follows symlinks where looking for that directory, so
@@ -17,7 +17,7 @@ with builtins; buildDotnetPackage rec {
 
   sourceRoot = ".";
 
-  buildInputs = [ unzip makeWrapper ];
+  buildInputs = [ unzip makeWrapper icoutils ];
 
   pluginLoadPathsPatch =
     let outputLc = toString (add 8 (length plugins));
@@ -52,9 +52,14 @@ with builtins; buildDotnetPackage rec {
     name = "keepass";
     exec = "keepass";
     comment = "Password manager";
+    icon = "keepass";
     desktopName = "Keepass";
     genericName = "Password manager";
-    categories = "Application;Other;";
+    categories = "Application;Utility;";
+    mimeType = stdenv.lib.concatStringsSep ";" [
+      "application/x-keepass2"
+      ""
+    ];
   };
 
   outputFiles = [ "Build/KeePass/Release/*" "Build/KeePassLib/Release/*" ];
@@ -67,16 +72,29 @@ with builtins; buildDotnetPackage rec {
   # is found and does not pollute output path.
   binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins));
 
-  postInstall = ''
+  postInstall = 
+  let
+    extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh;
+  in
+  ''
     mkdir -p "$out/share/applications"
     cp ${desktopItem}/share/applications/* $out/share/applications
     wrapProgram $out/bin/keepass --prefix PATH : "$binPaths"
+
+    ${extractFDeskIcons} \
+      "./Translation/TrlUtil/Resources/KeePass.ico" \
+      '[^\.]+_[0-9]+_([0-9]+x[0-9]+)x[0-9]+\.png' \
+      '\1' \
+      '([^\.]+).+' \
+      'keepass' \
+      "$out" \
+      "./tmp"
   '';
 
   meta = {
     description = "GUI password manager with strong cryptography";
     homepage = http://www.keepass.info/;
-    maintainers = with stdenv.lib.maintainers; [ amorsillo obadz ];
+    maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ];
     platforms = with stdenv.lib.platforms; all;
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh
new file mode 100755
index 00000000000..04485b146a0
--- /dev/null
+++ b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# The file from which to extract *.ico files.
+#rscFile="./KeePass.exe"
+rscFile=$1
+
+# A regexp that can extract the image size from the file name.
+# sizeRegex='[^\.]+\.exe_[0-9]+_[0-9]+_[0-9]+_[0-9]+_([0-9]+x[0-9]+)x[0-9]+\.png'
+sizeRegex=$2
+
+# sizeReplaceExp='\1'
+sizeReplaceExp=$3
+
+# A regexp that can extract the name of the target image from the file name.
+# nameRegex='([^\.]+)\.exe.+'
+nameRegex=$4
+
+# nameReplaceExp='\1'
+nameReplaceExp=$5
+
+# out=./myOut
+out=$6
+
+# An optional temp dir. TODO: Generate it randomly by default instead.
+tmp=./tmp
+if [ "" != "$4" ]; then
+    tmp=$7
+fi
+
+
+
+rm -rf $tmp/png $tmp/ico
+mkdir -p $tmp/png $tmp/ico
+
+# Extract the ressource file's extension.
+rscFileExt=`echo "$rscFile" | sed -re 's/.+\.(.+)$/\1/'`
+
+# Debug ressource file extension.
+echo "rscFileExt=$rscFileExt"
+
+if [ "ico" = "$rscFileExt" ]; then
+    cp -p $rscFile $tmp/ico
+else
+    wrestool -x --output=$tmp/ico -t14 $rscFile
+fi
+    
+icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico
+
+mkdir -p $out
+
+for i in $tmp/png/*.png; do
+  fn=`basename "$i"`
+  size=$(echo $fn | sed -re 's/'${sizeRegex}'/'${sizeReplaceExp}'/')
+  name=$(echo $fn | sed -re 's/'${nameRegex}'/'${nameReplaceExp}'/')
+  targetDir=$out/share/icons/hicolor/$size/apps
+  targetFile=$targetDir/$name.png
+  mkdir -p $targetDir
+  mv $i $targetFile
+done
+
+rm -rf $tmp/png $tmp/ico

From c2a2c2ecd4055d4c47204e64c7e45d5f15060750 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 3 Mar 2016 08:24:00 +0100
Subject: [PATCH 218/338] ltl2ba: fix build on darwin

---
 pkgs/applications/science/logic/ltl2ba/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix
index cdadd18ac9f..f9bdd9a6b3b 100644
--- a/pkgs/applications/science/logic/ltl2ba/default.nix
+++ b/pkgs/applications/science/logic/ltl2ba/default.nix
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "16z0gc7a9dkarwn0l6rvg5jdhw1q4qyn4501zlchy0zxqddz0sx6";
   };
 
+  preConfigure = ''
+    substituteInPlace Makefile \
+    --replace "CC=gcc" ""
+  '';
+
   installPhase = ''
     mkdir -p $out/bin
     mv ltl2ba $out/bin
@@ -18,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "fast translation from LTL formulae to Buchi automata";
     homepage    = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba";
     license     = stdenv.lib.licenses.gpl2Plus;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }

From 0bcf42aed390ca645738ff35a3e9f0e9669cdd6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@polytechnique.org>
Date: Thu, 3 Mar 2016 11:38:42 +0100
Subject: [PATCH 219/338] mpv: added optional wayland support

---
 pkgs/applications/video/mpv/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 5bc2eee2414..a38ab6e9b3d 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -21,6 +21,7 @@
 , youtubeSupport ? true, youtube-dl ? null
 , cacaSupport ? true, libcaca ? null
 , vaapiSupport ? false, libva ? null
+, waylandSupport ? false, wayland ? null, libxkbcommon ? null
 }:
 
 assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
@@ -41,6 +42,7 @@ assert bs2bSupport -> libbs2b != null;
 assert libpngSupport -> libpng != null;
 assert youtubeSupport -> youtube-dl != null;
 assert cacaSupport -> libcaca != null;
+assert waylandSupport -> (wayland != null && libxkbcommon != null);
 
 let
   inherit (stdenv.lib) optional optionals optionalString;
@@ -77,7 +79,8 @@ stdenv.mkDerivation rec {
     "--enable-manpage-build"
     "--disable-build-date" # Purity
     "--enable-zsh-comp"
-  ] ++ optional vaapiSupport "--enable-vaapi";
+  ] ++ optional vaapiSupport "--enable-vaapi"
+  ++ optional waylandSupport "--enable-wayland";
 
   configurePhase = ''
     python ${waf} configure --prefix=$out $configureFlags
@@ -105,7 +108,8 @@ stdenv.mkDerivation rec {
     ++ optional youtubeSupport youtube-dl
     ++ optional sdl2Support SDL2
     ++ optional cacaSupport libcaca
-    ++ optional vaapiSupport libva;
+    ++ optional vaapiSupport libva
+    ++ optionals waylandSupport [ wayland libxkbcommon ];
 
   enableParallelBuilding = true;
 
@@ -139,6 +143,5 @@ stdenv.mkDerivation rec {
     '';
   };
 }
-# TODO: Wayland support
 # TODO: investigate caca support
 # TODO: investigate lua5_sockets bug

From aa564c9ed01268e7e0b030942592bc3beb642eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 3 Mar 2016 12:09:50 +0100
Subject: [PATCH 220/338] make-bootstrap-tools: fix #13629: glibc problems

On x86_64-linux glibc started to use linker scripts more extensively.
---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index ef651f64368..3c894869972 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -51,7 +51,15 @@ rec {
         cp -d ${glibc}/lib/crt?.o $out/lib
 
         cp -rL ${glibc}/include $out
-        chmod -R u+w $out/include
+        chmod -R u+w "$out"
+
+        # glibc can contain linker scripts: find them, copy their deps,
+        # and get rid of absolute paths (nuke-refs would make them useless)
+        local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib")
+        cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc}' | sort -u)
+        for f in $lScripts; do
+          substituteInPlace "$f" --replace '${glibc}/lib/' ""
+        done
 
         # Hopefully we won't need these.
         rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video

From 50b950fe8dc60248144519b5b1888a762c8c7094 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Mar 2016 11:51:49 +0100
Subject: [PATCH 221/338] nix-generate-from-cpan: Don't quote names that don't
 need it

---
 maintainers/scripts/nix-generate-from-cpan.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl
index f1159c6d290..a2edf165554 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@@ -431,7 +431,7 @@ my $build_fun = -e "$pkg_path/Build.PL"
 print STDERR "===\n";
 
 print <<EOF;
-  "$attr_name" = $build_fun rec {
+  ${\(is_reserved($attr_name) ? "\"$attr_name\"" : $attr_name)} = $build_fun rec {
     name = "$pkg_name";
     src = fetchurl {
       url = "mirror://cpan/${\$module->path}/\${name}.${\$module->package_extension}";
@@ -450,7 +450,7 @@ EOF
 print <<EOF if defined $homepage;
       homepage = $homepage;
 EOF
-print <<EOF if defined $description;
+print <<EOF if defined $description && $description ne "Unknown";
       description = "$description";
 EOF
 print <<EOF if defined $license;

From e2ad72342e7e612a5c9d6966a09ca13b21448c5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Mar 2016 12:25:37 +0100
Subject: [PATCH 222/338] nix-generate-from-cpan: Skip "if" package since it's
 part of Perl now

---
 maintainers/scripts/nix-generate-from-cpan.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl
index a2edf165554..73e13bfe09a 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@@ -279,7 +279,7 @@ sub get_deps {
         next if $n eq "perl";
 
         # Hacky way to figure out if this module is part of Perl.
-        if ( $n !~ /^JSON/ && $n !~ /^YAML/ && $n !~ /^Module::Pluggable/ ) {
+        if ( $n !~ /^JSON/ && $n !~ /^YAML/ && $n !~ /^Module::Pluggable/  && $n !~ /^if$/ ) {
             eval "use $n;";
             if ( !$@ ) {
                 DEBUG("skipping Perl-builtin module $n");

From 6af59c9d068d8820ad05b3e02d6ac0f36e630aba Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 2 Mar 2016 08:49:20 -0600
Subject: [PATCH 223/338] kde5.plasma.plasma-workspace: 5.5.5.1 -> 5.5.5.2

---
 pkgs/desktops/kde-5/plasma-5.5/srcs.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.5/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
index 40fe5618ff8..f27b39033e2 100644
--- a/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
@@ -251,11 +251,11 @@
     };
   };
   plasma-workspace = {
-    version = "5.5.5.1";
+    version = "5.5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/plasma-workspace-5.5.5.1.tar.xz";
-      sha256 = "1grhw60rd5dl07fl0dr96fq6c6d7076k5m2hjg6w6w9ynb76sg6h";
-      name = "plasma-workspace-5.5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-workspace-5.5.5.2.tar.xz";
+      sha256 = "09kvzv2cjlv0bglik7723m373nvhvh3c4aaip2xkv5lbhxfydldy";
+      name = "plasma-workspace-5.5.5.2.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {

From 7f7c2171c0b0251a1c16aea04074833d6702ff52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 3 Mar 2016 14:04:36 +0100
Subject: [PATCH 224/338] Update ghdl mcode to 0.33.

(cherry picked from commit e9d6aadc51ecdd274cd383a99ea840a94b58d954)
---
 pkgs/development/compilers/ghdl/default.nix | 46 ++++-----------------
 1 file changed, 8 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix
index 7b2e03f8d57..3e84ce1d0ae 100644
--- a/pkgs/development/compilers/ghdl/default.nix
+++ b/pkgs/development/compilers/ghdl/default.nix
@@ -1,58 +1,28 @@
 { stdenv, fetchurl, gnat, zlib }:
 
+# I think that mcode can only generate x86 code,
+# so it fails to link pieces on x86_64.
 assert stdenv.system == "i686-linux";
 
 let
-  version = "0.31";
+  version = "0.33";
 in
 stdenv.mkDerivation rec {
   name = "ghdl-mcode-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ghdl/ghdl-${version}.tar.gz";
-    sha256 = "1v0l9h6906b0bvnwfi2qg5nz9vjg80isc5qgjxr1yqxpkfm2xcf0";
+    url = "https://github.com/tgingold/ghdl/archive/v${version}.tar.gz";
+    sha256 = "09yvgqyglbakd74v2dgr470clzm744i232nixyffcds55vkij5da";
   };
 
   buildInputs = [ gnat zlib ];
 
-  # Tarbomb
-  preUnpack = ''
-    mkdir ghdl
-    cd ghdl
-  '';
-
-  sourceRoot = "translate/ghdldrv";
-
   patchPhase = ''
-    sed -i 's,$$curdir/lib,'$out'/share/ghdl_mcode/translate/lib,' Makefile
+    # Disable warnings-as-errors, because there are warnings (unused things)
+    sed -i s/-gnatwae/-gnatwa/ Makefile.in ghdl.gpr.in
   '';
 
-  postBuild = ''
-    # Build the LIB
-    ln -s ghdl_mcode ghdl
-    make install.mcode
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ghdl_mcode $out/bin
-
-    mkdir -p $out/share/ghdl_mcode/translate
-    cp -R ../lib $out/share/ghdl_mcode/translate
-    cp -R ../../libraries $out/share/ghdl_mcode
-
-    mkdir -p $out/share/man/man1
-    cp ../../doc/ghdl.1 $out/share/man/man1/ghdl_mcode.1
-
-    # Ghdl has some timestamps checks, storing file timestamps in '.cf' files.
-    # As we will change the timestamps to 1970-01-01 00:00:01, we also set the
-    # content of that .cf to that value. This way ghdl does not complain on
-    # the installed object files from the basic libraries (ieee, ...)
-    pushd $out
-    find . -name "*.cf" -exec \
-        sed 's/[0-9]*\.000" /19700101000001.000" /g' -i {} \;
-    popd
-  '';
+  enableParallelBuilding = true;
 
   meta = {
     homepage = "http://sourceforge.net/p/ghdl-updates/wiki/Home/";

From 17389e256fa1651d8577555ac8fe7aa23044f0e6 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Fri, 26 Feb 2016 15:19:46 +0100
Subject: [PATCH 225/338] nntp-proxy service: init

---
 nixos/modules/misc/ids.nix                    |   1 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/networking/nntp-proxy.nix        | 234 ++++++++++++++++++
 3 files changed, 236 insertions(+)
 create mode 100644 nixos/modules/services/networking/nntp-proxy.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 6ae37f273df..0ab2b8a76fc 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -253,6 +253,7 @@
       pdnsd = 229;
       octoprint = 230;
       avahi-autoipd = 231;
+      nntp-proxy = 232;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 88e01069b26..1610bf6c0d8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -338,6 +338,7 @@
   ./services/networking/networkmanager.nix
   ./services/networking/ngircd.nix
   ./services/networking/nix-serve.nix
+  ./services/networking/nntp-proxy.nix
   ./services/networking/nsd.nix
   ./services/networking/ntopng.nix
   ./services/networking/ntpd.nix
diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix
new file mode 100644
index 00000000000..cd0889351a3
--- /dev/null
+++ b/nixos/modules/services/networking/nntp-proxy.nix
@@ -0,0 +1,234 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  inherit (pkgs) nntp-proxy;
+
+  proxyUser = "nntp-proxy";
+
+  cfg = config.services.nntp-proxy;
+
+  configBool = b: if b then "TRUE" else "FALSE";
+
+  confFile = pkgs.writeText "nntp-proxy.conf" ''
+    nntp_server:
+    {
+      # NNTP Server host and port address
+      server = "${cfg.upstreamServer}";
+      port = ${toString cfg.upstreamPort};
+      # NNTP username
+      username = "${cfg.upstreamUser}";
+      # NNTP password in clear text
+      password = "${cfg.upstreamPassword}";
+      # Maximum number of connections allowed by the NNTP
+      max_connections = ${toString cfg.upstreamMaxConnections};
+    };
+
+    proxy:
+    {
+      # Local address and port to bind to
+      bind_ip = "${cfg.listenAddress}";
+      bind_port = ${toString cfg.port};
+
+      # SSL key and cert file
+      ssl_key = "${cfg.sslKey}";
+      ssl_cert = "${cfg.sslCert}";
+
+      # prohibit users from posting
+      prohibit_posting = ${configBool cfg.prohibitPosting};
+      # Verbose levels: ERROR, WARNING, NOTICE, INFO, DEBUG
+      verbose = "${toUpper cfg.verbosity}";
+      # Password is made with: 'mkpasswd -m sha-512 <password>'
+      users = (${concatStringsSep ",\n" (mapAttrsToList (username: userConfig:
+        ''
+          {
+              username = "${username}";
+              password = "${userConfig.passwordHash}";
+              max_connections = ${toString userConfig.maxConnections};
+          }
+        '') cfg.users)});
+    };
+  '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.nntp-proxy = {
+      enable = mkEnableOption "NNTP-Proxy";
+
+      upstreamServer = mkOption {
+        type = types.str;
+        default = "";
+        example = "ssl-eu.astraweb.com";
+        description = ''
+          Upstream server address
+        '';
+      };
+
+      upstreamPort = mkOption {
+        type = types.int;
+        default = 563;
+        description = ''
+          Upstream server port
+        '';
+      };
+
+      upstreamMaxConnections = mkOption {
+        type = types.int;
+        default = 20;
+        description = ''
+          Upstream server maximum allowed concurrent connections
+        '';
+      };
+
+      upstreamUser = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Upstream server username
+        '';
+      };
+
+      upstreamPassword = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Upstream server password
+        '';
+      };
+
+      listenAddress = mkOption {
+        type = types.str;
+        default = "127.0.0.1";
+        example = "[::]";
+        description = ''
+          Proxy listen address (IPv6 literal addresses need to be enclosed in "[" and "]" characters)
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 5555;
+        description = ''
+          Proxy listen port
+        '';
+      };
+
+      sslKey = mkOption {
+        type = types.str;
+        default = "key.pem";
+        example = "/path/to/your/key.file";
+        description = ''
+          Proxy ssl key path
+        '';
+      };
+
+      sslCert = mkOption {
+        type = types.str;
+        default = "cert.pem";
+        example = "/path/to/your/cert.file";
+        description = ''
+          Proxy ssl certificate path
+        '';
+      };
+
+      prohibitPosting = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to prohibit posting to the upstream server
+        '';
+      };
+
+      verbosity = mkOption {
+        type = types.str;
+        default = "info";
+        example = "error";
+        description = ''
+          Verbosity level (error, warning, notice, info, debug)
+        '';
+      };
+
+      users = mkOption {
+        type = types.attrsOf (types.submodule {
+          options = {
+            username = mkOption {
+              type = types.str;
+              default = null;
+              description = ''
+                Username
+              '';
+            };
+
+            passwordHash = mkOption {
+              type = types.str;
+              default = null;
+              example = "$6$GtzE7FrpE$wwuVgFYU.TZH4Rz.Snjxk9XGua89IeVwPQ/fEUD8eujr40q5Y021yhn0aNcsQ2Ifw.BLclyzvzgegopgKcneL0";
+              description = ''
+                SHA-512 password hash (can be generated by 'mkpasswd -m sha-512 <password>')
+              '';
+            };
+
+            maxConnections = mkOption {
+              type = types.int;
+              default = 1;
+              description = ''
+                Maximum number of concurrent connections to the proxy for this user
+              '';
+            };
+          };
+        });
+        description = ''
+          NNTP-Proxy user configuration
+        '';
+
+        default = {};
+        example = literalExample ''
+          "user1" = {
+            passwordHash = "$6$1l0t5Kn2Dk$appzivc./9l/kjq57eg5UCsBKlcfyCr0zNWYNerKoPsI1d7eAwiT0SVsOVx/CTgaBNT/u4fi2vN.iGlPfv1ek0";
+            maxConnections = 5;
+          };
+          "anotheruser" = {
+            passwordHash = "$6$6lwEsWB.TmsS$W7m1riUx4QrA8pKJz8hvff0dnF1NwtZXgdjmGqA1Dx2MDPj07tI9GNcb0SWlMglE.2/hBgynDdAd/XqqtRqVQ0";
+            maxConnections = 7;
+          };
+        '';
+      };
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton
+      { name = proxyUser;
+        uid = config.ids.uids.nntp-proxy;
+        description = "NNTP-Proxy daemon user";
+      };
+
+    systemd.services.nntp-proxy = {
+      description = "NNTP proxy";
+      after = [ "network.target" "nss-lookup.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = { User="${proxyUser}"; };
+      serviceConfig.ExecStart = "${nntp-proxy}/bin/nntp-proxy ${confFile}";
+      preStart = ''
+        if [ ! \( -f ${cfg.sslCert} -a -f ${cfg.sslKey} \) ]; then
+          ${pkgs.openssl}/bin/openssl req -subj '/CN=AutoGeneratedCert/O=NixOS Service/C=US' \
+          -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout ${cfg.sslKey} -out ${cfg.sslCert};
+        fi
+      '';
+    };
+
+  };
+
+}

From bf18a34f9738b61e380f4071e41f59825b8f7028 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Thu, 3 Mar 2016 14:45:11 +0100
Subject: [PATCH 226/338] musl: pass the correct syslibdir

This fixes dynamic linking (the specfile contains the correct path, and
the dynamic loader is symlinked in place)
Fixes #8543
---
 pkgs/os-specific/linux/musl/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index abe96e9b9ae..a8055df92fd 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  preConfigure = ''
+    configureFlagsArray+=("--syslibdir=$out/lib")
+  '';
+
   configureFlags = [
     "--enable-shared"
     "--enable-static"

From ee7eb78c52668a9d6dffe16c408dd978c29cb24a Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 3 Mar 2016 14:49:18 +0100
Subject: [PATCH 227/338] atomicwrites: 0.1.0 -> 0.1.9

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25ba60f69bf..7287863c769 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -950,12 +950,12 @@ in modules // {
   };
 
   atomicwrites = buildPythonPackage rec {
-    version = "0.1.0";
+    version = "0.1.9";
     name = "atomicwrites-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/atomicwrites/atomicwrites-${version}.tar.gz";
-      sha256 = "1lxz0xhnzihqlvl1h6j2nfxjqqgr4s08196z5phnlcz2s7d5z0mg";
+      sha256 = "08s05h211r07vs66r4din3swrbzb344vli041fihpg34q3lcxpvw";
     };
 
     meta = {

From 819dab02035c5588a96318c4e934519bdc9b2198 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Tue, 1 Mar 2016 21:04:27 +0100
Subject: [PATCH 228/338] git-remote-hg: fix the derivation name

-v0.2 isn't parsed as a version by Nix, and makes it inconvenient to
install git-remote-hg through nix-env.
---
 .../version-management/git-and-tools/git-remote-hg/default.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index 588c7acff7c..512a8938a58 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   rev = "e716a9e1a9e460a45663694ba4e9e8894a8452b2";
-  version = "v0.2-e716a9e1a9e460a45663694ba4e9e8894a8452b2";
+  version = "0.2-${rev}";
   name = "git-remote-hg-${version}";
 
   src = fetchgit {

From edfb2e7ccb1c45f32dd87ff649ade79dba0b2d1c Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Thu, 3 Mar 2016 14:59:40 +0100
Subject: [PATCH 229/338] update epson-escpr meta

---
 lib/maintainers.nix                       | 1 +
 pkgs/misc/drivers/epson-escpr/default.nix | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f4cbd25da80..5de6a21572c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -33,6 +33,7 @@
   ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
   aristid = "Aristid Breitkreuz <aristidb@gmail.com>";
   arobyn = "Alexei Robyn <shados@shados.net>";
+  artuuge = "Artur E. Ruuge <artuuge@gmail.com>";
   asppsa = "Alastair Pharo <asppsa@gmail.com>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   aszlig = "aszlig <aszlig@redmoonstudios.org>";
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index 305f0d78a0b..faf13d4bcc3 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -16,7 +16,7 @@ in
 
     buildInputs = [ cups ];
 
-    meta = {
+    meta = with stdenv.lib; {
       homepage = https://github.com/artuuge/NixOS-files/;
       description = "ESC/P-R Driver (generic driver)";
       longDescription = ''
@@ -30,7 +30,9 @@ in
 	    drivers = [ pkgs.epson-escpr ];
 	  };
       '';
-      license = stdenv.lib.licenses.gpl3Plus;
+      license = licenses.gpl3Plus;
+      maintainers = with maintainers; [ artuuge ];
+      platforms = platforms.linux;
     };
 
   }

From a0b1b032b6345bdf7d738a4add8bfcb83a4f1103 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 3 Mar 2016 15:17:37 +0100
Subject: [PATCH 230/338] khal: force Python3

Both the README and setup.py agree that khal is only compatible with
Python 3.
---
 pkgs/applications/misc/khal/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 52a4f0dee75..ab55e3618ec 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgs, pythonPackages }:
+{ stdenv, fetchurl, pkgs, python3Packages }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   version = "0.7.0";
   name = "khal-${version}";
 
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "00llxj7cv31mjsx0j6zxmyi9s1q20yvfkn025xcy8cv1ylfwic66";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python3Packages; [
     atomicwrites
     click
     configobj
@@ -22,7 +22,6 @@ pythonPackages.buildPythonApplication rec {
     requests_toolbelt
     tzlocal
     urwid
-    python.modules.sqlite3
     pkginfo
   ];
 

From 6cf907ba092f182f98bcd0b2c431beb03df3f940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 3 Mar 2016 09:01:02 -0300
Subject: [PATCH 231/338] xsettingsd: 0.0.1 -> git-2015-06-14

---
 pkgs/tools/X11/xsettingsd/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix
index 254cc8a4961..c05aeff9337 100644
--- a/pkgs/tools/X11/xsettingsd/default.nix
+++ b/pkgs/tools/X11/xsettingsd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xsettingsd-${version}";
-  version = "0.0.1";
+  version = "git-2015-06-14";
 
   src = fetchFromGitHub {
     owner = "derat";
     repo = "xsettingsd";
-    rev = "2a516a91d8352b3b93a7a1ef5606dbd21fa06b7c";
-    sha256 = "0f9lc5w18x6xs9kf72jpixprp3xb7wqag23cy8zrm33n2bza9dj0";
+    rev = "b4999f5e9e99224caf97d09f25ee731774ecd7be";
+    sha256 = "18cp6a66ji483lrvf0vq855idwmcxd0s67ijpydgjlsr70c65j7s";
   };
 
   patches = [
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Provides settings to X11 applications via the XSETTINGS specification";
     homepage = https://github.com/derat/xsettingsd;
+    license = licenses.bsd2;
     platforms = platforms.linux;
   };
 }

From 740307a213070fccb6f624cde37ee986af0559a5 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 3 Mar 2016 16:00:04 +0100
Subject: [PATCH 232/338] vdirsyncer: use Python3 by default

Even if Python2 is still supported, the maintainer says that some
features won't work and the support will soon be discarded.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f756a175ac..683434a189b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13790,7 +13790,7 @@ let
 
   vcprompt = callPackage ../applications/version-management/vcprompt { };
 
-  vdirsyncer = callPackage ../tools/misc/vdirsyncer { };
+  vdirsyncer = callPackage ../tools/misc/vdirsyncer { pythonPackages = python3Packages; };
 
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 

From de24ea40f8759d1463202bd5cd70f9b54235e161 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 3 Mar 2016 16:09:00 +0100
Subject: [PATCH 233/338] sbt: 0.13.9 -> 0.13.11

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

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 585e9ff101a..206792ab483 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "0.13.9";
+  version = "0.13.11";
 
   src = fetchurl {
     url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
-    sha256 = "148f2801f2993773de6f8859fe0e6520fcabe649d66bb316e13aff8b2fd7f504";
+    sha256 = "19mg2xbc2vbqg33b986zvn7pj05cx106rccdzf9zs2npdnznysm3";
   };
 
   patchPhase = ''

From c8698919da508698d8785238d7590e1cbea16566 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 3 Mar 2016 16:29:51 +0100
Subject: [PATCH 234/338] khard: remove dependency to vdirsyncer

khard and vdirsyncer can be used together, but there are no real
dependency between them.
---
 pkgs/applications/misc/khard/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index a10d434a70d..2cb23510558 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -18,10 +18,6 @@ pythonPackages.buildPythonApplication rec {
     pyyaml
   ];
 
-  buildInputs = with pythonPackages; [
-    pkgs.vdirsyncer
-  ];
-
   meta = {
     homepage = https://github.com/scheibler/khard;
     description = "Console carddav client";

From 8a804dfbacc3212968e186776b7949c90d3e8d02 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 3 Mar 2016 16:37:23 +0100
Subject: [PATCH 235/338] khard: force Python2

setup.py says that khard is only compatible with
Python 2.
---
 pkgs/applications/misc/khard/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index a10d434a70d..679dc10291a 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgs, pythonPackages }:
+{ stdenv, fetchurl, pkgs, python2Packages }:
 
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
   version = "0.8.1";
   name = "khard-${version}";
   namePrefix = "";
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "13axfrs96isirx0c483545xdmjwwfq1k7yy92xpk7l184v71rgi1";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python2Packages; [
     atomicwrites
     configobj
     vobject
@@ -18,10 +18,6 @@ pythonPackages.buildPythonApplication rec {
     pyyaml
   ];
 
-  buildInputs = with pythonPackages; [
-    pkgs.vdirsyncer
-  ];
-
   meta = {
     homepage = https://github.com/scheibler/khard;
     description = "Console carddav client";

From 73ba0ae2de11a2aa610649949c8f0de444c67763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 3 Mar 2016 16:15:25 +0000
Subject: [PATCH 236/338] Remove which -> type -P alias.

Aliases are not the same as programs. They won't work in subshells.
It's better to just use which as it's only 88K.
---
 nixos/modules/profiles/base.nix      | 1 +
 nixos/modules/programs/bash/bash.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index b8057cadce2..09183ee1809 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -17,6 +17,7 @@
     pkgs.ddrescue
     pkgs.ccrypt
     pkgs.cryptsetup # needed for dm-crypt volumes
+    pkgs.which # 88K size
 
     # Some networking tools.
     pkgs.fuse
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 1c3c07a1c21..e4e264ec003 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -56,7 +56,7 @@ in
       */
 
       shellAliases = mkOption {
-        default = config.environment.shellAliases // { which = "type -P"; };
+        default = config.environment.shellAliases;
         description = ''
           Set of aliases for bash shell. See <option>environment.shellAliases</option>
           for an option format description.

From 85abde52d05517c8e168050304efe3b2c7c61bd7 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Thu, 3 Mar 2016 17:37:33 +0100
Subject: [PATCH 237/338] rewritefs: init at 2016-02-08

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

diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix
new file mode 100644
index 00000000000..e0f39a558a0
--- /dev/null
+++ b/pkgs/os-specific/linux/rewritefs/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: 
+
+stdenv.mkDerivation rec {
+  name = "rewritefs-${version}";
+  version = "2016-02-08";
+
+  src = fetchFromGitHub {
+    owner = "sloonz";
+    repo = "rewritefs";
+    rev = "3ac0d1789bb9d48dbeddc6721d00eef19d1dc956";
+    sha256 = "0bj8mq5hd52afmy01dyhqsx2rby7injhg96x9z3gyv0r90wa59bh";
+  };
+ 
+  buildInputs = [ pkgconfig fuse pcre ];
+
+  preConfigure = "substituteInPlace Makefile --replace /usr/local $out";
+
+  meta = with stdenv.lib; {
+    description = ''A FUSE filesystem intended to be used
+      like Apache mod_rewrite'';
+    homepage    = "https://github.com/sloonz/rewritefs";
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ rnhmjoj ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d45632c4e6..c32a1cb771a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3090,6 +3090,8 @@ let
 
   rescuetime = callPackage ../applications/misc/rescuetime { };
 
+  rewritefs = callPackage ../os-specific/linux/rewritefs { };
+
   rdiff-backup = callPackage ../tools/backup/rdiff-backup { };
 
   rdfind = callPackage ../tools/filesystems/rdfind { };

From 7fa0df283a76930c751f0f2527e7771db726d33e Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Mon, 29 Feb 2016 18:51:31 +0100
Subject: [PATCH 238/338] goreman: init at v0.0.8-rc0

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3d4cb5ac1a8..13bb31af71d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3774,4 +3774,22 @@ let
     preBuild = ''go generate ./...'';
   };
 
+  godotenv = buildFromGitHub rec {
+    rev    = "4ed13390c0acd2ff4e371e64d8b97c8954138243";
+    date   = "2015-09-07";
+    owner  = "joho";
+    repo   = "godotenv";
+    sha256 = "1wzgws4dnlavi14aw3jzdl3mdr348skgqaq8xx4j8l68irfqyh0p";
+    buildInputs = [ go-colortext yaml-v2 ];
+  };
+
+  goreman = buildFromGitHub rec {
+    version = "0.0.8-rc0";
+    rev    = "d3e62509ccf23e47a390447886c51b1d89d0934b";
+    date   = "2016-01-30";
+    owner  = "mattn";
+    repo   = "goreman";
+    sha256 = "153hf4dq4jh1yv35pv30idmxhc917qzl590qy5394l48d4rapgb5";
+    buildInputs = [ go-colortext yaml-v2 godotenv ];
+  };
 }; in self

From bcdd81d9e14d960cf2fc910b622e236728a7fc07 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 3 Mar 2016 12:01:01 -0500
Subject: [PATCH 239/338] networkmanager: Enable ipv6 privacy extensions by
 default

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

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index eb2b9d692f8..9912ad9ae3f 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -21,6 +21,9 @@ let
 
     [logging]
     level=WARN
+
+    [connection]
+    ipv6.ip6-privacy=2
   '';
 
   /*

From 8b5b57fb960333f0b10d2e8ac78b989756c2162f Mon Sep 17 00:00:00 2001
From: Marc Scholten <marc@pedigital.de>
Date: Thu, 3 Mar 2016 11:39:54 +0100
Subject: [PATCH 240/338] undmg: init at 1.0.2

---
 pkgs/tools/archivers/undmg/default.nix   | 27 ++++++++++++++++++++++++
 pkgs/tools/archivers/undmg/setup-hook.sh |  5 +++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/archivers/undmg/default.nix
 create mode 100644 pkgs/tools/archivers/undmg/setup-hook.sh

diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix
new file mode 100644
index 00000000000..5cb7bf2c62f
--- /dev/null
+++ b/pkgs/tools/archivers/undmg/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, zlib, bzip2 }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "undmg-${version}";
+
+  src = fetchFromGitHub {
+    owner = "matthewbauer";
+    repo = "undmg";
+    rev = "refs/tags/v${version}";
+    sha256 = "0w9vwvj9zbpsjkg251bwv9y10wjyjmh54q2piklz74w64rlbqblr";
+    name = "undmg-${version}";
+  };
+
+  buildInputs = [ zlib bzip2 ];
+
+  setupHook = ./setup-hook.sh;
+
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    homepage = https://github.com/matthewbauer/undmg;
+    description = "Extract a DMG file";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/tools/archivers/undmg/setup-hook.sh b/pkgs/tools/archivers/undmg/setup-hook.sh
new file mode 100644
index 00000000000..e5c8dda23b6
--- /dev/null
+++ b/pkgs/tools/archivers/undmg/setup-hook.sh
@@ -0,0 +1,5 @@
+unpackCmdHooks+=(_tryUnpackDmg)
+_tryUnpackDmg() {
+    if ! [[ "$curSrc" =~ \.dmg$ ]]; then return 1; fi
+    undmg < "$curSrc"
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59da78dacf2..5746562b759 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3728,6 +3728,8 @@ let
 
   unzipNLS = lowPrio (unzip.override { enableNLS = true; });
 
+  undmg = callPackage ../tools/archivers/undmg { };
+
   uptimed = callPackage ../tools/system/uptimed { };
 
   urjtag = callPackage ../tools/misc/urjtag {

From 6bd0c3fe9de1572f06ae0b44b6f0c96318246bd1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Mar 2016 19:40:54 +0100
Subject: [PATCH 241/338] ifplugd: Remove

This package hasn't been updated in 11 years, and isn't really useful
anymore in a modern Linux system.
---
 nixos/modules/module-list.nix                 |  1 -
 nixos/modules/services/networking/ifplugd.nix | 82 -------------------
 pkgs/os-specific/linux/ifplugd/default.nix    | 16 ----
 pkgs/top-level/all-packages.nix               |  2 -
 pkgs/top-level/release-small.nix              |  1 -
 5 files changed, 102 deletions(-)
 delete mode 100644 nixos/modules/services/networking/ifplugd.nix
 delete mode 100644 pkgs/os-specific/linux/ifplugd/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4e3acd2c31d..5d487776be2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -322,7 +322,6 @@
   ./services/networking/hostapd.nix
   ./services/networking/i2pd.nix
   ./services/networking/i2p.nix
-  ./services/networking/ifplugd.nix
   ./services/networking/iodined.nix
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/kippo.nix
diff --git a/nixos/modules/services/networking/ifplugd.nix b/nixos/modules/services/networking/ifplugd.nix
deleted file mode 100644
index 00b94fe2284..00000000000
--- a/nixos/modules/services/networking/ifplugd.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  inherit (pkgs) ifplugd;
-
-  cfg = config.networking.interfaceMonitor;
-
-  # The ifplugd action script, which is called whenever the link
-  # status changes (i.e., a cable is plugged in or unplugged).
-  plugScript = pkgs.writeScript "ifplugd.action"
-    ''
-      #! ${pkgs.stdenv.shell}
-      iface="$1"
-      status="$2"
-      ${cfg.commands}
-    '';
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    networking.interfaceMonitor.enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        If <literal>true</literal>, monitor Ethernet interfaces for
-        cables being plugged in or unplugged.  When this occurs, the
-        commands specified in
-        <option>networking.interfaceMonitor.commands</option> are
-        executed.
-      '';
-    };
-
-    networking.interfaceMonitor.beep = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        If <literal>true</literal>, beep when an Ethernet cable is
-        plugged in or unplugged.
-      '';
-    };
-
-    networking.interfaceMonitor.commands = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Shell commands to be executed when the link status of an
-        interface changes.  On invocation, the shell variable
-        <varname>iface</varname> contains the name of the interface,
-        while the variable <varname>status</varname> contains either
-        <literal>up</literal> or <literal>down</literal> to indicate
-        the new status.
-      '';
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-    systemd.services.ifplugd = {
-      description = "Network interface connectivity monitor";
-      after = [ "network-interfaces.target" ];
-      wantedBy = [ "multi-user.target" ];
-      script = ''
-        ${ifplugd}/sbin/ifplugd --no-daemon --no-startup --no-shutdown \
-          ${if config.networking.interfaceMonitor.beep then "" else "--no-beep"} \
-          --run ${plugScript}
-      '';
-    };
-
-    environment.systemPackages = [ ifplugd ];
-  };
-}
diff --git a/pkgs/os-specific/linux/ifplugd/default.nix b/pkgs/os-specific/linux/ifplugd/default.nix
deleted file mode 100644
index 2d9ff16c8ad..00000000000
--- a/pkgs/os-specific/linux/ifplugd/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl, pkgconfig, libdaemon}:
-
-stdenv.mkDerivation {
-  name = "ifplugd-0.28";
-  src = fetchurl {
-    url = http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.28.tar.gz;
-    sha256 = "1w21cpyzkr7igp6vsf4a0jwp2b0axs3kwjiapy676bdk9an58is7";
-  };
-  buildInputs = [pkgconfig libdaemon];
-  configureFlags = "--with-initdir=$out/etc/init.d --disable-lynx";
-  patches = [
-    # From http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch?rev=1.1.
-    ./interface.patch
-  ];
-  patchFlags = "-p0";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c971f3157b9..cb592d252df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10242,8 +10242,6 @@ let
 
   i7z = callPackage ../os-specific/linux/i7z { };
 
-  ifplugd = callPackage ../os-specific/linux/ifplugd { };
-
   ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { };
 
   intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { };
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 01786591973..fbfa4903b45 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -71,7 +71,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
   iana_etc = linux;
   icewm = linux;
   idutils = all;
-  ifplugd = linux;
   inetutils = linux;
   iputils = linux;
   jnettop = linux;

From 5f4417e0cfbec18a09791fbfe6a3cc7410fd7fda Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 3 Mar 2016 18:35:21 +0000
Subject: [PATCH 242/338] pythonPackages.acme_0_1: init at 0.1.0

`acme_0_1` is introduced because `simp_le` strictly depends on version 0.1.0
of the library (which is now at 0.4.0).
---
 pkgs/tools/admin/simp_le/default.nix |  2 +-
 pkgs/top-level/python-packages.nix   | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index 77c45e0ad3f..d27c0a2da81 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0l4qs0y4cbih76zrpbkn77xj17iwsm5fi83zc3p048x4hj163805";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ acme ];
+  propagatedBuildInputs = with pythonPackages; [ acme_0_1 ];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 68deac847db..4221782b56b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -263,6 +263,29 @@ in modules // {
     sourceRoot = "letsencrypt-v${version}-src/acme";
   };
 
+  # Maintained for simp_le compatibility
+  acme_0_1 = buildPythonPackage rec {
+    version = "0.1.0";
+
+    name = "acme-${version}";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "letsencrypt";
+      repo = "letsencrypt";
+      rev = "v${version}";
+      sha256 = "1f7406nnybsdbwxf7r9qjf6hzkfd7cg6qp8l9l7hrzwscsq5hicj";
+    };
+
+    propagatedBuildInputs = with self; [
+      cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock
+      ndg-httpsclient
+    ];
+
+    buildInputs = with self; [ nose ];
+
+    sourceRoot = "letsencrypt-v${version}-src/acme";
+  };
+
   acme-tiny = buildPythonPackage rec {
     name = "acme-tiny-${version}";
     version = "20151229";

From 417457f6f9aebc1827cf1874c040e168a159fa7e Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 3 Mar 2016 19:40:34 +0100
Subject: [PATCH 243/338] libreoffice: disable kdeIntegration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes #13651

@edolstra:
“IIRC, the "KDE integration" consists mainly in providing a Qt/KDE "File
open" dialog, which we can probably live without. In fact, it has been
known to malfunction if Libreoffice's KDE version is different from the
system KDE version.

So disabling this sounds like a good idea.”
---
 pkgs/applications/office/libreoffice/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 1a5cf987fd8..040b4893032 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -15,10 +15,12 @@
 , defaultIconTheme, glib
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
 , withHelp ? true
+, kdeIntegration ? false
 }:
 
 let
-  langsSpaces = stdenv.lib.concatStringsSep " " langs;
+  lib = stdenv.lib;
+  langsSpaces = lib.concatStringsSep " " langs;
   major = "5";
   minor = "1";
   patch = "0";
@@ -90,7 +92,6 @@ in stdenv.mkDerivation rec {
   '';
 
   QT4DIR = qt4;
-  KDE4DIR = kde4.kdelibs;
 
   # Fix boost 1.59 compat
   # Try removing in the next version
@@ -178,7 +179,7 @@ in stdenv.mkDerivation rec {
     "--disable-report-builder"
     "--enable-python=system"
     "--enable-dbus"
-    "--enable-kde4"
+    (lib.enableFeature kdeIntegration "kde4")
     "--with-package-format=installed"
     "--enable-epm"
     "--with-jdk-home=${jdk.home}"
@@ -230,7 +231,7 @@ in stdenv.mkDerivation rec {
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
       CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
       freetype GConf getopt gnome_vfs gperf gtk3 gtk
-      hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
+      hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
@@ -241,9 +242,10 @@ in stdenv.mkDerivation rec {
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew
       libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
-    ];
+    ]
+    ++ lib.optional kdeIntegration kde4.kdelibs;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
     homepage = http://libreoffice.org/;
     license = licenses.lgpl3;

From 13bd76b525b1d378bc7478279839f5ec5bdd5741 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 3 Mar 2016 18:43:06 +0100
Subject: [PATCH 244/338] pkgs/rkt: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index ca7400c9f4a..713928eafed 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -9,7 +9,7 @@ let
   stage1Flavours = [ "coreos" "fly" "host" ];
 
 in stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.1.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
       rev = "v${version}";
       owner = "coreos";
       repo = "rkt";
-      sha256 = "1m76hzx550dh35jpb8m46ks04ac3dfy4rg054v035rpwgh50ac6h";
+      sha256 = "1pl5gbfd9wr8nh2h249g7sjs31jz21g24mw375zki9gdhhnpn570";
   };
 
   stage1BaseImage = fetchurl {

From 2ed2cdcf09d60cc657a9d3f358b50a93abcb824d Mon Sep 17 00:00:00 2001
From: Jakub Skrzypnik <jot.skrzyp@gmail.com>
Date: Thu, 3 Mar 2016 21:28:37 +0100
Subject: [PATCH 245/338] libconfig: 1.4.9 -> 1.5

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

diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix
index d6c238ff179..ff9cd25293a 100644
--- a/pkgs/development/libraries/libconfig/default.nix
+++ b/pkgs/development/libraries/libconfig/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libconfig-${version}";
-  version = "1.4.9";
+  version = "1.5";
 
   src = fetchurl {
     url = "http://www.hyperrealm.com/libconfig/${name}.tar.gz";
-    sha256 = "0h9h8xjd36lky2r8jyc6hw085xwpslf0x6wyjvi960g6aa99gj09";
+    sha256 = "e31daa390d8e4461c8830512fe2e13ba1a3d6a02a2305a02429eec61e68703f6";
   };
 
   meta = with stdenv.lib; {

From 6cf6c3fbc9f03acb5a6711dd034b87d7b4174565 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 3 Mar 2016 21:31:00 +0100
Subject: [PATCH 246/338] nixos: Fix build of manual

Broken by 17389e256fa1651d8577555ac8fe7aa23044f0e6.

The description attributes of mkOption are parsed by XSLT, so we can
create a DocBook manual out of it.

Unfortunately, the passwordHash option had a description which includes
a <password> placeholder which is recognized by DocBook XSL as a valid
start tag. So as there is obviously no </password>, the build of the
manual bailed out with a parsing error.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: devhell <"^"@regexmail.net>
---
 nixos/modules/services/networking/nntp-proxy.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix
index cd0889351a3..cfa662c7311 100644
--- a/nixos/modules/services/networking/nntp-proxy.nix
+++ b/nixos/modules/services/networking/nntp-proxy.nix
@@ -172,7 +172,8 @@ in
               default = null;
               example = "$6$GtzE7FrpE$wwuVgFYU.TZH4Rz.Snjxk9XGua89IeVwPQ/fEUD8eujr40q5Y021yhn0aNcsQ2Ifw.BLclyzvzgegopgKcneL0";
               description = ''
-                SHA-512 password hash (can be generated by 'mkpasswd -m sha-512 <password>')
+                SHA-512 password hash (can be generated by
+                <code>mkpasswd -m sha-512 &lt;password&gt;</code>)
               '';
             };
 

From 854b13dc001223b31d426255c2e6a5c4b0452087 Mon Sep 17 00:00:00 2001
From: Adam Bell <agbell@gmail.com>
Date: Thu, 3 Mar 2016 16:11:32 -0500
Subject: [PATCH 247/338] pgadmin 1.20.0 -> 1.22.1

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

diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index bace31b1b1a..55db70c1d24 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pgadmin3-${version}";
-  version = "1.20.0";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz";
-    sha256 = "133bcbx9a322adldd1498h8bn2wfk45v1sbj9269jylwda1dfwq7";
+    sha256 = "0gkqpj8cg6jd6yhssrij1cbh960rg9fkjbdzcpryi6axwv0ag7ki";
   };
 
   buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];

From 7f26d6edf59d022466541608ca897c099484ecbc Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Fri, 4 Mar 2016 01:22:00 +0100
Subject: [PATCH 248/338] guitarix: 0.33 -> 0.34

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

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index d04af37560f..7af7fbb4a25 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gettext, intltool, pkgconfig, python
 , avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, libjack2
 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
-,  zita-convolver, zita-resampler
+, webkitgtk2, zita-convolver, zita-resampler
 , optimizationSupport ? false # Enable support for native CPU extensions
 }:
 
@@ -11,11 +11,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.33.0";
+  version = "0.34.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
-    sha256 = "1w6dg2n0alfjsx1iy6s53783invygwxk11p1i65cc3nq3zlidcgx";
+    sha256 = "0pamaq8iybsaglq6y1m1rlmz4wgbs2r6m24bj7x4fwg4grjvzjl8";
   };
 
   nativeBuildInputs = [ gettext intltool pkgconfig python ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     avahi bluez boost eigen fftw glib glibmm gtk gtkmm libjack2
     ladspaH librdf libsndfile lilv lv2 serd sord sratom
-    zita-convolver zita-resampler
+    webkitgtk2 zita-convolver zita-resampler
   ];
 
   configureFlags = [

From 507ad9a4f92df8c324ee23d49a817b12968c77ca Mon Sep 17 00:00:00 2001
From: Martin Sturm <mstrm@openmailbox.org>
Date: Tue, 29 Sep 2015 20:08:53 +0200
Subject: [PATCH 249/338] clamav: Use freshclam.conf defined by clamav-updater
 module if enabled

---
 nixos/modules/services/security/clamav.nix | 11 ++++++-----
 pkgs/tools/security/clamav/default.nix     |  5 ++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index 548aee29b26..e4e5c1253b7 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -16,6 +16,7 @@ let
 
     ${cfg.daemon.extraConfig}
   '';
+  pkg = pkgs.clamav.override { freshclamConf = cfg.updater.config; };
 in
 {
   options = {
@@ -54,7 +55,7 @@ in
   };
 
   config = mkIf cfg.updater.enable or cfg.daemon.enable {
-    environment.systemPackages = [ pkgs.clamav ];
+    environment.systemPackages = [ pkg ];
     users.extraUsers = singleton {
       name = clamavUser;
       uid = config.ids.uids.clamav;
@@ -76,7 +77,7 @@ in
 
     systemd.services.clamd = mkIf cfg.daemon.enable {
       description = "ClamAV daemon (clamd)";
-      path = [ pkgs.clamav ];
+      path = [ pkg ];
       after = [ "network.target" "freshclam.service" ];
       requires = [ "freshclam.service" ];
       wantedBy = [ "multi-user.target" ];
@@ -87,7 +88,7 @@ in
         chown ${clamavUser}:${clamavGroup} ${runDir}
       '';
       serviceConfig = {
-        ExecStart = "${pkgs.clamav}/bin/clamd --config-file=${clamdConfigFile}";
+        ExecStart = "${pkg}/bin/clamd --config-file=${clamdConfigFile}";
         Type = "forking";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         Restart = "on-failure";
@@ -100,13 +101,13 @@ in
       description = "ClamAV updater (freshclam)";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.clamav ];
+      path = [ pkg ];
       preStart = ''
         mkdir -m 0755 -p ${stateDir}
         chown ${clamavUser}:${clamavGroup} ${stateDir}
       '';
       serviceConfig = {
-        ExecStart = "${pkgs.clamav}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
+        ExecStart = "${pkg}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         Restart = "on-failure";
         RestartSec = "10s";
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index efb72783391..0a172935bb5 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl
-, libmilter, pcre }:
+, libmilter, pcre, freshclamConf ? null }:
+
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
   version = "0.99";
@@ -24,6 +25,8 @@ stdenv.mkDerivation rec {
     "--disable-clamav"
   ];
 
+  fixupPhase = if (freshclamConf != null) then ''echo "${freshclamConf}" > $out/etc/freshclam.conf'' else "";
+
   meta = with stdenv.lib; {
     homepage = http://www.clamav.net;
     description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats";

From baa7f92c3d46b41e4c3028d47d56dc976c8d32d5 Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Fri, 4 Mar 2016 00:17:13 -0500
Subject: [PATCH 250/338] minecraft-server: 1.8.8 -> 1.9

---
 pkgs/games/minecraft-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 82f826556f5..31e5683abc9 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "minecraft-server-${version}";
-  version = "1.8.8";
+  version = "1.9";
 
   src  = fetchurl {
     url    = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
-    sha256 = "07pkdb8cnfnn8zywnhplpcdh9lrxdx8nmsgjarplf2akvhhggbir";
+    sha256 = "0z9sgnal55ari1dj4vac975wi9gk5hq30nhkw8155xbi1ksrg9rq";
   };
 
   installPhase = ''

From 6fb855675203d390415187f60f36825a62b6c5e9 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 4 Mar 2016 09:22:34 +0100
Subject: [PATCH 251/338] click-log: 0.1.1 -> 0.1.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25ba60f69bf..bc11ba09d0d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3005,12 +3005,12 @@ in modules // {
   };
 
   click-log = buildPythonPackage rec {
-    version = "0.1.1";
+    version = "0.1.3";
     name = "click-log-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/click-log/${name}.tar.gz";
-      sha256 = "1z3jdwjmwax159zrnyx830xa968rfqrpkm04ad5xqyh0269ydiqb";
+      sha256 = "0kdd1vminxpcfczxl2kkf285n0dr1gxh2cdbx1p6vkj7b7bci3gx";
     };
 
     propagatedBuildInputs = with self; [ click ];

From b219052bf1e8c78b449f7ec0edc0303f55708293 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 4 Mar 2016 07:24:04 +0100
Subject: [PATCH 252/338] menhir: 20151112 -> 20160303

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

diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index 3841027b896..16bdc17f578 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib
-, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20151112" else "20140422"
+, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20160303" else "20140422"
 }@args:
 
 let
   sha256 =
   if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
-  else if version == "20151112" then "0fhfs96gxnj920h5ydsg7c1qypsbrlzqfn2cqzrg9rfj1qq6wq86"
+  else if version == "20160303" then "1q57x81483xkvbx6bqjx31d4c4lpy9fs3y7h3l8azrs9yi7r6c63"
   else throw ("menhir: unknown version " ++ version);
 in
 

From 014a30da93e370b785e4283630a43c3d12e48ee5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 4 Mar 2016 07:29:28 +0100
Subject: [PATCH 253/338] why3: 0.86.2 -> 0.86.3

And merge with ocamlPackages.why3
(the OCaml library would not work correctly if packaged separately).
---
 .../science/logic/why3/default.nix            | 15 ++++++++-----
 .../ocaml-modules/why3/default.nix            | 21 -------------------
 pkgs/top-level/all-packages.nix               |  4 ----
 3 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/why3/default.nix

diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 0313467ed78..0eb51ff1620 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -2,15 +2,20 @@
 
 stdenv.mkDerivation rec {
   name    = "why3-${version}";
-  version = "0.86.2";
+  version = "0.86.3";
 
   src = fetchurl {
-    url    = https://gforge.inria.fr/frs/download.php/file/35214/why3-0.86.2.tar.gz;
-    sha256 = "08sa7dmp6yp29xn0m6h98nic4q47vb4ahvaid5drwh522pvwvg10";
+    url    = https://gforge.inria.fr/frs/download.php/file/35537/why3-0.86.3.tar.gz;
+    sha256 = "0sph6i4ga9450bk60wpm5cq3psw3g8xprnac7yjfq64iqz1dyz03";
   };
 
-  buildInputs = with ocamlPackages;
-    [ coq coq.camlp5 ocaml findlib lablgtk ocamlgraph zarith menhir ];
+  buildInputs = (with ocamlPackages; [
+      ocaml findlib lablgtk ocamlgraph zarith menhir ]) ++
+    stdenv.lib.optionals (ocamlPackages.ocaml == coq.ocaml ) [
+      coq coq.camlp5
+    ];
+
+  installTargets = [ "install" "install-lib" ];
 
   meta = with stdenv.lib; {
     description = "A platform for deductive program verification";
diff --git a/pkgs/development/ocaml-modules/why3/default.nix b/pkgs/development/ocaml-modules/why3/default.nix
deleted file mode 100644
index 3ce0f8bdfac..00000000000
--- a/pkgs/development/ocaml-modules/why3/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, ocaml, findlib, zarith, menhir, why3 }:
-
-let ocaml-version = stdenv.lib.getVersion ocaml; in
-
-assert stdenv.lib.versionAtLeast ocaml-version "4.01";
-
-stdenv.mkDerivation {
-  name = "ocaml-${why3.name}";
-
-  inherit (why3) src;
-
-  buildInputs = [ ocaml findlib zarith menhir ];
-
-  installTargets = "install-lib";
-
-  meta = {
-    inherit (why3.meta) license homepage;
-    platforms = ocaml.meta.platforms;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e45a7466aaf..4aaaaf2ae1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5042,10 +5042,6 @@ let
 
     vg = callPackage ../development/ocaml-modules/vg { };
 
-    why3 = callPackage ../development/ocaml-modules/why3 {
-      why3 = pkgs.why3;
-    };
-
     x509 = callPackage ../development/ocaml-modules/x509 { };
 
     xmlm = callPackage ../development/ocaml-modules/xmlm { };

From 92e86f03b0e51bba567b7a7c0bb1295335847070 Mon Sep 17 00:00:00 2001
From: "Bruno Bzeznik Bruno.Bzeznik@imag.fr" <Bruno.Bzeznik@imag.fr>
Date: Thu, 3 Mar 2016 20:39:59 +0100
Subject: [PATCH 254/338] taktuk: init at 3.7.5

---
 .../networking/cluster/taktuk/default.nix     | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/taktuk/default.nix

diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix
new file mode 100644
index 00000000000..79e0a6ec207
--- /dev/null
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, perl , openssh}:
+
+stdenv.mkDerivation rec {
+  version = "3.7.5";
+  name = "taktuk-${version}";
+
+  buildInputs = [ perl ];
+
+  src = fetchurl {
+    url = "https://gforge.inria.fr/frs/download.php/33412/${name}-3.7.5.tar.gz";
+    sha256 = "d96ef6c63d77f32339066f143ef7e0bc00041e10724254bf15787746ad1f1070";
+  };
+
+  preBuild = ''
+      substituteInPlace ./taktuk --replace "/usr/bin/perl" "${perl}/bin/perl"
+  '';
+
+  meta = {
+    description = "Efficient, large scale, parallel remote execution of commands";
+    longDescription = ''
+      TakTuk allows one to execute commands in parallel on a potentially large set
+      of remote nodes (using ssh to connect to each node). It is typically used
+      inside high performance computing clusters and grids. It uses an adaptive
+      algorithm to efficiently distribute the work and sets up an interconnection
+      network to transport commands and perform I/Os multiplexing. It doesn't
+      require any specific software on the nodes thanks to a self-propagation
+      algorithm.'';
+    homepage = http://taktuk.gforge.inria.fr/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.bzizou ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df56303c774..9227cfe0210 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5451,6 +5451,8 @@ let
 
   supercollider_scel = supercollider.override { useSCEL = true; };
 
+  taktuk = callPackage ../applications/networking/cluster/taktuk { };
+
   tcl = tcl-8_6;
   tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
   tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };

From 95f22a6fb5a86be81a32583c0c356fa060917a1c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 4 Mar 2016 10:30:42 +0100
Subject: [PATCH 255/338] pkgs.taktuk: fix remote url

---
 pkgs/applications/networking/cluster/taktuk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix
index 79e0a6ec207..313e1af707b 100644
--- a/pkgs/applications/networking/cluster/taktuk/default.nix
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl ];
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/33412/${name}-3.7.5.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz";
     sha256 = "d96ef6c63d77f32339066f143ef7e0bc00041e10724254bf15787746ad1f1070";
   };
 

From c7759dd8a088bd03fd9acbac3f6d397b42db0f35 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Fri, 4 Mar 2016 10:32:17 +0100
Subject: [PATCH 256/338] nodejs: 5.7.0 -> 5.7.1

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

diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index c5bc3311503..185ad61680b 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -7,7 +7,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "5.7.0";
+  version = "5.7.1";
 
   deps = {
     inherit openssl zlib libuv;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "1n6jvvf3jfmv7fjd64c5jajjapsmc8gr6rlw113vgys55xmb8f13";
+    sha256 = "16016cjycg0filh15nqfh3k1fdw3kaykl87xf8dnzf666mirbm7c";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From def18c2408809a6859ef37bf649bef560c75ae6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Mar 2016 10:27:38 +0100
Subject: [PATCH 257/338] hackage-packages.nix: update Haskell package set

This commit enables all haskellPackages builds so that we can discover builds
that have been fixed recently.

This update was generated by hackage2nix v20151217-12-g567601b using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/a67868f0602d13d13e2f21ffb43dac37910bb65e
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/1c84c94e147ab380bb0e954d13fd248238eb72b3
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/d2ad5fe9030deeacf1ed9c9de9045c65e597ca76
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/c1be20cfc01ee9f7431bc71f4377896ab2f352d2
---
 .../configuration-hackage2nix.yaml            | 3839 --------
 .../haskell-modules/configuration-lts-0.0.nix |    9 +
 .../haskell-modules/configuration-lts-0.1.nix |    9 +
 .../haskell-modules/configuration-lts-0.2.nix |    9 +
 .../haskell-modules/configuration-lts-0.3.nix |    9 +
 .../haskell-modules/configuration-lts-0.4.nix |    9 +
 .../haskell-modules/configuration-lts-0.5.nix |    9 +
 .../haskell-modules/configuration-lts-0.6.nix |    9 +
 .../haskell-modules/configuration-lts-0.7.nix |    9 +
 .../haskell-modules/configuration-lts-1.0.nix |    9 +
 .../haskell-modules/configuration-lts-1.1.nix |    9 +
 .../configuration-lts-1.10.nix                |    9 +
 .../configuration-lts-1.11.nix                |    9 +
 .../configuration-lts-1.12.nix                |    9 +
 .../configuration-lts-1.13.nix                |    9 +
 .../configuration-lts-1.14.nix                |   10 +
 .../configuration-lts-1.15.nix                |   10 +
 .../haskell-modules/configuration-lts-1.2.nix |    9 +
 .../haskell-modules/configuration-lts-1.4.nix |    9 +
 .../haskell-modules/configuration-lts-1.5.nix |    9 +
 .../haskell-modules/configuration-lts-1.7.nix |    9 +
 .../haskell-modules/configuration-lts-1.8.nix |    9 +
 .../haskell-modules/configuration-lts-1.9.nix |    9 +
 .../haskell-modules/configuration-lts-2.0.nix |   10 +
 .../haskell-modules/configuration-lts-2.1.nix |   10 +
 .../configuration-lts-2.10.nix                |   11 +
 .../configuration-lts-2.11.nix                |   11 +
 .../configuration-lts-2.12.nix                |   11 +
 .../configuration-lts-2.13.nix                |   11 +
 .../configuration-lts-2.14.nix                |   11 +
 .../configuration-lts-2.15.nix                |   11 +
 .../configuration-lts-2.16.nix                |   11 +
 .../configuration-lts-2.17.nix                |   12 +
 .../configuration-lts-2.18.nix                |   12 +
 .../configuration-lts-2.19.nix                |   12 +
 .../haskell-modules/configuration-lts-2.2.nix |   10 +
 .../configuration-lts-2.20.nix                |   12 +
 .../configuration-lts-2.21.nix                |   12 +
 .../configuration-lts-2.22.nix                |   12 +
 .../haskell-modules/configuration-lts-2.3.nix |   10 +
 .../haskell-modules/configuration-lts-2.4.nix |   10 +
 .../haskell-modules/configuration-lts-2.5.nix |   10 +
 .../haskell-modules/configuration-lts-2.6.nix |   11 +
 .../haskell-modules/configuration-lts-2.7.nix |   11 +
 .../haskell-modules/configuration-lts-2.8.nix |   11 +
 .../haskell-modules/configuration-lts-2.9.nix |   11 +
 .../haskell-modules/configuration-lts-3.0.nix |   14 +
 .../haskell-modules/configuration-lts-3.1.nix |   14 +
 .../configuration-lts-3.10.nix                |   15 +
 .../configuration-lts-3.11.nix                |   15 +
 .../configuration-lts-3.12.nix                |   15 +
 .../configuration-lts-3.13.nix                |   15 +
 .../configuration-lts-3.14.nix                |   15 +
 .../configuration-lts-3.15.nix                |   16 +
 .../configuration-lts-3.16.nix                |   16 +
 .../configuration-lts-3.17.nix                |   16 +
 .../configuration-lts-3.18.nix                |   16 +
 .../configuration-lts-3.19.nix                |   16 +
 .../haskell-modules/configuration-lts-3.2.nix |   14 +
 .../configuration-lts-3.20.nix                |   16 +
 .../configuration-lts-3.21.nix                |   16 +
 .../configuration-lts-3.22.nix                |   16 +
 .../haskell-modules/configuration-lts-3.3.nix |   14 +
 .../haskell-modules/configuration-lts-3.4.nix |   14 +
 .../haskell-modules/configuration-lts-3.5.nix |   14 +
 .../haskell-modules/configuration-lts-3.6.nix |   14 +
 .../haskell-modules/configuration-lts-3.7.nix |   14 +
 .../haskell-modules/configuration-lts-3.8.nix |   14 +
 .../haskell-modules/configuration-lts-3.9.nix |   14 +
 .../haskell-modules/configuration-lts-4.0.nix |   16 +
 .../haskell-modules/configuration-lts-4.1.nix |   16 +
 .../haskell-modules/configuration-lts-4.2.nix |   18 +
 .../haskell-modules/configuration-lts-5.0.nix |   19 +-
 .../haskell-modules/configuration-lts-5.1.nix |   20 +-
 .../haskell-modules/configuration-lts-5.2.nix |   21 +-
 .../haskell-modules/configuration-lts-5.3.nix |   21 +-
 .../haskell-modules/configuration-lts-5.4.nix |   21 +-
 .../haskell-modules/configuration-lts-5.5.nix | 7746 +++++++++++++++++
 .../haskell-modules/hackage-packages.nix      | 5459 +++---------
 79 files changed, 9917 insertions(+), 8075 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.5.nix

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7368f639c72..5ff2f60a7de 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -145,3842 +145,3 @@ dont-distribute-packages:
   yices-painless:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
 
   # soft restrictions because of build errors
-  3d-graphics-examples:                         [ x86_64-darwin ]
-  3dmodels:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  4Blocks:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  abcBridge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  abc-puzzle:                                   [ x86_64-darwin ]
-  abstract-par-accelerate:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-BuildPlatform:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accelerate-arithmetic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accelerate-fourier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accelerate-utility:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accentuateus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  access-time:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-EasyRaster-GTK:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-HalfInteger:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acid-state-dist:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acme-hq9plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ACME:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acme-inator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acme-numbersystem:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acme-schoenfinkel:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acme-zero:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-MiniTest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-Terminal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ActionKid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  activehs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  actor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-VanillaArray:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Adaptive-Blaisorblade:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adaptive-containers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Adaptive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adaptive-tuple:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adblock2privoxy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adhoc-network:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adict:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adobe-swatch-exchange:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ADPfusion:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adp-multi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adp-multi-monadiccp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Advgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-Basics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-Net:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-Real-Double:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-Real:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-Real-Interval:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-RnToRm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-RnToRm-Plot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-bson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-native:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-smart:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  afv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Agata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  agda-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AGI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AhoCorasick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  airbrake:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aivika-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ajhc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alea:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  al:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AlignmentAlgorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Allure:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alms:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alpha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alpino-tools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alsa-core:                                    [ x86_64-darwin ]
-  alsa-gui:                                     [ x86_64-darwin ]
-  alsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alsa-midi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alsa-mixer:                                   [ x86_64-darwin ]
-  alsa-pcm-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alsa-pcm:                                     [ x86_64-darwin ]
-  alsa-seq-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alsa-seq:                                     [ x86_64-darwin ]
-  altfloat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alure:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ALUT:                                         [ x86_64-darwin ]
-  amazon-emailer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-ec2:                                 [ i686-linux ]
-  amazonka-rds:                                 [ i686-linux ]
-  amazonka-s3:                                  [ i686-linux ]
-  amazonka-sqs:                                 [ i686-linux ]
-  amazonka-swf:                                 [ i686-linux ]
-  amazon-products:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AMI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ampersand:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  anansi-pandoc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  anatomy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  android-lint-summary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AndroidViewHierarchyImporter:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Animas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  antfarm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  anticiv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  antigate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  antimirov:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  antlrc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  anydbm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aosd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apelsin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apiary-helics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apiary-purescript:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  api-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apotiki:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  appc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  app-lens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ApplePush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AppleScript:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  archiver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  archlinux:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  argon2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  argparser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arguedit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ariadne:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arith-encode:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arithmetic:                                   [ i686-linux ]
-  arithmoi:                                     [ i686-linux ]
-  armada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  array-forth:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ArrayRef:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arrowapply-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arrow-improve:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arrowp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ArrowVHDL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ascii85-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  asic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  asil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AspectAG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  assimp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  astview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  async-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atlassian-connect-core:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atlassian-connect-descriptor:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atom-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atomic-primops-foreign:                       [ x86_64-darwin ]
-  atomic-primops-vector:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atomo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AttoJson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  attoparsec-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  attoparsec-iteratee:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  attoparsec-text-enumerator:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  attoparsec-text:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Attrac:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atuin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  audiovisual:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  augeas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  augur:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Aurochs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  authoring:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AutoForms:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  autoproc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  avahi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  avers:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AvlTree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  awesomium-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  awesomium:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  awesomium-raw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-configuration-tools:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-dynamodb-streams:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-elastic-transcoder:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-general:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-kinesis-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-kinesis:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-kinesis-reshard:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-lambda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-performance-tests:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-sdk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  azure-service-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  azurify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  babylon:                                      [ x86_64-darwin ]
-  backdropper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Baggins:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo-launcher:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo-plugin-highlight:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo-plugin-photo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo-theme-blueprint:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo-theme-mini-html5:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamse:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barchart:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barcodes-code128:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barley:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Barracuda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barrie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  base32-bytestring:                            [ x86_64-darwin ]
-  BASIC:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  baskell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  battleships:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bayes-stack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BCMtools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  beamable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  beautifHOL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bed-and-breakfast:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Befunge93:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bein:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  berkeleydb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BerkeleyDBXML:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  berp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bet:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bgzf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bidirectionalization-combined:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bidispec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BigPixel:                                     [ x86_64-darwin ]
-  billboard-parser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  billeksah-forms:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  billeksah-main:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  billeksah-pane:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  billeksah-services:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-file:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-indexed-tree:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-protocol-zmq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-search:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-strict:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binding-gtk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-apr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-apr-util:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-audiofile:                           [ x86_64-darwin ]
-  bindings-bfd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-cctools:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-codec2:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-common:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-dc1394:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-directfb:                            [ x86_64-darwin ]
-  bindings-eskit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-EsounD:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-fann:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-fluidsynth:                          [ x86_64-darwin ]
-  bindings-friso:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-GLFW:                                [ x86_64-darwin ]
-  bindings-gsl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-gts:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-hdf5:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-K8055:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-libcddb:                             [ x86_64-darwin ]
-  bindings-libftdi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-librrd:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-libstemmer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-libv4l2:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-libzip:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-linux-videodev2:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-lxc:                                 [ x86_64-darwin ]
-  bindings-mpdecimal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-portaudio:                           [ x86_64-darwin ]
-  bindings-ppdev:                               [ x86_64-darwin ]
-  bindings-sane:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-sc3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-sipc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-svm:                                 [ x86_64-darwin ]
-  binding-wx:                                   [ x86_64-darwin ]
-  bind-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binembed-example:                             [ x86_64-darwin ]
-  BiobaseBlast:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseDotP:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseFasta:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseFR3D:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Biobase:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseInfernal:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseMAF:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseTrainingData:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseTurner:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseVienna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  biohazard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bioinformatics-toolkit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  biosff:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  biostockholm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bird:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BirdPP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bit-array:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitcoin-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitly-cli:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Bitly:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitmap-opengl:                                [ x86_64-darwin ]
-  bits-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bits-extras:                                  [ x86_64-darwin ]
-  bitspeak:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bittorrent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitvec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bit-vector:                                   [ i686-linux ]
-  bkr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  black-jewel:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bla:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blakesum-demo:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blakesum:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blank-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blas-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blas:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blaze-html-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blaze-html-hexpat:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blazeMarker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blaze-textual-native:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Blobs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bloodhound:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bloxorz:                                      [ x86_64-darwin ]
-  blubber:                                      [ x86_64-darwin ]
-  Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bluetile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BNFC:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Bookshelf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  boolsimplifier:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  borel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Bravo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  breakout:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  brians-brain:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  brillig:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  broker-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bsd-sysctl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bson-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bson-mapping:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  btree-concurrent:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  btrfs:                                        [ x86_64-darwin ]
-  buffer-builder-aeson:                         [ i686-linux ]
-  buffer-builder-aeson:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buffer-builder:                               [ i686-linux ]
-  buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buildbox-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buildwrapper:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bullet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buster-gtk:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buster-network:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bustle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  butterflies:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-arbitrary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-class:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestringparser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestringreadp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-short:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2arch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2doap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2spec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-constraints:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-debian:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-dev:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-graphdeps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalgraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-install-bundle:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-install-ghc72:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-install-ghc74:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalmdvrpm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-query:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalrpmdeps:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-upload:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabocha:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cake3:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cakyrespa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cal3d-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cal3d:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cal3d-opengl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  calc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  caldims:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  caledon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  call-haskell-from-anything:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  call:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  campfire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cantor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Capabilities:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  capri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  carboncopy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings-control:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings-core:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings-internal:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings-ipopt-interface:              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings-snopt-interface:              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Cascade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cascading:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cassandra-thrift:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cassava-streams:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cassy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casui:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Catana:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  catch-fd:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  categorical-algebra:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  category-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CBOR:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont-alt:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont-cxe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont-exc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont-ref:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont-ref-tf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cci:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cctools-workqueue:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cedict:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ceilometer-common:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cereal-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cereal-ieee754:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cereal-plus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  certificate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cfipu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cflp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cfopu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cgen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cg:                                           [ i686-linux ]
-  cgi-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chalkboard:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chalkboard-viewer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  charade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  charsetdetect-ae:                             [ x86_64-darwin ]
-  charsetdetect:                                [ x86_64-darwin ]
-  chatter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  check-pvp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chell-hunit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chevalier-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Chitra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chp-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chp-plus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chp-spec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chp-transformers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ChristmasTree:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chuchu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chunks:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cil:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cinvoke:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  c-io:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ciphersaber2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  citation-resolve:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  citeproc-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  citeproc-hs-pandoc-filter:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cityhash:                                     [ x86_64-darwin ]
-  cjk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clafer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  claferIG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  claferwiki:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CLASE:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clash-prelude-quickcheck:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ClassLaws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ClassyPrelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks-plugin-bugs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks-theme-geo-bootstrap:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cld2:                                         [ x86_64-darwin ]
-  Clean:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clevercss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  click-clack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clifford:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clippings:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clocked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clogparse:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clone-all:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cloudfront-signer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cloud-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cloudyfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clua:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cluss:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clustertools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clutterhs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cmath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cmathml3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CMCompare:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cmdargs-browser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cmdtheline:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cnc-spec-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Coadjute:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Codec-Image-DevIL:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  codec-libevent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  codecov-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  codemonitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  codepad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cognimeta-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coinbase-exchange:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  colada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collada-output:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collada-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collections-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collections-base-instances:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collections:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coltrane:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinat-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinatorial-problems:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinator-interactive:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Combinatorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Commando:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  commodities:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  commsec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  commsec-keyexchange:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  comonad-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  comonad-random:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compact-map:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compact-string:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compilation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  complexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compose-ltr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compose-trans:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compstrat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  comptrans:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  computational-algebra:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concraft-hr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concraft:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concraft-pl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concrete-typerep:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concurrent-state:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ConcurrentUtils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  condorcet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conductive-hsc3:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conduit-audio-lame:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conduit-audio-samplerate:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conduit-network-stream:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conduit-resumablesink:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Configger:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  config-select:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conjure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  consistent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  const-math-ghc-plugin:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  constructible:                                [ i686-linux ]
-  constructible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Consumer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  consumers:                                    [ x86_64-darwin ]
-  context-stack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  continue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  continuum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Contract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  control-event:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  control-monad-attempt:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  control-monad-failure:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  control-monad-failure-mtl:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Control-Monad-MultiPass:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Control-Monad-ST2:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  contstuff-monads-tf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  contstuff-transformers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  convertible-ascii:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  convertible-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  copilot-cbmc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  copilot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  copilot-sbv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  COrdering:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  corebot-bliki:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CoreFoundation:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  core-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  core:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Coroutine:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coroutine-iteratee:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  couchdb-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  couchdb-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CouchDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  couch-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  couch-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  court:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coverage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CPBrainfuck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cpio-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CPL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cplusplus-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cpuperf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cpython:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cqrs-postgresql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cqrs-sqlite3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cqrs-test:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Craft3e:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  craftwerk-cairo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  craftwerk-gtk:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  craftwerk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crc16:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crf-chain1-constrained:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crf-chain1:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crf-chain2-generic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crf-chain2-tiers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  criterion-plus:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crocodile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cron-compat:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cruncher-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crunghc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crypto-cipher-benchmarks:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cryptsy-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crystalfontz:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cse-ghc-plugin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  csound-catalog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  csp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cspmchecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CSPM-cspm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CSPM-FiringRules:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  css:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ctemplate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ctkl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ctpl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cubical:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cubicbezier:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cuboid:                                       [ x86_64-darwin ]
-  cudd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  curry-base:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CurryDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  curry-frontend:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cv-combinators:                               [ x86_64-darwin ]
-  CV:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cyclotomic:                                   [ i686-linux ]
-  cypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  daemons:                                      [ i686-linux ]
-  DAG-Tournament:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dangerous:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dapi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-benchmark:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-beta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-buildpackage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-cabalized:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcsden:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-fastconvert:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DarcsHelpers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-monitor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcswatch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darkplaces-demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-cycle:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-dispersal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  datadog:                                      [ i686-linux ]
-  data-easy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-ivar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-lens-ixset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  datalog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-named:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-nat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-object-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-object-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-quotientref:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Data-Rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-store:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DataTreeView:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dbjava:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dbus-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dbus-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DBus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dclabel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-build:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core-eval:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core-flow:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core-llvm:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core-salt:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core-simpl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core-tetra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-driver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddci-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-source-tetra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dead-simple-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  decepticons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DecisionTree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  decoder-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dedukti:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deeplearning-hs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deepseq-bounded:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deepseq-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deepzoom:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  defargs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DefendTheKing:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-base:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-filesystem:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-graphics:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-reactive:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-sound:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deka-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  delicious:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  delta-h:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  delta:                                        [ x86_64-darwin ]
-  demarcate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  denominate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  depends:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dephd:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dequeue:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derangement:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derivation-trees:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derive-gadt:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derive-IG:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derive-topdown:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derive-trie:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derp-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  devil:                                        [ x86_64-darwin ]
-  dewdrop:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dflow:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dfsbuild:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dgim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dgs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-canvas:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-hsqml:                               [ x86_64-darwin ]
-  diagrams-pdf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-pgf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-tikz:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dice-entropy-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dictparser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diffcabal:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DifferenceLogic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DifferentialEvolution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-hsp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DimensionalHash:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dingo-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dingo-example:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dingo-widgets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diophantine:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diplomacy-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  direct-binary-files:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  directed-cubical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  direct-fastcgi:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  direct-http:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  direct-plugins:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dirfiles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  discount:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  disjoint-set:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DisTract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-closure:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-azure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-client-server:            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-execution:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-platform:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-registry:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-supervisor:               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-task:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-zookeeper:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distribution:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distribution-plot:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  djinn-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DnaProteinAlignment:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dnscache:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dnssd:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  doccheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  docidx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dockercook:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  docker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  doc-review:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  doctest-discover-configurator:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  doctest-discover:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DocTest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DOM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dotfs:                                        [ x86_64-darwin ]
-  download:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  download-media-content:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dow:                                          [ x86_64-darwin ]
-  dph-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dph-lifted-base:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dph-lifted-copy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dph-lifted-vseg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dph-prim-par:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dph-prim-seq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DP:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dpkg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DPM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  drClickOn:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DrHylo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DrIFT-cabalized:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  drifter-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DrIFT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dropbox-sdk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dropsolve:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DSH:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dsh-sql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ds-kanren:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dsmc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dsmc-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DSTM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dstring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DTC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dtd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dtd-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dtd-types:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  duplo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dust-crypto:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dust:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dust-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dust-tools-pcap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dvda:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dvdread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-cabal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-object:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-plot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-pp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DynamicTimeWarp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynobud:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DysFRP-Cairo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DysFRP-Craftwerk:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  easy-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  easyjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  easyplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  easyrender:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ebnf-bff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ecdsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ecma262:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ecu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ed25519:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  edenmodules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  edenskel:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  edentv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  edge:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  edit-lenses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  editline:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EditTimeReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EEConfig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effective-aspects:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effective-aspects-mzv:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effect-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  egison-quote:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ehaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ehs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eibd-client-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eigen:                                        [ x86_64-darwin ]
-  EitherT:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ekg-rrd:                                      [ i686-linux ]
-  electrum-mnemonic:                            [ i686-linux ]
-  elerea-examples:                              [ x86_64-darwin ]
-  elerea-sdl:                                   [ x86_64-darwin ]
-  elm-init:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  emacs-keys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  email-header:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  email:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  embeddock-example:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  embeddock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  embroidery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  emgm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Emping:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Encode:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  enumerate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  enumeration:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  enumfun:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EnumMap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  enummapmap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  env-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  epanet-haskell:                               [ x86_64-darwin ]
-  epic:                                         [ x86_64-darwin ]
-  epoll:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  epubname:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Eq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eros-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  error-message:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ersatz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ersatz-toysat:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  esotericbot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EsounD:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  estimators:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  estreps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Etage-Graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Etage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EtaMOO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Eternal10Seconds:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eternal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Etherbunny:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ethereum-client-haskell:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ethereum-merkle-patricia-db:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  euphoria:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eurofxref:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Euterpea:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  event-driven:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eventloop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  event-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EventSocket:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  every-bit-counts:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ewe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exists:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  expat-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  explain:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  explicit-sharing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  explore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exposed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exp-pairs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  extended-categories:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ez-couch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  faceted:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  factory:                                      [ i686-linux ]
-  factory:                                      [ x86_64-linux ]
-  factual-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FailureT:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fallingblocks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  falling-turnip:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  family-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  farmhash:                                     [ x86_64-darwin ]
-  fastbayes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fast-builder:                                 [ x86_64-darwin ]
-  fastirc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fast-tags:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fault-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fay-hsx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fcd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fckeditor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FComp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fdo-trash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed2lj:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed2twitter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed-cli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed-collect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed-translator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feldspar-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feldspar-language:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fenfire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FermatsLastMargin:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FerryCore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ffeed:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ffmpeg-light:                                 [ x86_64-darwin ]
-  ffmpeg-tutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fibon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fields:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FieldTrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fieldwise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  file-location:                                [ x86_64-darwin ]
-  FileManipCompat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FileManip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  file-modules:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  filesystem-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  filesystem-enumerator:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FileSystem:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Finance-Quote-Yahoo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Finance-Treasury:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  find-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FiniteMap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  firstify:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FirstOrderTheory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fishfood:                                     [ i686-linux ]
-  fishfood:                                     [ x86_64-linux ]
-  fit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fitsio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-point:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-point-vector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-point-vector-space:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-precision:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-storable-array:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fix-parser-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fix-symbols-gitit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flexiwrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flexiwrap-smallcheck:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flickr:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Flippi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flite:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  floating-bits:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flow2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flowdock-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flowdock:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flowdock-rest:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flowlocks-framework:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flowsim:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fltkhs-hello-world:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fluidsynth:                                   [ x86_64-darwin ]
-  FModExRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fold-debounce-conduit:                        [ x86_64-darwin ]
-  fold-debounce:                                [ x86_64-darwin ]
-  foldl-incremental:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foldl-transduce-attoparsec:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foldl-transduce:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  folds-common:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  folds:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  follower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  font-opengl-basic4x6:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  forbidden-fruit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fordo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  for-free:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FormalGrammars:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  formal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  format:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  format-status:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  formlets-hsp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  formlets:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  forml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ForSyDe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  forth-hll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foscam-sort:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Foster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fpco-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fpnla-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FractalArt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Fractaler:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  frag:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  franchise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Frank:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-functors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-game:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freekick2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freenect:                                     [ x86_64-darwin ]
-  free-operational:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freer:                                        [ i686-linux ]
-  freesect:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freesound:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-counterexamples:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-seq:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-seq-webui:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-webui:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FreeTypeGL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  friday-juicypixels:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  frp-arduino:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  frpnow-gloss:                                 [ x86_64-darwin ]
-  fs-events:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fswatcher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ftdi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FTGL-bytestring:                              [ x86_64-darwin ]
-  FTGL:                                         [ x86_64-darwin ]
-  ftp-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ftshell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  full-sessions:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fullstop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  full-text-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  funbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  functional-arrow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  function-combine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  functorm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FunGEn:                                       [ x86_64-darwin ]
-  funion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  funsat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  future:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fuzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fuzzytime:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fwgl-glfw:                                    [ x86_64-darwin ]
-  gact:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gameclock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Gamgine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Ganymede:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gbu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gc-monitoring-wai:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gdiff-ig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gdiff-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gearbox:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geek:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geek-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gelatin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gemstone:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gencheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gender:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genders:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  general-prelude:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GeneralTicTacToe:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  generators:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  generic-church:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genericserialize:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  generic-storable:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  generic-xml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genetics:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geniconvert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geni-gui:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GenI:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geniserver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geni-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GenSmsPdu:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GenussFold:                                   [ i686-linux ]
-  GenussFold:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GeocoderOpenCage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geoip2:                                       [ i686-linux ]
-  GeoIp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geom2d:                                       [ i686-linux ]
-  GeomPredicates-SSE:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geo-resolver:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  getemx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  getflag:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ggtsTC:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-dup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-events-parallel:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-exactprint:                               [ x86_64-darwin ]
-  ghci-diagrams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghci-haskeline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghclive:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-parmake:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-pkg-autofix:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-syb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ght:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-cairo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gdk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-javascriptcore:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-soup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-all:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-checklist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-date:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitdo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-gpush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-cross:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-s3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-repair:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-vte:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-webkit2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-webkit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glade:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gladexml-accessor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glapp:                                        [ x86_64-darwin ]
-  gl-capture:                                   [ x86_64-darwin ]
-  GLFW-b-demo:                                  [ x86_64-darwin ]
-  GLFW-b:                                       [ x86_64-darwin ]
-  GLFW-OGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GLFW-task:                                    [ x86_64-darwin ]
-  GLFW:                                         [ x86_64-darwin ]
-  GLHUI:                                        [ x86_64-darwin ]
-  glicko:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glider-nlp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GLMatrix:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  global:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glome-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GlomeTrace:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GlomeView:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-accelerate:                             [ x86_64-darwin ]
-  gloss-algorithms:                             [ x86_64-darwin ]
-  gloss-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-devil:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-examples:                               [ x86_64-darwin ]
-  gloss-game:                                   [ x86_64-darwin ]
-  gloss-juicy:                                  [ x86_64-darwin ]
-  gloss-raster:                                 [ x86_64-darwin ]
-  gloss-rendering:                              [ x86_64-darwin ]
-  gloss-sodium:                                 [ x86_64-darwin ]
-  gloss:                                        [ x86_64-darwin ]
-  GLURaw:                                       [ x86_64-darwin ]
-  GLUtil:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gluturtle:                                    [ x86_64-darwin ]
-  GLUT:                                         [ x86_64-darwin ]
-  gmap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gmndl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gnome-desktop:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gnome-keyring:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gnomevfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  g-npm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gnss-converters:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  goa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  goal-simulation:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gofer-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-html5-slide:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-mail-filters:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  googleplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GoogleSB:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-search:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GoogleTranslate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gopherbot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gpah:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GPipe-Collada:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GPipe-Examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GPipe-GLFW:                                   [ x86_64-darwin ]
-  GPipe-TextureLoad:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gps2htmlReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gpx-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GPX:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grammar-combinators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GrammarProducts:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-frp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-records:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-ui-gtk:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-ui:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Graph500:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphbuilder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GraphHammer-examples:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GraphHammer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphics-drawingcombinators:                  [ x86_64-darwin ]
-  graphics-formats-collada:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphicsFormats:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphicstools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-cl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-gl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-lambdascope:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-layout:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-ski:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-strategies:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-trs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-ww:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphtype:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  greencard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  greencard-lib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  greg-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gremlin-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Grempa:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gridland:                                     [ x86_64-darwin ]
-  grm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Grow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GrowlNotify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gruff-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gruff:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gsl-random-fu:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gsl-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gsmenu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gstreamer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GTALib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-glade:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-gnomevfs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-gtkglext:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-gtk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Gtk2hsGenerics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-rpn:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk3-mac-integration:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtkglext:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GtkGLTV:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtkimageview:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtkrsync:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-serialized-event:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-toy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  guess-combinator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GuiHaskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GuiTV:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hach:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-happstack-server:               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-mongrel2-http:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-warp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-interface-wai:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage2hwn:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage2twitter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-proxy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-repo-tool:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-security-HTTP:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-security:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-sparks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-contrib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-contrib-press:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackernews:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-frontend-happstack:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-epoll:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-evhttp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-fastcgi:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-happstack:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-hyena:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-kibro:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-simpleserver:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HackMail:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-middleware-cleanpath:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-middleware-clientsession:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-middleware-jsonp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hactor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haddock-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haggis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Haggressive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haiji:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hairy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakaru:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakismet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-blaze-templates:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-contrib:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-contrib-links:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-convert:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-R:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  halberd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaLeX:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  halfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  halipeto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hampp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hamtmap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hamusic:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  handsy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hannahci:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haphviz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happindicator3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happindicator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happraise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HAppS-Data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happs-hsp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happs-hsp-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HAppS-IxSet:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HAppS-Server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HAppS-State:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-auth:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-contrib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-data:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-dlg:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-facebook:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-fay:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-heist:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-helpers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-ixset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-monad-peel:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-plugins:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-state:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-util:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-yui:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happs-tutorial:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HAppS-Util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happybara:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happybara-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happybara-webkit-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  harchive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hardware-edsl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaRe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hark:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HARM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  harmony:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HarmTrace-Base:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HarmTrace:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haroonga-httpd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haroonga:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat-lib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat-setup:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat-system:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Haschoo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HasGP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hashable-generics:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hashed-storage:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hashell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hashids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  has:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasim:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskakafka:                                   [ x86_64-darwin ]
-  haskanoid:                                    [ x86_64-darwin ]
-  haskarrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskeem:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskeline-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell2010:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell98:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-aliyun:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-awk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-bcrypt:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-brainfuck:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-cnc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-course-preludes:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-catchio-mtl:           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-catchio-tf:            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-catchio-transformers:  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-lifted:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-dynamic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hdbc-mysql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-mysql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-odbc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-postgresql:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-sqlite3:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-wx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-formatter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-ftp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-generate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-in-space:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellLM:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-names:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellNN:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Haskelloids:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-openflow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-pdf-presenter:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-platform-test:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-plot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-reflect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-rules:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskellscrabble:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-src-meta-mwotton:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-token-utils:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-tor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellTorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-type-exts:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-tyrant:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-xmpp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskgame:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskheap:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskhol-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hask-home:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hask:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-crypto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-node:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-protocol:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-script:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-util:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-wallet:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoon-httpspec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoon-salvia:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskore-realtime:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskore-supercollider:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskore-synthesizer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasloGUI:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haslo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasparql-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-pool:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-postgres:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-postgres-options:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-transaction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haste-perch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  has-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hatex-guide:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaTeX-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haverer:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaVSA:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hawitter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hawk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haxparse:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hayland:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hayoo-cli:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hayoo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hback:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hbayes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hbb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hBDD-CMUBDD:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hBDD-CUDD:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hbeat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hblas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hblock:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  h-booru:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hbro:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hburg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HCard:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hcheat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hchesslib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HCL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hcron:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hCsound:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hcube:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hcwiid:                                       [ x86_64-darwin ]
-  hdaemonize-buildfix:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HDBC-mysql:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbi-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbi-postgresql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbi-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbi-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hDFA:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdigest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdirect:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdis86:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdiscount:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdph-closure:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HDRUtils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hecc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hedi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hedn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  heist-aeson:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  helics:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  helics-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  helium:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hellage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hellnet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  helm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hemkay:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  henet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hen:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hepevt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HERA:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  herbalizer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  her-lexer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  her-lexer-parsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hermes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hermit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hermit-syb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  herringbone-embed:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  herringbone:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  herringbone-wai:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hesql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hetris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  heukarya:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hevolisa-dph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hevolisa:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexpat-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexpat-pickle-generic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexquote:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hF2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hfann:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hfd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hfiar:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hfmt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hfoil:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hfractal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HFrequencyQueue:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HFuse:                                        [ x86_64-darwin ]
-  hfusion:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgalib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-API:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Audio:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Bullet-Binding:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-CAudio-Binding:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-CEGUI-Binding:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Common:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Data:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Enet-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Graphics3D:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-GUI:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-InputSystem:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Network:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Ogre-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-OIS-Binding:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-SDL2-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-SFML-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-WinEvent:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Wire:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hg-buildpackage:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgeometric:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgeometry:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgithub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  h-gpgme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGraphStorage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgrib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hharp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HHDL:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  H:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hiccup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hichi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hidapi:                                       [ x86_64-darwin ]
-  hid:                                          [ x86_64-darwin ]
-  hieraclus:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hierarchical-clustering-diagrams:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hiernotify:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hieroglyph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HiggsSet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  higher-leveldb:                               [ x86_64-darwin ]
-  higherorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  highjson:                                     [ i686-linux ]
-  highWaterMark:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  himg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  himpy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hinduce-classifier-decisiontree:              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hinduce-classifier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hinduce-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hinvaders:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hinze-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hipbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HipmunkPlayground:                            [ x86_64-darwin ]
-  Hipmunk:                                      [ x86_64-darwin ]
-  hircules:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hirt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hissmetrics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  historian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hist-pl-fusion:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hist-pl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hist-pl-lmf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hjs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HJVM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlbfgsb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlcm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLearn-algebra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLearn-approximation:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLearn-classification:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLearn-datastructures:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlibBladeRF:                                  [ x86_64-darwin ]
-  hlibev:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlibfam:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hly:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HMap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmarkup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-banded:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-mmap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-nipals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-quadprogpp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-repa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-special:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-static:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-svdlibc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-syntax:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmeap-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmenu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmm-hmatrix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HMM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hMollom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmp3:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hmpf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmpfr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmumps:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hnetcdf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HNM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hnn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoauth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hobbes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hobbits:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hob:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HODE:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hoed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hofix-mtl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hogg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hog:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hogre-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hogre:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hois:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hole:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Holumbus-Distribution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Holumbus-MapReduce:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Holumbus-Searchengine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Holumbus-Storage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  homeomorphic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hommage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  homplexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HongoDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  honi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  honk:                                         [ x86_64-darwin ]
-  hoodie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-builder:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-parser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-publish:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-render:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-types:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hood-off:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoovie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hopencc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hopencl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HOpenCV:                                      [ x86_64-darwin ]
-  hOpenPGP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hopenpgp-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hopfield:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hops:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hosts-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hothasktags:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hp2any-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hp2any-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hp2any-manager:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpapi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpaste:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpasteit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HPath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpc-tracer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hPDB-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HPi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hplayground:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hplaylist:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HPlot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpodder:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HPong:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpqtypes:                                     [ x86_64-darwin ]
-  hprotoc-fork:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hps-cairo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpygments:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpylos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hquantlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hranker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HRay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hR:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hricket:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT-graf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT-hist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hruby:                                        [ i686-linux ]
-  hs2bf:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs2dot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hs2lib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsbackup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-blake2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc2hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-cairo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-data:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-forth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-graphs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-lang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-lisp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-plot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-rec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-unsafe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hscamwire:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-carbon-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hscassandra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-cdb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsclock:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hscope:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsdev:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsdip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsdns-cache:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-dotnet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-duktape:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hsed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsfacter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSFFIG:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-ffmpeg:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-fltk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-gchart:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-gen-iface:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-GeoIP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSGEP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsgnutls:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsgnutls-yj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsgsom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsHaruPDF:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSHHelpers:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsHyperEstraier:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hSimpleDB:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsimport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-java:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-json-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsJudy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hskeleton:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hslackbuilder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hslibsvm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-logo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsmagick:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSmarty:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-mesos:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hsmtlib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsmtpclient:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsndfile-storablevector:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsnock:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-nombre-generator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsns:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsntp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsoptions:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSoundFile:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsparql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsp-cgi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspear:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspec-experimental:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspec-shouldbe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsPerl5:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-pgms:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-pkpass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspresent:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsprocess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsql-mysql:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml-datamodel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml-datamodel-vinyl:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml-demo-morris:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml-demo-notes:                             [ x86_64-darwin ]
-  hsqml-demo-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml-morris:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml:                                        [ x86_64-darwin ]
-  hsseccomp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsSqlite3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsSVN:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstest:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstidy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstorchat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstradeking:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HStringTemplateHelpers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-twitterarchiver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-twitter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstyle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstzaar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsubconvert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-vcard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hswip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsXenCtrl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsx-xhtml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsyscall:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hszephyr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HTab:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  htaglib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hTalos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HTicTacToe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  html-entities:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  html-rules:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  htoml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  htsn-import:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-client-request-modifiers:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-conduit-browser:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-conduit-downloader:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-monad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-proxy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  https-everywhere-rules:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-shed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  httpspec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-test:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  htune:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  htzaar:                                       [ x86_64-darwin ]
-  hubris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hugs2yc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hulk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HulkImport:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hums:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HUnit-Diff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hunit-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HUnit-Plus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hunit-rematch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hunt-searchengine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hunt-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hurdle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  husky:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hutton:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  huzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hVOIDP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxmppc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HXMPP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxournal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HXQ:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxt-binary:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxt-filter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxthelper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxweb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hybrid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydra-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-cli-args:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-data:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-parsing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-prelude:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-prelude-parsec:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-syntax:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyena:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hylolib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hylotab:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyloutils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyperdrive:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyperpublic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  i18n:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ideas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ideas-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  idiii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  idna2008:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  IDynamic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ieee-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iException:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  IFS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ige-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  igraph:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-inline-r:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-widgets:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihttp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  illuminate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imagemagick:                                  [ i686-linux ]
-  imagepaste:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imbib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imgurder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imperative-edsl-vhdl:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ImperativeHaskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  improve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  INblobs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  inch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  incremental-computing:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  incremental-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  incremental-sat-solver:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  increments:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  index-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  indices:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  indieweb-algorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  infer-upstream:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  infinity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  InfixApplicative:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  infix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  inflist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  influxdb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  informative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  inilist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  inline-c-cpp:                                 [ x86_64-darwin ]
-  inline-r:                                     [ i686-linux ]
-  inline-r:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  instant-zipper:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  integer-pure:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  intel-aes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interleavableGen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interleavableIO:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  internetmarke:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interpolatedstring-qq:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interpolatedstring-qq-mwotton:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  intset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  io-reactive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  IORefCAS:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  IOR:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iotransaction:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ipatch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ipc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ipopt-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iptables-helpers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iptadmin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Irc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  isevaluated:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ismtp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iteratee-compress:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iteratee:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iteratee-parsec:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iteratee-stm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iterIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iterio-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iter-stats:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-backend-c:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-bitdata:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-hw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-opts:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-quickcheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-stdlib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivy-web:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ixdopp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iyql:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  j2hs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jack-bindings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jackminimix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JackMiniMix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jack:                                         [ x86_64-darwin ]
-  jacobi-roots:                                 [ i686-linux ]
-  jacobi-roots:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jalla:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jammittools:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jarfind:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  java-bridge-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  java-bridge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  java-reflect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jespresso:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  join:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  joinlist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jonathanscard:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jort:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jose-jwt:                                     [ i686-linux ]
-  jsc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JsContracts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  js-good-parts:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jsmw:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json2-hdbc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-b:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JSONb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JSON-Combinator-Examples:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JSON-Combinator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JsonGrammar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jsonresume:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jsonschema-gen:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-stream:                                  [ i686-linux ]
-  json-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jspath:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  judy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jukebox:                                      [ x86_64-darwin ]
-  JunkDB-driver-gdbm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JYU-Utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kafka-client:                                 [ x86_64-darwin ]
-  kangaroo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kansas-lava-cores:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kansas-lava:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kansas-lava-papilio:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kansas-lava-shake:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  karakuri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  katt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-mvc-environment-gtk:              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-mvc-model-lightmodel:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-mvc-model-protectedmodel:         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-mvc-solutions-gtk:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-fs:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-gtk:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactivelenses:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-network:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-polling:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactivevalues:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-wx:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-yampa:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-posture:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keiretsu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Ketchup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kevin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keyring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keystore:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kicad-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kickass-torrents-dump-parser:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KiCS-debugger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KiCS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KiCS-prophecy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kif-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kmeans-par:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  koellner-phonetic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Konf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  korfu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kqueue:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ktx:                                          [ x86_64-darwin ]
-  kure-your-boilerplate:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KyotoCabinet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  labeled-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  laborantin-hs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  labyrinth:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  labyrinth-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lagrangian:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  laika:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdaBase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-haskell-plugins:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-irc-plugins:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-misc-plugins:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-novelty-plugins:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-reference-plugins:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-social-plugins:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-bridge:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaCalculator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-canvas:                                [ x86_64-darwin ]
-  lambdacat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube-bullet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube-engine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube-gl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-devs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdaFeed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaHack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaINet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdaLit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaNet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaPrettyQuote:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaShell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-toolbox:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdatwit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdiff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lame-tester:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-bash:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-boogie:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-c-comments:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-c-inline:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-eiffel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-go:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-java-classfile:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-mixal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-objc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-puppet:                              [ i686-linux ]
-  language-puppet:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-python-colour:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-qux:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-sh:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-spelling:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-sqlite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-thrift:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Lastik:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  latest-npm-version:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  launchpad-control:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  layers-game:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  layers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  layout-bootstrap:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  layout:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lazyarray:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lazysplines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  l-bfgs-b:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lcs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ldap-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ldif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  leaf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  leaky:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  learn-physics-examples:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  learn-physics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Level0:                                       [ x86_64-darwin ]
-  leveldb-haskell-fork:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  leveldb-haskell:                              [ x86_64-darwin ]
-  levmar-chart:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  levmar:                                       [ i686-linux ]
-  levmar:                                       [ x86_64-linux ]
-  lgtk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lhae:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lha:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lhe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LibClang:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libconfig:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libcspm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libexpect:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libGenI:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libgraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libhbb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libjenkins:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  liblinear-enumerator:                         [ x86_64-darwin ]
-  libltdl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  liboleg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libpafe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libpq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libssh2-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libsystemd-daemon:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libsystemd-journal:                           [ x86_64-darwin ]
-  libvirt-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libxslt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LibZip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  life:                                         [ x86_64-darwin ]
-  lifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lighttpd-conf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lighttpd-conf-qq:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lilypond:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Limit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  limp-cbc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lin-alg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linear-algebra-cblas:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linear-circuit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linear-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linear-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linearscan-hoopl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LinearSplit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LinkChecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linkchk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linkcore:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linode:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linux-blkid:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linux-evdev:                                  [ x86_64-darwin ]
-  linux-file-extents:                           [ x86_64-darwin ]
-  linux-inotify:                                [ x86_64-darwin ]
-  linux-kmod:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linux-mount:                                  [ x86_64-darwin ]
-  linux-namespaces:                             [ x86_64-darwin ]
-  linux-perf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linux-ptrace:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lio-eci11:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lio-fs:                                       [ x86_64-darwin ]
-  lio-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  listlike-instances:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  list-t-html-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  literals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  live-sequencer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ll-picosat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llsd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-analysis:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-base-types:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-base-util:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-data-interop:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-ffi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-general-quote:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-ht:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-tf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lmdb:                                         [ x86_64-darwin ]
-  lmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lmonad-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  local-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  logging-facade-journald:                      [ x86_64-darwin ]
-  logic-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LogicGrowsOnTrees:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LogicGrowsOnTrees-MPI:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LogicGrowsOnTrees-network:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LogicGrowsOnTrees-processes:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log:                                          [ x86_64-darwin ]
-  lojban:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lojbanParser:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lojbanXiragan:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lojysamban:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lol:                                          [ i686-linux ]
-  loli:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loop-effin:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loopy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lord:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loris:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lostcities:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lp-diagrams-svg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lscabal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  L-seed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LslPlus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ls-usb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lsystem:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  luachunk:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lucienne:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Lucu:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lui:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  luka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  luminance-samples:                            [ x86_64-darwin ]
-  lushtags:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  luthor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lvish:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lvmlib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lxc:                                          [ x86_64-darwin ]
-  lye:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lzma:                                         [ i686-linux ]
-  lzma-streams:                                 [ i686-linux ]
-  mage:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MagicHaskeller:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  magico:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mahoro:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  majordomo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  majority:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-all:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-anything:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-browser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-curl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-editor:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-filemanager:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-imageviewer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-ircclient:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-mplayer:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-pdfviewer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-processmanager:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-reader:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-template:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-terminal:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-welcome:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mandulia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mangopay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  marionetta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markdown2svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markdown-kate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markdown-pap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markov-processes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markup-preview:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  marmalade-upload:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  marquise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  marxup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  masakazu-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  matchers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mathblog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mathlink:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  matlab:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  matsuri:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  maude:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  maxent:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  maxsharing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  maybench:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MaybeT:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MaybeT-monads-tf:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MaybeT-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MazesOfMonad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mbox-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MC-Fold-DP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mcmaster-gloss-examples:                      [ x86_64-darwin ]
-  mcmc-samplers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mdcat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Measure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mecab:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mediawiki2latex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mediawiki:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  medium-sdk-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  meep:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mega-sdist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  melody:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  memo-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  meta-par-accelerate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  metaplug:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  metric:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  metronome:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mfsolve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Mhailist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MHask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Michelangelo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  microlens-contra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  midi-alsa:                                    [ x86_64-darwin ]
-  midimory:                                     [ x86_64-darwin ]
-  midisurface:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mighttpd2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mighttpd:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mikmod:                                       [ x86_64-darwin ]
-  mime-directory:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mime-string:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  minesweeper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MiniAgda:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  miniball:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  miniforth:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  minimung:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  minioperational:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  miniplex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  minirotate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  minisat:                                      [ x86_64-darwin ]
-  ministg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mirror-tweet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  missing-py2:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MissingPy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mix-arrows:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mkbndl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mlist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ml-w:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mmtl-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mmtl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  moan:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  modelicaparser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  modsplit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  modular-prelude-classy:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  modular-prelude:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  module-management:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Moe:                                          [ x86_64-darwin ]
-  mohws:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-abort-fd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadacme:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-atom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-atom-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCatchIO-mtl-foreign:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCatchIO-transformers-foreign:            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-exception:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadiccp-gecode:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadiccp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-interleave:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Monadius:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadLab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-levels:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-lrs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-memo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-mersenne-random:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadRandomLazy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-ran:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-stlike-io:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-stlike-stm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-tx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-unify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monarch:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Monaris:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Monatron:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Monatron-IO:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mongodb-queue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mongrel2-handler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monitor:                                      [ x86_64-darwin ]
-  Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mono-foldable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monoid-owns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monoidplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monoids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monoid-subclasses:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monte-carlo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  moo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  morfette:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  morfeusz:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mosaico-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mount:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mp3decoder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mpdmate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mpppc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mpretty:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mprover:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mpvguihs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  msgpack-idl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  msh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  msi-kb-backlit:                               [ x86_64-darwin ]
-  mtgoxapi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mtl-tf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mtlx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mtp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mudbath:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multi-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multifocal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multipass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multiplate-simplified:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multirec-alt-deriver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multirec-binary:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multisetrewrite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  murder:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  murmurhash3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  musicbrainz-email:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-graphics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-parts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-preludes:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-score:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-sibelius:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-suite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  musicxml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mustache2hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mustache:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mutable-iter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mvclient:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mvc-updates:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  myo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysnapsession-example:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysnapsession:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysql-simple-quasi:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysql-simple-typed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  myTestlll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mzv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nagios-plugin-ekg:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  named-lock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nanoAgda:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nano-cryptr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nanocurses:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nano-hmac:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nano-md5:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nanomsg:                                      [ x86_64-darwin ]
-  narc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nats-queue:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  natural-number:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  neat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  needle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nehe-tuts:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nerf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nero:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nero-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nero-warp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nested-routes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netlines:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NetSNMP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netspec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nettle-frp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nettle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nettle-netkit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nettle-openflow:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netwire-input-glfw:                           [ x86_64-darwin ]
-  network-address:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-bytestring:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-connection:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-fancy:                                [ i686-linux ]
-  network-interfacerequest:                     [ x86_64-darwin ]
-  network-minihttp:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-netpacket:                            [ x86_64-darwin ]
-  network-rpca:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-simple-tls:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-topic-models:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-transport-amqp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-websocket:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  newports:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  newsynth:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  newt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  newtype-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NGrams:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  niagra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nibblestring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nikepub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nimber:                                       [ i686-linux ]
-  Ninjas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nitro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nixfromnpm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nkjp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nntp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  noise:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nomyx-Core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nomyx:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nomyx-Language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nomyx-Rules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nomyx-Web:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NonEmptyList:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  noodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NoSlow:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  not-gloss-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  not-gloss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  notmuch-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  notmuch-web:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  np-linear:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nptools:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nthable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NTRU:                                         [ i686-linux ]
-  null-canvas:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NumberSieves:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  numerals-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  numerals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  numeric-qq:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nussinov78:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nvim-hs-contrib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nvim-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NXTDSL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NXT:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nymphaea:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  oberon0:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Object:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  objectid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ObjectIO:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  obj:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  octopus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  oculus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OddWord:                                      [ i686-linux ]
-  OGL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ohloh-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  oidc-client:                                  [ i686-linux ]
-  oidc-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  oi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ois-input-manager:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  omaketex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  omnicodec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  on-a-horse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  one-liner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  oneormore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  onu-course:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenAFP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenAFP-Utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenAL:                                       [ x86_64-darwin ]
-  OpenCL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenCLRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opencog-atomspace:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opencv-raw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openexchangerates:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openflow:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenGLCheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opengles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenGLRaw21:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenGL:                                       [ x86_64-darwin ]
-  openid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openpgp-crypto-api:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openpgp-Crypto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenSCAD:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openssh-github-keys:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opentheory-char:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-typerep:                                 [ i686-linux ]
-  open-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenVG:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenVGRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-witness:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Operads:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opml-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  optimal-blocks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  optimusprime:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OrchestrateDB:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  orchestrate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  orchid-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  orchid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  order-maintenance:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  orgmode-parse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  origami:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  osm-download:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OSM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  package-vt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  packedstring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  packman:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  padKONTROL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PageIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pam:                                          [ x86_64-darwin ]
-  panda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PandocAgda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pandoc-unlit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  papillon:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  paragon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Paraiso:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parallel-tasks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parameterized-data:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parco-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parco:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parconc-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parco-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parport:                                      [ x86_64-darwin ]
-  Parry:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parse-help:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parsely:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parser241:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parser-helper:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parsestar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  partial-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  partly:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  passage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pastis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pasty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Pathfinder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pathfindingcore:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  patterns:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  paypal-adaptive-hoops:                        [ i686-linux ]
-  paypal-adaptive-hoops:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  paypal-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PCLT-DB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PCLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pdynload:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peakachu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  penny-bin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  penny:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  penny-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peparser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  perdure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  perm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PermuteEffects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  permute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-hssqlppp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-map:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-protobuf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pesca:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peyotls-codec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peyotls:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pez:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pg-harness:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pg-harness-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pgsql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phasechange:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phone-numbers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phone-push:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phooey:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  photoname:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phraskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Phsu:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phybin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pianola:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pi-calculus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  picoparsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  piet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  piki:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Pipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-cereal-plus:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-courier:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-files:                                  [ i686-linux ]
-  pipes-network-tls:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-p2p-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-transduce:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pisigma:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pkggraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  planar-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plist-buddy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plivo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plugins-multistage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plumbers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ply-loader:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  png-file:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pngload-fixed:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pngload:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pocket-dns:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pointless-lenses:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pointless-rewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polar-configfile:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polh-lexicon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Pollutocracy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polynom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polyseq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polysoup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polytypeable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polytypeable-utils:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pontarius-mediaserver:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pontarius-xmpp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pontarius-xpmn:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pool-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pool:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  popenhs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  poppler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  portaudio:                                    [ x86_64-darwin ]
-  porte:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  porter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PortMidi:                                     [ x86_64-darwin ]
-  ports:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  posix-acl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  posix-realtime:                               [ x86_64-darwin ]
-  posix-waitpid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PostgreSQL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgresql-simple-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgrest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postmaster:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  powermate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  powerpc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pqc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pqueue-mtl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  practice-room:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  precis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prednote-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pred-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prefork:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pregame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prelude-generalize:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prelude-plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  preprocess-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  press:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  presto-hdbc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  primula-board:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  primula-bot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  printf-mauke:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Printf-TH:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  printxosd:                                    [ x86_64-darwin ]
-  PriorityChansConverger:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  priority-queue:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ProbabilityMonads:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  processing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  process-iterio:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  process-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  process-listlike:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  process-progress:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  process-qq:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  procrastinating-structure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  procrastinating-variable:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  procstat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prof2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  progressbar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  progress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  progression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  progressive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proj4-hs-bindings:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prolog-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prolog-graph-lib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prolog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  propane:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Proper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proplang:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proteaaudio:                                  [ x86_64-darwin ]
-  protobuf-native:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  protocol-buffers-descriptor-fork:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  protocol-buffers-fork:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prove-everywhere-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proxy-kindness:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pub:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  publicsuffixlistcreate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pubnub:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pubsub:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  puffytools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pugixml:                                      [ x86_64-darwin ]
-  pugs-hsregex:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pugs-HsSyck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Pugs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PUH-Project:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pulse-simple:                                 [ x86_64-darwin ]
-  punkt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Pup-Events-Demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  puppetresources:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pushme:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  push-notify-ccs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  push-notify-general:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  push-notify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  putlenses:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  puzzle-draw-cmdline:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  puzzle-draw:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pvd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  python-pickle:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qd:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qd-vec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qed:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qhull-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  QIO:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  QuadEdge:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quadratic-irrational:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quantum-arrow:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qudb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quenya-verb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  querystring-pickle:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  queuelike:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  QuickAnnotate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  QuickCheck-GenT:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickcheck-poly:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickcheck-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickpull:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickset:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Quickson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quicktest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quoridor-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qux:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rabocsv2qif:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rad:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  radium-formula-parser:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  radium:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rados-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rail-compiler-editor:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rainbow-tests:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Raincat:                                      [ x86_64-darwin ]
-  rakhana:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ralist:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rallod:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  randfile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-access-list:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RandomDotOrg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-eff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-effin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-hypergeometric:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-stream:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-variates:                              [ i686-linux ]
-  rand-vars:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rangemin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Ranka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Rasenschach:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  raven-haskell-scotty:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rbr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rcu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rdf4h:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rdioh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  re2:                                          [ x86_64-darwin ]
-  reaction-logic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-bacon:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-balsa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-banana-sdl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-banana-threepenny:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-banana-wx:                           [ x86_64-darwin ]
-  reactive-fieldtrip:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-glut:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-thread:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  really-simple-xml-parser:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reasonable-lens:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  record-aeson:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  record-gl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  record-preprocessor:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  records:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  records-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  record-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Redmine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reedsolomon:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Referees:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  refh:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflection-extras:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-animation:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-dom-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-dom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-gloss:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-gloss-scene:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-deriv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-dfa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-pderiv:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexp-tries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexqq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-tdfa-utf8:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-tre:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-xmlschema:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regional-pointers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regions:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regions-monadsfd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regions-monadstf:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regions-mtl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regular-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regular-web:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reheat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reified-records:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rei:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reinterpret-cast:                             [ i686-linux ]
-  relational-postgresql8:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  remote:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  remotion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reorderable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-array:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-flow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-plugin:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-v4l2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repo-based-blog:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  representable-functors:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  representable-tries:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  resistor-cube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  resource-embed:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  resource-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  respond:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  restful-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RESTng:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  restricted-workers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  restyle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  resumable-exceptions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rethinkdb-model:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ReviewBoard:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rewrite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rewriting:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rezoom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rfc3339:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rhythm-game-tutorial:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  riemann:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  riot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ripple-federation:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ripple:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  risc386:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rivers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RJson:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RMP:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RNAdesign:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RNAdraw:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RNAFold:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RNAFoldProgs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RNAwolf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roguestar-engine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roguestar-gl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roguestar-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roguestar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RollingDirectory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rope:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rosa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roshask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rosso:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rotating-log:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rounding:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roundtrip-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roundtrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roundtrip-string:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roundtrip-xml:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  route-generator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  route-planning:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rowrecord:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rpc-framework:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rpc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rpm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rsagl-frp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rsagl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rsagl-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rss2irc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rtcm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rtlsdr:                                       [ x86_64-darwin ]
-  rtorrent-rpc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rubberband:                                   [ x86_64-darwin ]
-  ruff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ruler-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rungekutta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RxHaskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safe-freeze:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safe-globals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safe-lazy-io:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safe-plugins:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safer-file-handles-bytestring:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safer-file-handles:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safer-file-handles-text:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sai-shape-syb:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Salsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  saltine-quickcheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia-protocol:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia-sessions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia-websocket:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  samtools-iteratee:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sarasvati:                                    [ x86_64-darwin ]
-  sasl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  satchmo-backends:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  satchmo-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  satchmo-funsat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  satchmo-minisat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  satchmo-toysat:                               [ x86_64-darwin ]
-  satchmo:                                      [ x86_64-darwin ]
-  sat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sat-micro-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SBench:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sbp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sbvPlugin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scaleimage:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scalp-webhooks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scan-vector-machine:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scenegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  schedevr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scholdoc-citeproc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scholdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  science-constants-dimensional:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SciFlow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scion-browser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scope-cairo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scope:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scottish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scotty-blaze:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scotty-fay:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scotty-hastache:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scotty-session:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scrabble-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ScratchFs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scrobble:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scroll:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scrz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Scurry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-cairo:                                   [ x86_64-darwin ]
-  sdl2-compositor:                              [ x86_64-darwin ]
-  sdl2-image:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2:                                         [ x86_64-darwin ]
-  SDL-gfx:                                      [ x86_64-darwin ]
-  SDL-image:                                    [ x86_64-darwin ]
-  SDL-mixer:                                    [ x86_64-darwin ]
-  SDL-mpeg:                                     [ x86_64-darwin ]
-  SDL-ttf:                                      [ x86_64-darwin ]
-  SDL:                                          [ x86_64-darwin ]
-  sdr:                                          [ i686-linux, x86_64-darwin ]
-  sdr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  seacat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  search:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secdh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secp256k1:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secret-santa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secret-sharing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secrm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sednaDBXML:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  selectors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  select:                                       [ x86_64-darwin ]
-  selenium:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  selenium-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  selinux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Semantique:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  semigroups-actions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  semi-iso:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  semiring:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  semver-range:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sensenet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sentry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  seqaid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  seqalign:                                     [ i686-linux ]
-  SeqAlign:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  seqloc-datafiles:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sequent-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sequor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-pool:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-scotty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ses-html-snaplet:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SessionLogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  set-cover:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sexp-grammar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sexp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sfml-audio:                                   [ x86_64-darwin ]
-  SFML-control:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SFML:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SFont:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SGdemo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SG:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shadower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shady-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shady-graphics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shake-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shaker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shapely-data:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shared-buffer:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  she:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shellac-compatline:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shellac-editline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shellac-haskeline:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shellac:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shellac-readline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shellish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shell-pipe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  showdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shpider:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shu-thing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  signals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-bluetooth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-css:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-c-value:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-firewire:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-form:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SimpleGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SimpleH:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simpleirc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simpleirc-lens:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SimpleLog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-log-syslog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simplenote:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-pascal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-postgresql-orm:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simpleprelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-session:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simplessh:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-templates:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-vec3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simseq:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sindre:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sirkel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sized:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  skeleton:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  skype4hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  slack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  slidemews:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Slides:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sloth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smallarray:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smallpt-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smallstring:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smartGroup:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smartword:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Smooth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smt-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smtp2mta:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smtp-mail-ng:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snake-game:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-accept:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-actionlog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-css-min:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-environments:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-hasql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-haxl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-hdbc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-i18n:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-influxdb:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-mongoDB:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-mongodb-minimalistic:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-mysql-simple:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-oauth:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-redson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-rest:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-sedna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-sqlite-simple:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-tasks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-typed-sessions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-wordpress:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-predicates:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snappy-conduit:                               [ x86_64-darwin ]
-  snappy-framing:                               [ x86_64-darwin ]
-  snappy-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snappy:                                       [ x86_64-darwin ]
-  snap-testing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sndfile-enumerators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SNet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snowglobe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snow-white:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Snusmumrik:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SoccerFunGL:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SoccerFun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sock2stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  socketio:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sonic-visualiser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SoOSiM:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sorted:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sound-collage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  source-code-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SourceGraph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sousit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  soxlib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  soyuz:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SpaceInvaders:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SpacePrivateers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spanout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sparsebit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sparsecheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sparse:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  special-functors:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  specialize-th:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sphero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sphinx-cli:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spice:                                        [ x86_64-darwin ]
-  spike:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  splaytree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spline3:                                      [ i686-linux ]
-  splines:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  split-record:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  splot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Spock-auth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spoonutil:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spoty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Sprig:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spsa:                                         [ i686-linux ]
-  spsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spy:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sqlite-simple-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sql-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sql-simple-mysql:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sql-simple-pool:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sql-simple-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sql-simple-sqlite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  squeeze:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  srcinst:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ssh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sssp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sstable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stable-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stackage-curator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stack-hpc-coveralls:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stack-run-auto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  starrover2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stateful-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  statgrab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  statistics-dirichlet:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  statistics-fusion:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stb-truetype:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  step-function:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stepwise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stm-chunked-queues:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stmcontrol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Stomp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stopwatch:                                    [ x86_64-darwin ]
-  storable-static-array:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  storablevector-carray:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  storablevector:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  storablevector-streamfusion:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Strafunski-Sdf2Haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stratum-tool:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stream-fusion:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  streaming-utils:                              [ i686-linux ]
-  StrictBench:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  strict-concurrency:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stringlike:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  structured-mongoDB:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  structures:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stunts:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  subhask:                                      [ i686-linux ]
-  subhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  subleq-toolchain:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sub-state:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  suitable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sunlight:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sunroof-compiler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sunroof-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sunroof-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  supercollider-midi:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  superdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  supero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  supervisor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  svg2q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SVG2Q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  svm-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  svndump:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  swapper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  swearjure:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  swf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  swift-lda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syb-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sylvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sym-plot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sync:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syncthing-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntactic:                                    [ i686-linux ]
-  syntax-attoparsec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-example:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-example-json:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SyntaxMacros:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-pretty:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-printer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-trees-fork-bairyn:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-trees:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-alsa:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-core:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-dimensional:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-filter:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-llvm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-midi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Sysmon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  system-canonicalpath:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  system-lifted:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  system-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  system-time-monotonic:                        [ x86_64-darwin ]
-  tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tablestorage:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tabloid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tagged-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tagged-th:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tagsoup-ht:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tagsoup-parsec:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ta:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Takusen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  takusen-oracle:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tamarin-prover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tamarin-prover-term:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tamarin-prover-theory:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tamarin-prover-utils:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  task:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tasty-integrate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TBC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TBit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tbox:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tccli:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tdd-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TeaHS:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  teams:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  telegram-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  telegram:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  template-default:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  template-haskell-util:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  template-hsml:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  template-yj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tempodb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  temporal-csound:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tempus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tensor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  termbox-bindings:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  term-rewriting:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  terntup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-framework-doctest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testloop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testpack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testpattern:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testPkg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testrunner:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tetris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tex2txt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  texrunner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-json-qq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  textmatetags:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-normal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-register-machine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-xml-generic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-xml-qq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tfp-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tftp:                                         [ x86_64-darwin ]
-  th-context:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  themoviedb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Theora:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  theoremquest-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  thih:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  thimk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Thingie:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-kinds:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  threads-supervisor:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tickle:                                       [ i686-linux ]
-  tickle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tic-tac-toe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TicTacToe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tidal-midi:                                   [ x86_64-darwin ]
-  tiger:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tighttp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timberc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timecalc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-exts:                                    [ i686-linux ]
-  time-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeparsers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TimePiece:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-qq:                                      [ i686-linux ]
-  time-recurrence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timerep:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timestamp-subprocess-lines:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-w3c:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TinyLaunchbury:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TinyURL:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tip-haskell-frontend:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Titim:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tkhs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tkyprof:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tls-extra:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  todos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  to-haskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  toilet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  toktok:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tokyocabinet-haskell:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tokyotyrant-haskell:                          [ x86_64-darwin ]
-  tomato-rubato-openal:                         [ x86_64-darwin ]
-  toml:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Top:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  topkata:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  torch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  to-string-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  to-string-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Tournament:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tracker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  trajectory:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  transactional-events:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  transformers-convert:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  transformers-runnable:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  transient:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  translate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  traypoweroff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tremulous-query:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TrendGraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  trhsx:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  triangulation:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TrieMap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  trimpolya:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tsession-happstack:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tsession:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tskiplist:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tsp-viz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tuntap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tuple-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tupleinstances:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tuple-morph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  turing-music:                                 [ x86_64-darwin ]
-  twentefp-eventloop-trees:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twentefp-rosetree:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twentefp:                                     [ x86_64-darwin ]
-  twhs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twidge:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twilight-stm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twilio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twill:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twiml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twisty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-types-lens:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TYB:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typalyze:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typeable-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-cereal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TypeClass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-digits:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typedquery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typed-wire:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-equality-check:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typehash:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TypeIlluminator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-int:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-level-bst:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-level:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-level-sets:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typelevel-tensor:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-ord:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-ord-spine-cereal:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typeparams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typescript-docs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-settheory:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-spine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-structure:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-sub-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tz:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uAgda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uberlast:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uconv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  udbus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  udbus-model:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  udev:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uhc-light:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ui-command:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  UISF:                                         [ x86_64-darwin ]
-  UMM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unamb-custom:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unbounded-delays-units:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unboxed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unicode-normalization:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unicoder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uniform-io:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  union-map:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uniqueid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unittyped:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  universe-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unix-process-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Unixutils-shadow:                             [ x86_64-darwin ]
-  unlit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unordered-containers-rematch:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unpack-funcs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unscramble:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  up:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uploadcare:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  upskirt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ureader:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urembed:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uri-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uri-enumerator-file:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uri-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urlcheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urldecode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urldisp-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  UrlDisp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  url-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  URLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urxml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  usb-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  usb-iteratee:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  usb-safe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  utf8-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  UTFTConverter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uuagc-diagrams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uvector-algorithms:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uvector:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  v4l2-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  v4l2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vacuum-cairo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vacuum-graphviz:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vacuum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vacuum-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vacuum-ubigraph:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vampire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  var:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vaultaire-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vcache-trie:                                  [ x86_64-darwin ]
-  vcache:                                       [ x86_64-darwin ]
-  vcard:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Vec-Boolean:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Vec-OpenGLRaw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vect-opengl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-bytestring:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-clock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-functorlazy:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-instances-collections:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-random:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-read-instances:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-space-opengl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-static:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Vec-Transform:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  versions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vigilance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vimeta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vintage-basic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vinyl-gl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vinyl-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vinyl-vectors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  virthualenv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vision:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  visual-graphrewrite:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  visual-prof:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vivid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vk-aws-route53:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vorbiscomment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vowpal-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  voyeur:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vtegtk3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vte:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vty-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vty-menu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vty-ui-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-graceful:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-handler-devel:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-handler-snap:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-handler-webkit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-hastache:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-lite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-logger-prefork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-crowd:                         [ i686-linux ]
-  wai-middleware-headers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-hmac-client:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-preprocessor:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-route:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-static-caching:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-session-tokyocabinet:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-static-cache:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-throttler:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  warp-dynamic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  warp-static:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  warp-tls-uid:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WashNGo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  watchdog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  watcher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  watchit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WaveFront:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wavesurfer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  weather-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webapp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WebBits-Html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WebBits-multiplate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-browser-in-haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WebCont:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webcrank-dispatch:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webcrank-wai:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webdriver-snoy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-encodings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webkit-javascriptcore:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-mongrel2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Webrexp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-routes-quasi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-routes-transformers:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webserver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  websnap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webwire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wedged:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  weighted-regexp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  welshy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Wheb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wheb-mongo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wheb-redis:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wheb-strapped:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  whim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  whitespace:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WikimediaParser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wikipedia4epub:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  windowslive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  winerror:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  winio:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Wired:                                        [ x86_64-darwin ]
-  WL500gPControl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wlc-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WMSigner:                                     [ i686-linux ]
-  wobsurv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wolf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  word24:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WordAlignment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Wordlint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WordNet-ghc74:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WordNet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wordsearch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  workflow-osx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wp-archivebot:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wraxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wright:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wsdl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wtk-gtk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wtk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wumpus-basic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wumpus-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wumpus-drawing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wumpus-microprint:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wumpus-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WURFL:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wxcore:                                       [ x86_64-darwin ]
-  wxc:                                          [ x86_64-darwin ]
-  WXDiffCtrl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wxFruit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WxGeneric:                                    [ x86_64-darwin ]
-  wxhnotepad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wxturtle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wx:                                           [ x86_64-darwin ]
-  wyvern:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  X11-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  X11-rm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  X11-xdamage:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  X11-xfixes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  x11-xinput:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xattr:                                        [ x86_64-darwin ]
-  xbattbar:                                     [ x86_64-darwin ]
-  xchat-plugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  x-dsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Xec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xfconf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xhaskell-library:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xhb-ewmh:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xine:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xing-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xkbcommon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xlsx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml2x:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-catalog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-enumerator-combinators:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XmlHtmlWriter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-parsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-pipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-prettify:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-query-xml-conduit:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-query-xml-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmltv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmms2-client-glib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmms2-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XMMS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmobar:                                       [ x86_64-darwin ]
-  xmonad-bluetilebranch:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmonad-contrib-bluetilebranch:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmonad-eval:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmonad-utils:                                 [ x86_64-darwin ]
-  xmpipe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XMPP:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xosd:                                         [ x86_64-darwin ]
-  xournal-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xournal-convert:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xournal-parser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xournal-render:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xournal-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xsact:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XSaiga:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xslt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xtc:                                          [ x86_64-darwin ]
-  y0l0bot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Yablog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  YACPong:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yahoo-web-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yajl-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yajl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml2owl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  YamlReference:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yampa2048:                                    [ x86_64-darwin ]
-  yampa-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yampa-glfw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yampa-glut:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaop:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yarr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yarr-image-io:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yavie:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ycextra:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-angular-ui:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-ldap-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-pam:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-smbclient:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-comments:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-content-pdf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-continuations:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-datatables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-goodies:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-links:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-mangopay:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-paginate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-pagination:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-pure:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-purescript:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-raml-bin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-raml-mock:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-routes-typescript:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-rst:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-s3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-session-redis:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-tableview:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-test-json:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-tls:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-vend:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-worker:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  YFrob:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yhccore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yi-contrib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yi-rope:                                      [ x86_64-darwin ]
-  yjftp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Yogurt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Yogurt-Standalone:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yoko:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  york-lava:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yuiGrid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yuuko:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yxdb-utils:                                   [ i686-linux ]
-  z3:                                           [ x86_64-darwin ]
-  zampolit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zasni-gerna:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zendesk-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zeno:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ZEO:                                          [ x86_64-darwin ]
-  zerobin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zeromq3-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zeromq3-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zeromq-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zeroth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ZFS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zipedit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ZMachine:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zmcat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zmqat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoneinfo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoom-cache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoom-cache-pcm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoom-cache-sndfile:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zsh-battery:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ztail:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Zwaluw:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fltkhs-hello-world:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 6137adecf0c..2486d91b95a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -3777,6 +3777,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4347,7 +4348,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6314,6 +6317,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6329,6 +6333,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8343,6 +8348,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8368,6 +8374,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8652,6 +8659,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8698,6 +8706,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index b01ec9391bf..9ec9fd73f46 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -3777,6 +3777,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4347,7 +4348,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6314,6 +6317,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6329,6 +6333,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8343,6 +8348,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8368,6 +8374,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8652,6 +8659,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8698,6 +8706,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index a960665bd20..6f09f2d2418 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -3777,6 +3777,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4347,7 +4348,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6314,6 +6317,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6329,6 +6333,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8343,6 +8348,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8368,6 +8374,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8652,6 +8659,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8698,6 +8706,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index bd8ec9285b5..a24c6905c07 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -3777,6 +3777,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4347,7 +4348,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6314,6 +6317,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6329,6 +6333,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8343,6 +8348,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8368,6 +8374,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8652,6 +8659,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8698,6 +8706,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 03c9cbf1302..f979f700e91 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -3776,6 +3776,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4344,7 +4345,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6311,6 +6314,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6326,6 +6330,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8339,6 +8344,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8364,6 +8370,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8648,6 +8655,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8694,6 +8702,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 8ad110b2627..6ee51f7c699 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -3776,6 +3776,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4344,7 +4345,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6311,6 +6314,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6326,6 +6330,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8339,6 +8344,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8364,6 +8370,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8648,6 +8655,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8694,6 +8702,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index a68ffba5feb..8fe1d730c80 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -3775,6 +3775,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4342,7 +4343,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6309,6 +6312,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6324,6 +6328,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8336,6 +8341,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8361,6 +8367,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8645,6 +8652,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8691,6 +8699,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index e84e33b8b6f..48f29fddd71 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -3775,6 +3775,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4342,7 +4343,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6309,6 +6312,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6324,6 +6328,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8336,6 +8341,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8361,6 +8367,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8645,6 +8652,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8691,6 +8699,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 8fcb4a7b14b..49ec22af7c7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -3765,6 +3765,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4332,7 +4333,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6298,6 +6301,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6313,6 +6317,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8323,6 +8328,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8348,6 +8354,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8631,6 +8638,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8677,6 +8685,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index d2c2eb366c8..3d4a16f325a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -3762,6 +3762,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4328,7 +4329,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6291,6 +6294,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6306,6 +6310,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8311,6 +8316,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8336,6 +8342,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8618,6 +8625,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8664,6 +8672,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 79508ed479d..67857ee4b1c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -3753,6 +3753,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4317,7 +4318,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6271,6 +6274,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6286,6 +6290,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8284,6 +8289,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8309,6 +8315,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8590,6 +8597,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8636,6 +8644,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index d49b03d721e..c27a46a88c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -3752,6 +3752,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4316,7 +4317,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6267,6 +6270,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6282,6 +6286,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8280,6 +8285,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8305,6 +8311,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8586,6 +8593,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8632,6 +8640,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 07203ef2701..a5a7d7fa360 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -3752,6 +3752,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4315,7 +4316,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6266,6 +6269,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6281,6 +6285,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8278,6 +8283,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8303,6 +8309,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8584,6 +8591,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8630,6 +8638,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 9e9c3094ada..66812de0443 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -3752,6 +3752,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4314,7 +4315,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6265,6 +6268,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6280,6 +6284,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8276,6 +8281,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8301,6 +8307,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8582,6 +8589,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8628,6 +8636,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 05194bba331..e125520cf71 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -3749,6 +3749,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4184,6 +4185,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4310,7 +4312,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6259,6 +6263,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6274,6 +6279,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8269,6 +8275,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8294,6 +8301,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8575,6 +8583,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8621,6 +8630,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 356c8b4652d..47821d85dab 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -3745,6 +3745,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4180,6 +4181,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4306,7 +4308,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6253,6 +6257,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6268,6 +6273,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8260,6 +8266,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8285,6 +8292,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8566,6 +8574,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8612,6 +8621,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index db969111d4e..8469c6f17c7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -3759,6 +3759,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4325,7 +4326,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6287,6 +6290,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6302,6 +6306,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8305,6 +8310,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8330,6 +8336,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8612,6 +8619,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8658,6 +8666,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 29c93121b18..8b9dedb59fe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -3757,6 +3757,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4322,7 +4323,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6283,6 +6286,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6298,6 +6302,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8300,6 +8305,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8325,6 +8331,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8607,6 +8614,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8653,6 +8661,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index adf9213f2c2..23909c3d2e7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -3756,6 +3756,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4321,7 +4322,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6282,6 +6285,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6297,6 +6301,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8298,6 +8303,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8323,6 +8329,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8604,6 +8611,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8650,6 +8658,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 0bb90638d10..127f3e90509 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -3756,6 +3756,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4321,7 +4322,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6277,6 +6280,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6292,6 +6296,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8293,6 +8298,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8318,6 +8324,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8599,6 +8606,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8645,6 +8653,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 1fe763664aa..efbf9037a6f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -3754,6 +3754,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4318,7 +4319,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6273,6 +6276,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6288,6 +6292,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8288,6 +8293,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8313,6 +8319,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8594,6 +8601,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8640,6 +8648,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index efbe3f49269..99dc38c7f80 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -3753,6 +3753,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4317,7 +4318,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6272,6 +6275,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6287,6 +6291,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8287,6 +8292,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8312,6 +8318,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8593,6 +8600,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8639,6 +8647,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index cc0205433b2..568076876a7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -3727,6 +3727,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4162,6 +4163,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4287,7 +4289,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6210,6 +6214,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6225,6 +6230,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8207,6 +8213,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8232,6 +8239,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8511,6 +8519,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8557,6 +8566,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 83feb1b2f3d..498229f2a84 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -3726,6 +3726,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4161,6 +4162,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4286,7 +4288,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6209,6 +6213,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6224,6 +6229,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8206,6 +8212,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8231,6 +8238,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8510,6 +8518,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8555,6 +8564,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 67d34a15694..d779e935a1c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -3709,6 +3709,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4142,6 +4143,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4266,7 +4268,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6178,6 +6182,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6193,6 +6198,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8159,6 +8165,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8184,6 +8191,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8463,6 +8471,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8508,6 +8517,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8839,6 +8849,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 8f2db34a72c..88fa6fdbe07 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -3707,6 +3707,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4139,6 +4140,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4263,7 +4265,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6172,6 +6176,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6187,6 +6192,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8150,6 +8156,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8175,6 +8182,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8454,6 +8462,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8499,6 +8508,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8830,6 +8840,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 4888317d87e..265cb7ab469 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -3707,6 +3707,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4139,6 +4140,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4263,7 +4265,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6172,6 +6176,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6187,6 +6192,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8149,6 +8155,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8174,6 +8181,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8453,6 +8461,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8498,6 +8507,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8829,6 +8839,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 6ac434b7126..64f691c05ec 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -3707,6 +3707,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4138,6 +4139,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4262,7 +4264,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6170,6 +6174,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6185,6 +6190,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8147,6 +8153,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8172,6 +8179,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8451,6 +8459,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8496,6 +8505,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8827,6 +8837,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 55462d75497..0ac7dfa05a4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -3705,6 +3705,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4136,6 +4137,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4260,7 +4262,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6167,6 +6171,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6182,6 +6187,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8143,6 +8149,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8168,6 +8175,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8447,6 +8455,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8492,6 +8501,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8821,6 +8831,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 2327163b9f8..9070ce99658 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -3704,6 +3704,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4135,6 +4136,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4259,7 +4261,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6165,6 +6169,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6180,6 +6185,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8140,6 +8146,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8165,6 +8172,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8444,6 +8452,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8489,6 +8498,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8818,6 +8828,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index c0bdb9c075f..37eff2fd08b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -3700,6 +3700,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4131,6 +4132,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4255,7 +4257,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6160,6 +6164,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6175,6 +6180,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8135,6 +8141,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8160,6 +8167,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8439,6 +8447,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8484,6 +8493,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8813,6 +8823,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index f7d9f4e7938..83f4314bb12 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -3344,6 +3344,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3695,6 +3696,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4126,6 +4128,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4250,7 +4253,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6154,6 +6159,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6169,6 +6175,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8129,6 +8136,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8154,6 +8162,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8433,6 +8442,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8478,6 +8488,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8807,6 +8818,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 625bb751dd7..fad6e89bae9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -3342,6 +3342,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3693,6 +3694,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4124,6 +4126,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4247,7 +4250,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6150,6 +6155,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6165,6 +6171,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8124,6 +8131,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8149,6 +8157,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8428,6 +8437,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8473,6 +8483,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8801,6 +8812,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index a86e275379d..de41ab241a4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -3341,6 +3341,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3692,6 +3693,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4123,6 +4125,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4246,7 +4249,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6148,6 +6153,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6163,6 +6169,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8120,6 +8127,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8145,6 +8153,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8424,6 +8433,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8469,6 +8479,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8796,6 +8807,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 5bd503e257b..56704b5a5dc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -3723,6 +3723,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4158,6 +4159,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4283,7 +4285,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6206,6 +6210,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6221,6 +6226,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8203,6 +8209,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8228,6 +8235,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8507,6 +8515,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8552,6 +8561,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index d214cf62b66..14b71d7d362 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -3340,6 +3340,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3691,6 +3692,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4122,6 +4124,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4245,7 +4248,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6147,6 +6152,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6162,6 +6168,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8117,6 +8124,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8142,6 +8150,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8421,6 +8430,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8466,6 +8476,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8793,6 +8804,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index a23e5cebefb..a4c6afbdc20 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -3340,6 +3340,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3691,6 +3692,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4122,6 +4124,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4245,7 +4248,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6146,6 +6151,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6161,6 +6167,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8115,6 +8122,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8140,6 +8148,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8417,6 +8426,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8462,6 +8472,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8788,6 +8799,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 159429c5915..6b945f2af10 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -3340,6 +3340,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3691,6 +3692,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4122,6 +4124,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4244,7 +4247,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6144,6 +6149,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6159,6 +6165,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8113,6 +8120,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8138,6 +8146,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8415,6 +8424,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8460,6 +8470,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8786,6 +8797,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 22cb853d62c..3ce4419e3e0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -3722,6 +3722,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4157,6 +4158,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4282,7 +4284,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6204,6 +6208,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6219,6 +6224,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8201,6 +8207,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8226,6 +8233,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8505,6 +8513,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8550,6 +8559,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 0b54e10bcf1..402e65f8b8f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -3721,6 +3721,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4156,6 +4157,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4281,7 +4283,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6202,6 +6206,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6217,6 +6222,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8197,6 +8203,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8222,6 +8229,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8501,6 +8509,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8546,6 +8555,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 21ce9326946..489f310c2d0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -3720,6 +3720,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4155,6 +4156,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4280,7 +4282,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6201,6 +6205,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6216,6 +6221,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8196,6 +8202,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8221,6 +8228,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8500,6 +8508,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8545,6 +8554,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 5f281520fe1..171d7187d19 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -3717,6 +3717,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4150,6 +4151,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4275,7 +4277,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6195,6 +6199,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6210,6 +6215,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8188,6 +8194,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8213,6 +8220,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8492,6 +8500,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8537,6 +8546,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8869,6 +8879,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 71801ba1ac6..d48d2912514 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -3716,6 +3716,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4149,6 +4150,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4274,7 +4276,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6194,6 +6198,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6209,6 +6214,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8187,6 +8193,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8212,6 +8219,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8491,6 +8499,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8536,6 +8545,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8868,6 +8878,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 03512c1024f..2363e401c29 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -3714,6 +3714,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4147,6 +4148,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4272,7 +4274,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6192,6 +6196,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6207,6 +6212,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8181,6 +8187,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8206,6 +8213,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8485,6 +8493,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8530,6 +8539,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8862,6 +8872,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 85897a41255..2c924184096 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -3710,6 +3710,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4143,6 +4144,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4268,7 +4270,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -6184,6 +6188,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -6199,6 +6204,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -8168,6 +8174,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -8193,6 +8200,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8472,6 +8480,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8517,6 +8526,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8848,6 +8858,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index e2c72b96b62..aa9d7348a73 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1657,6 +1657,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3252,6 +3253,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3600,6 +3602,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4024,6 +4027,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4143,7 +4147,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5891,6 +5897,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5977,6 +5984,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5992,6 +6000,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7906,6 +7915,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7930,6 +7940,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8201,6 +8212,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8246,6 +8258,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8563,6 +8576,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_2";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 42ad5e82e7e..1e1afff1d7a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1656,6 +1656,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3249,6 +3250,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3597,6 +3599,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4021,6 +4024,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4140,7 +4144,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5886,6 +5892,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5972,6 +5979,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5987,6 +5995,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7899,6 +7908,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7923,6 +7933,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8193,6 +8204,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8238,6 +8250,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8555,6 +8568,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index c36daa1f5e9..6be62d0311f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1644,6 +1644,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3221,6 +3222,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3566,6 +3568,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3989,6 +3992,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4107,7 +4111,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5837,6 +5843,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5922,6 +5929,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5937,6 +5945,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7828,6 +7837,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7852,6 +7862,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8120,6 +8131,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8164,6 +8176,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8303,6 +8316,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8472,6 +8486,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 25a29c1d60a..6968b8f22ff 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1644,6 +1644,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3219,6 +3220,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3564,6 +3566,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3987,6 +3990,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4105,7 +4109,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5835,6 +5841,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5920,6 +5927,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5935,6 +5943,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7824,6 +7833,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7848,6 +7858,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8116,6 +8127,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8160,6 +8172,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8299,6 +8312,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8468,6 +8482,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 28327fc0dd2..54a18bac10a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1643,6 +1643,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3215,6 +3216,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3559,6 +3561,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3982,6 +3985,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4100,7 +4104,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5830,6 +5836,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5915,6 +5922,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5930,6 +5938,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7816,6 +7825,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7840,6 +7850,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8108,6 +8119,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8152,6 +8164,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8291,6 +8304,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8460,6 +8474,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 0127a5f9330..e2f847f30df 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1643,6 +1643,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3215,6 +3216,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3559,6 +3561,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3982,6 +3985,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4099,7 +4103,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5828,6 +5834,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5913,6 +5920,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5928,6 +5936,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7813,6 +7822,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7837,6 +7847,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8105,6 +8116,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8149,6 +8161,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8287,6 +8300,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8456,6 +8470,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index b7422753928..1757791208f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -1641,6 +1641,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3209,6 +3210,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3553,6 +3555,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3976,6 +3979,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4093,7 +4097,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5820,6 +5826,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5905,6 +5912,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5920,6 +5928,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7805,6 +7814,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7829,6 +7839,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_3";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8097,6 +8108,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8141,6 +8153,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8278,6 +8291,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8447,6 +8461,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 93f64e0297e..11783029b1a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -1641,6 +1641,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3209,6 +3210,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3221,6 +3223,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3552,6 +3555,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3974,6 +3978,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4091,7 +4096,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5816,6 +5823,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5901,6 +5909,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5916,6 +5925,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7800,6 +7810,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7824,6 +7835,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_3";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8092,6 +8104,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8136,6 +8149,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8273,6 +8287,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8442,6 +8457,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 547e69051d1..e188ec15cbb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -1640,6 +1640,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3207,6 +3208,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3219,6 +3221,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3550,6 +3553,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3971,6 +3975,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4088,7 +4093,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5811,6 +5818,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5896,6 +5904,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5911,6 +5920,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7788,6 +7798,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7812,6 +7823,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_3";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8080,6 +8092,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8124,6 +8137,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8261,6 +8275,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8430,6 +8445,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index bc49a4c4d8b..5875789a2af 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -1639,6 +1639,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3205,6 +3206,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3217,6 +3219,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3548,6 +3551,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3968,6 +3972,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4085,7 +4090,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5805,6 +5812,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5890,6 +5898,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5905,6 +5914,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7782,6 +7792,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7806,6 +7817,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_3";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8074,6 +8086,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8118,6 +8131,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8255,6 +8269,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8424,6 +8439,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 9fcfa0c19a1..58b5849579c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -1639,6 +1639,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3204,6 +3205,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3216,6 +3218,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3545,6 +3548,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3963,6 +3967,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4079,7 +4084,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5796,6 +5803,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5881,6 +5889,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5896,6 +5905,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7769,6 +7779,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7793,6 +7804,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_3";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8061,6 +8073,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8105,6 +8118,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8242,6 +8256,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8411,6 +8426,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 5b282ac41e0..3eeb0194a49 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -1636,6 +1636,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3198,6 +3199,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3210,6 +3212,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3539,6 +3542,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3957,6 +3961,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4073,7 +4078,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5784,6 +5791,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5869,6 +5877,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5884,6 +5893,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7754,6 +7764,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7778,6 +7789,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_4";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8046,6 +8058,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8090,6 +8103,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8227,6 +8241,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8395,6 +8410,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 1ebe77d959a..69483ad17f0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1654,6 +1654,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3246,6 +3247,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3593,6 +3595,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4017,6 +4020,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4136,7 +4140,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5880,6 +5886,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5966,6 +5973,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5981,6 +5989,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7889,6 +7898,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7913,6 +7923,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8183,6 +8194,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8228,6 +8240,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8544,6 +8557,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 76dc6b16681..535391a6252 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -1635,6 +1635,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3197,6 +3198,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3209,6 +3211,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3538,6 +3541,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3956,6 +3960,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4072,7 +4077,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5782,6 +5789,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5867,6 +5875,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5882,6 +5891,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7748,6 +7758,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7772,6 +7783,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_4";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8040,6 +8052,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8084,6 +8097,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8221,6 +8235,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8388,6 +8403,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 3cfb0693f21..3f7fe51cd18 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -1635,6 +1635,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3194,6 +3195,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3206,6 +3208,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3535,6 +3538,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3952,6 +3956,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4068,7 +4073,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5775,6 +5782,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5860,6 +5868,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5875,6 +5884,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7727,6 +7737,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7750,6 +7761,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8018,6 +8030,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8062,6 +8075,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8194,6 +8208,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8361,6 +8376,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index bf031881d65..e3fb760f538 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -1635,6 +1635,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3192,6 +3193,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3204,6 +3206,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3533,6 +3536,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3950,6 +3954,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4065,7 +4070,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5769,6 +5776,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5854,6 +5862,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5869,6 +5878,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7721,6 +7731,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7744,6 +7755,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8012,6 +8024,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8056,6 +8069,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8188,6 +8202,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8355,6 +8370,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_6";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index faad5bb99d4..fe46fd0999f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1653,6 +1653,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3243,6 +3244,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3590,6 +3592,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4014,6 +4017,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4133,7 +4137,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5876,6 +5882,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5962,6 +5969,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5977,6 +5985,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7882,6 +7891,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7906,6 +7916,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8175,6 +8186,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8220,6 +8232,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8535,6 +8548,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 76d1fc195f9..6d56cc3fd65 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1653,6 +1653,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3243,6 +3244,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3590,6 +3592,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4014,6 +4017,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4133,7 +4137,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5876,6 +5882,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5962,6 +5969,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5977,6 +5985,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7881,6 +7890,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7905,6 +7915,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8174,6 +8185,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8219,6 +8231,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8533,6 +8546,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index cd190f6fec1..bc5a71482e4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1652,6 +1652,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3241,6 +3242,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3588,6 +3590,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4012,6 +4015,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4130,7 +4134,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5869,6 +5875,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5955,6 +5962,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5970,6 +5978,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7869,6 +7878,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7893,6 +7903,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8162,6 +8173,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8207,6 +8219,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8520,6 +8533,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index aeea6d22b6d..f9bb0ec0e00 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1652,6 +1652,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3240,6 +3241,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3585,6 +3587,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4009,6 +4012,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4127,7 +4131,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5862,6 +5868,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5948,6 +5955,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5963,6 +5971,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7861,6 +7870,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7885,6 +7895,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8154,6 +8165,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8198,6 +8210,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8511,6 +8524,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 53311a3df47..fb31054c6e7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1650,6 +1650,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3237,6 +3238,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3582,6 +3584,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4005,6 +4008,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4123,7 +4127,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5857,6 +5863,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5943,6 +5950,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5958,6 +5966,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7853,6 +7862,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7877,6 +7887,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8146,6 +8157,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8190,6 +8202,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8501,6 +8514,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 4226be5db23..f5c350e91c1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1650,6 +1650,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3230,6 +3231,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3575,6 +3577,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3998,6 +4001,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4116,7 +4120,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5848,6 +5854,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5934,6 +5941,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5949,6 +5957,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7842,6 +7851,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7866,6 +7876,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8135,6 +8146,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8179,6 +8191,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8490,6 +8503,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index a973edbf42f..e2d045ed44d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1647,6 +1647,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3225,6 +3226,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3570,6 +3572,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3993,6 +3996,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4111,7 +4115,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5843,6 +5849,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5928,6 +5935,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5943,6 +5951,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-description-remote" = dontDistribute super."package-description-remote";
@@ -7836,6 +7845,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7860,6 +7870,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -8129,6 +8140,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8173,6 +8185,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8484,6 +8497,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index eff8ca3cc61..d744f166c32 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -340,6 +340,7 @@ self: super: {
   "GPipe" = doDistribute super."GPipe_2_1_5";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1532,6 +1533,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3041,6 +3043,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3053,6 +3056,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3373,6 +3377,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3777,6 +3782,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3889,7 +3895,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5524,6 +5532,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5605,6 +5614,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5620,6 +5630,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-o-tron" = dontDistribute super."package-o-tron";
@@ -7382,6 +7393,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7405,6 +7417,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_4";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -7655,6 +7668,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -7698,6 +7712,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -7814,6 +7829,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 612919ac2c9..8645bceb82e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -340,6 +340,7 @@ self: super: {
   "GPipe" = doDistribute super."GPipe_2_1_5";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1530,6 +1531,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3035,6 +3037,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3047,6 +3050,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3367,6 +3371,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3771,6 +3776,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3882,7 +3888,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5509,6 +5517,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5590,6 +5599,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5605,6 +5615,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-o-tron" = dontDistribute super."package-o-tron";
@@ -7365,6 +7376,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7387,6 +7399,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -7637,6 +7650,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -7680,6 +7694,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -7795,6 +7810,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index f103942113d..ecca396a71c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -338,6 +338,7 @@ self: super: {
   "GPipe" = doDistribute super."GPipe_2_1_5";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1525,6 +1526,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3017,6 +3019,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3029,6 +3032,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3347,6 +3351,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3735,6 +3740,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_2";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3745,6 +3751,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3855,7 +3862,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -5469,6 +5478,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5550,6 +5560,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5565,6 +5576,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-o-tron" = dontDistribute super."package-o-tron";
@@ -7309,6 +7321,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7331,6 +7344,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -7581,6 +7595,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -7624,6 +7639,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -7631,6 +7647,7 @@ self: super: {
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_14";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7735,6 +7752,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 75dc1fec671..9934d049508 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -334,6 +334,7 @@ self: super: {
   "GPipe" = doDistribute super."GPipe_2_1_6";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1504,6 +1505,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -2962,6 +2964,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -2973,6 +2976,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3284,6 +3288,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3670,6 +3675,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_2";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3680,6 +3686,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3790,7 +3797,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -4955,7 +4964,6 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
-  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5386,6 +5394,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5466,6 +5475,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5481,6 +5491,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-o-tron" = dontDistribute super."package-o-tron";
@@ -7188,6 +7199,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7210,6 +7222,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -7453,6 +7466,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -7497,12 +7511,14 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_14";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7606,6 +7622,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index 1c901164f84..37a5a87c4f2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -332,6 +332,7 @@ self: super: {
   "GPX" = dontDistribute super."GPX";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1498,6 +1499,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -2950,6 +2952,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -2961,6 +2964,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3272,6 +3276,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3658,6 +3663,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_2";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3668,6 +3674,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3778,7 +3785,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -4573,6 +4582,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_2";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4941,7 +4951,6 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
-  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5370,6 +5379,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5450,6 +5460,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5465,6 +5476,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-o-tron" = dontDistribute super."package-o-tron";
@@ -7169,6 +7181,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7191,6 +7204,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -7434,6 +7448,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-space-points" = dontDistribute super."vector-space-points";
@@ -7477,12 +7492,14 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_14";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7586,6 +7603,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index e42fbcebc2a..0e4e457bf1e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -332,6 +332,7 @@ self: super: {
   "GPX" = dontDistribute super."GPX";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1497,6 +1498,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -2944,6 +2946,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -2955,6 +2958,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3264,6 +3268,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3649,6 +3654,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_2";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3659,6 +3665,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3769,7 +3776,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -4562,6 +4571,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_2";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4930,7 +4940,6 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
-  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5353,6 +5362,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5433,6 +5443,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5448,6 +5459,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-o-tron" = dontDistribute super."package-o-tron";
@@ -6772,6 +6784,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_1";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7143,6 +7156,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7165,6 +7179,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -7407,6 +7422,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-space-points" = dontDistribute super."vector-space-points";
@@ -7450,12 +7466,14 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_14";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7559,6 +7577,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
index 9b45729c2ff..2e3c31fe650 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -330,6 +330,7 @@ self: super: {
   "GPX" = dontDistribute super."GPX";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1489,6 +1490,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -2918,6 +2920,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -2929,6 +2932,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -3236,6 +3240,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3621,6 +3626,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_2";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3631,6 +3637,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3741,7 +3748,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -4533,6 +4542,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_2";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4899,7 +4909,6 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
-  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5320,6 +5329,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5400,6 +5410,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5415,6 +5426,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-o-tron" = dontDistribute super."package-o-tron";
@@ -6726,6 +6738,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_1";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7096,6 +7109,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7118,6 +7132,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -7359,6 +7374,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-space-points" = dontDistribute super."vector-space-points";
@@ -7402,12 +7418,14 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_14";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7508,6 +7526,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
index 7c553d410e3..a167ad714b8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
@@ -330,6 +330,7 @@ self: super: {
   "GPX" = dontDistribute super."GPX";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1487,6 +1488,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -2904,6 +2906,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -2915,6 +2918,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -3221,6 +3225,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3604,6 +3609,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_2";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3614,6 +3620,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3724,7 +3731,9 @@ self: super: {
   "hint-server" = dontDistribute super."hint-server";
   "hinvaders" = dontDistribute super."hinvaders";
   "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
   "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
   "hipe" = dontDistribute super."hipe";
   "hips" = dontDistribute super."hips";
   "hircules" = dontDistribute super."hircules";
@@ -4513,6 +4522,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_2";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4877,7 +4887,6 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
-  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5289,6 +5298,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5369,6 +5379,7 @@ self: super: {
   "orchid-demo" = dontDistribute super."orchid-demo";
   "ord-adhoc" = dontDistribute super."ord-adhoc";
   "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
   "order-statistics" = dontDistribute super."order-statistics";
   "ordered" = dontDistribute super."ordered";
   "orders" = dontDistribute super."orders";
@@ -5384,6 +5395,7 @@ self: super: {
   "osx-ar" = dontDistribute super."osx-ar";
   "ot" = dontDistribute super."ot";
   "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
   "overture" = dontDistribute super."overture";
   "pack" = dontDistribute super."pack";
   "package-o-tron" = dontDistribute super."package-o-tron";
@@ -6691,6 +6703,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_1";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7060,6 +7073,7 @@ self: super: {
   "tsession" = dontDistribute super."tsession";
   "tsession-happstack" = dontDistribute super."tsession-happstack";
   "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
   "tslogger" = dontDistribute super."tslogger";
   "tsp-viz" = dontDistribute super."tsp-viz";
   "tsparse" = dontDistribute super."tsparse";
@@ -7082,6 +7096,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
   "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@@ -7322,6 +7337,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-space-points" = dontDistribute super."vector-space-points";
@@ -7364,12 +7380,14 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_14";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7470,6 +7488,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
new file mode 100644
index 00000000000..90bd4fed403
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
@@ -0,0 +1,7746 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-5.5 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "EdisonAPI" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "Gifcurry" = dontDistribute super."Gifcurry";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hclip" = dontDistribute super."Hclip";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IOSpec" = dontDistribute super."IOSpec";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "NumberTheory" = dontDistribute super."NumberTheory";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickCheck-safe" = dontDistribute super."QuickCheck-safe";
+  "QuickPlot" = dontDistribute super."QuickPlot";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "Stream" = dontDistribute super."Stream";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "Vulkan" = dontDistribute super."Vulkan";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adler32" = dontDistribute super."adler32";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-schema" = dontDistribute super."aeson-schema";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alea" = dontDistribute super."alea";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon2" = dontDistribute super."argon2";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "arrows" = dontDistribute super."arrows";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesome-prelude" = dontDistribute super."awesome-prelude";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base-orphans" = doDistribute super."base-orphans_0_5_2";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "bencoding" = dontDistribute super."bencoding";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bifunctors" = doDistribute super."bifunctors_5_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
+  "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloodhound" = dontDistribute super."bloodhound";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
+  "brainfuck" = dontDistribute super."brainfuck";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "conceit" = dontDistribute super."conceit";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "cond" = dontDistribute super."cond";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
+  "conf" = dontDistribute super."conf";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-omega" = dontDistribute super."control-monad-omega";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "converge" = dontDistribute super."converge";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default-extra" = dontDistribute super."data-default-extra";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-or" = dontDistribute super."data-or";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-monoid" = dontDistribute super."derive-monoid";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "djembe" = dontDistribute super."djembe";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "doctest-discover" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynobud" = dontDistribute super."dynobud";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "eithers" = dontDistribute super."eithers";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-growler" = dontDistribute super."engine-io-growler";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envparse" = dontDistribute super."envparse";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "external-sort" = dontDistribute super."external-sort";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-mcmc" = dontDistribute super."flat-mcmc";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "fordo" = dontDistribute super."fordo";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
+  "freekick2" = dontDistribute super."freekick2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "funcons-tools" = dontDistribute super."funcons-tools";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gamma" = dontDistribute super."gamma";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github-backup" = dontDistribute super."github-backup";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-utils" = dontDistribute super."github-utils";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gore-and-ash" = dontDistribute super."gore-and-ash";
+  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
+  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
+  "gore-and-ash-glfw" = dontDistribute super."gore-and-ash-glfw";
+  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
+  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
+  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
+  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "grasp" = dontDistribute super."grasp";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
+  "grid" = dontDistribute super."grid";
+  "gridfs" = dontDistribute super."gridfs";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "groupoid" = dontDistribute super."groupoid";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
+  "haiji" = dontDistribute super."haiji";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-filestore" = dontDistribute super."hakyll-filestore";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hardware-edsl" = dontDistribute super."hardware-edsl";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harpy" = dontDistribute super."harpy";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_2";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_19_6";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres" = dontDistribute super."hasql-postgres";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl-amazonka" = dontDistribute super."haxl-amazonka";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbayes" = dontDistribute super."hbayes";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_2";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "herf-time" = dontDistribute super."herf-time";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_30";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-repa" = dontDistribute super."hmatrix-repa";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt" = dontDistribute super."hmt";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hoppy-generator" = dontDistribute super."hoppy-generator";
+  "hoppy-runtime" = dontDistribute super."hoppy-runtime";
+  "hoppy-std" = dontDistribute super."hoppy-std";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = dontDistribute super."hpack";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-GeoIP" = dontDistribute super."hs-GeoIP";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsay" = dontDistribute super."hsay";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htoml" = dontDistribute super."htoml";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_5";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
+  "hzk" = dontDistribute super."hzk";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imap" = dontDistribute super."imap";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "isohunt" = dontDistribute super."isohunt";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lackey" = dontDistribute super."lackey";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot" = dontDistribute super."lambdabot";
+  "lambdabot-core" = dontDistribute super."lambdabot-core";
+  "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins";
+  "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins";
+  "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins";
+  "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins";
+  "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins";
+  "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins";
+  "lambdabot-trusted" = dontDistribute super."lambdabot-trusted";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_2";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysmallcheck" = dontDistribute super."lazysmallcheck";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logfloat" = dontDistribute super."logfloat";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logict-state" = dontDistribute super."logict-state";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "lol-apps" = dontDistribute super."lol-apps";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandulia" = dontDistribute super."mandulia";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
+  "mdcat" = dontDistribute super."mdcat";
+  "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
+  "mecab" = dontDistribute super."mecab";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "mohws" = dontDistribute super."mohws";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = doDistribute super."mwc-probability_1_0_3";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = dontDistribute super."nested-routes";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype" = dontDistribute super."numtype";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oanda-rest-api" = dontDistribute super."oanda-rest-api";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
+  "oeis" = dontDistribute super."oeis";
+  "off-simple" = dontDistribute super."off-simple";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "operational-extra" = dontDistribute super."operational-extra";
+  "opml" = dontDistribute super."opml";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_1";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "parsec-extra" = dontDistribute super."parsec-extra";
+  "parsec-numbers" = dontDistribute super."parsec-numbers";
+  "parsec-parsers" = dontDistribute super."parsec-parsers";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partial" = dontDistribute super."partial";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_7";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-json" = dontDistribute super."remote-json";
+  "remote-json-client" = dontDistribute super."remote-json-client";
+  "remote-json-server" = dontDistribute super."remote-json-server";
+  "remote-monad" = dontDistribute super."remote-monad";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retryer" = dontDistribute super."retryer";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_7_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-elm" = dontDistribute super."servant-elm";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "show" = dontDistribute super."show";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log" = dontDistribute super."simple-log";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc" = dontDistribute super."simpleirc";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sql-words" = dontDistribute super."sql-words";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-record" = dontDistribute super."state-record";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_1";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_2_1";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "symbol" = dontDistribute super."symbol";
+  "sync" = dontDistribute super."sync";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "t-regex" = dontDistribute super."t-regex";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "testPkg" = dontDistribute super."testPkg";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show" = doDistribute super."text-show_2_1_2";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracker" = dontDistribute super."tracker";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
+  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlambda" = dontDistribute super."unlambda";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-space-points" = dontDistribute super."vector-space-points";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vivid" = dontDistribute super."vivid";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
+  "waddle" = dontDistribute super."waddle";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_14";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wuss" = dontDistribute super."wuss";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "zippo" = dontDistribute super."zippo";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zot" = dontDistribute super."zot";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b363ca74bfe..09e2ef0ec8e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -17,7 +17,6 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/3d-graphics-examples";
        description = "Examples of 3D graphics programming with OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "3dmodels" = callPackage
@@ -33,7 +32,6 @@ self: {
        homepage = "https://github.com/capsjac/3dmodels";
        description = "3D model parsers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "4Blocks" = callPackage
@@ -51,7 +49,6 @@ self: {
        homepage = "http://lambdacolyte.wordpress.com/2009/08/06/tetris-in-haskell/";
        description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AAI" = callPackage
@@ -113,7 +110,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Detect which OS you're running on";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-Colour" = callPackage
@@ -136,7 +132,6 @@ self: {
        libraryHaskellDepends = [ array base gtk ];
        description = "GTK+ pixel plotting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-HalfInteger" = callPackage
@@ -148,7 +143,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient half-integer type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-MiniTest" = callPackage
@@ -160,7 +154,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A simple test framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-PPM" = callPackage
@@ -194,7 +187,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Trivial wrapper over ansi-terminal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-VanillaArray" = callPackage
@@ -207,7 +199,6 @@ self: {
        jailbreak = true;
        description = "Immutable arrays with plain integer indicies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-Vector" = callPackage
@@ -246,7 +237,6 @@ self: {
        homepage = "http://alkalisoftware.net";
        description = "Essential features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ADPfusion" = callPackage
@@ -275,7 +265,6 @@ self: {
        homepage = "https://github.com/choener/ADPfusion";
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Basics" = callPackage
@@ -297,7 +286,6 @@ self: {
        homepage = "http://code.google.com/p/aern/";
        description = "foundational type classes for approximating exact real numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Net" = callPackage
@@ -315,7 +303,6 @@ self: {
        homepage = "http://www-users.aston.ac.uk/~konecnym/DISCERN";
        description = "Compositional lazy dataflow networks for exact real number computation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Real" = callPackage
@@ -334,7 +321,6 @@ self: {
        homepage = "http://code.google.com/p/aern/";
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Real-Double" = callPackage
@@ -360,7 +346,6 @@ self: {
        homepage = "http://code.google.com/p/aern/";
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Real-Interval" = callPackage
@@ -379,7 +364,6 @@ self: {
        homepage = "http://code.google.com/p/aern/";
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-RnToRm" = callPackage
@@ -398,7 +382,6 @@ self: {
        homepage = "http://www-users.aston.ac.uk/~konecnym/DISCERN";
        description = "polynomial function enclosures (PFEs) approximating exact real functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-RnToRm-Plot" = callPackage
@@ -418,7 +401,6 @@ self: {
        homepage = "http://www-users.aston.ac.uk/~konecnym/DISCERN";
        description = "GL plotting of polynomial function enclosures (PFEs)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AES" = callPackage
@@ -450,7 +432,6 @@ self: {
        homepage = "http://src.seereason.com/haskell-agi";
        description = "A library for writing AGI scripts for Asterisk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ALUT" = callPackage
@@ -469,7 +450,6 @@ self: {
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding for the OpenAL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freealut;};
 
   "AMI" = callPackage
@@ -486,7 +466,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/ami";
        description = "Low-level bindings for Asterisk Manager Interface (AMI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ANum" = callPackage
@@ -605,7 +584,6 @@ self: {
        homepage = "https://github.com/egonSchiele/actionkid";
        description = "An easy-to-use video game framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Adaptive" = callPackage
@@ -622,7 +600,6 @@ self: {
        jailbreak = true;
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Adaptive-Blaisorblade" = callPackage
@@ -636,7 +613,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Advgame" = callPackage
@@ -651,7 +627,6 @@ self: {
        jailbreak = true;
        description = "Lisperati's adventure game in Lisp translated to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AesonBson" = callPackage
@@ -670,7 +645,6 @@ self: {
        homepage = "https://github.com/nh2/AesonBson";
        description = "Mapping between Aeson's JSON and Bson objects";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Agata" = callPackage
@@ -687,7 +661,6 @@ self: {
        jailbreak = true;
        description = "Generator-generator for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Agda_2_4_2_3" = callPackage
@@ -829,7 +802,6 @@ self: {
        homepage = "http://github.com/lymar/AhoCorasick";
        description = "Aho-Corasick string matching algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AlgorithmW" = callPackage
@@ -861,7 +833,6 @@ self: {
        homepage = "https://github.com/choener/AlignmentAlgorithms";
        description = "Collection of alignment algorithms";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Allure" = callPackage
@@ -885,7 +856,6 @@ self: {
        homepage = "http://allureofthestars.com";
        description = "Near-future Sci-Fi roguelike and tactical squad game";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AndroidViewHierarchyImporter" = callPackage
@@ -906,7 +876,6 @@ self: {
        jailbreak = true;
        description = "Android view hierarchy importer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Animas" = callPackage
@@ -919,7 +888,6 @@ self: {
        homepage = "https://github.com/eamsden/Animas";
        description = "Updated version of Yampa: a library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Annotations" = callPackage
@@ -964,7 +932,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for Apple Push Notification Service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AppleScript" = callPackage
@@ -978,7 +945,6 @@ self: {
        homepage = "https://github.com/reinerp/haskell-AppleScript";
        description = "Call AppleScript from Haskell, and then call back into Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ApproxFun-hs" = callPackage
@@ -1004,7 +970,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Library/ArrayRef";
        description = "Unboxed references, dynamic arrays and more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ArrowVHDL" = callPackage
@@ -1018,7 +983,6 @@ self: {
        homepage = "https://github.com/frosch03/arrowVHDL";
        description = "A library to generate Netlist code from Arrow descriptions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AspectAG" = callPackage
@@ -1036,7 +1000,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG";
        description = "Attribute Grammars in the form of an EDSL";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AttoBencode" = callPackage
@@ -1076,7 +1039,6 @@ self: {
        homepage = "http://github.com/konn/AttoJSON";
        description = "Simple lightweight JSON parser, generator & manipulator based on ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Attrac" = callPackage
@@ -1094,7 +1056,6 @@ self: {
        homepage = "http://patch-tag.com/r/rhz/StrangeAttractors";
        description = "Visualisation of Strange Attractors in 3-Dimensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Aurochs" = callPackage
@@ -1108,7 +1069,6 @@ self: {
        executableHaskellDepends = [ base containers parsec pretty ];
        description = "Yet another parser generator for C/C++";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AutoForms" = callPackage
@@ -1125,7 +1085,6 @@ self: {
        homepage = "http://autoforms.sourceforge.net/";
        description = "GUI library based upon generic programming (SYB3)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AvlTree" = callPackage
@@ -1137,7 +1096,6 @@ self: {
        libraryHaskellDepends = [ base COrdering ];
        description = "Balanced binary trees using the AVL algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BASIC" = callPackage
@@ -1149,7 +1107,6 @@ self: {
        libraryHaskellDepends = [ base containers llvm random timeit ];
        description = "Embedded BASIC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BCMtools" = callPackage
@@ -1176,7 +1133,6 @@ self: {
        ];
        description = "Big Contact Map Tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BNFC" = callPackage
@@ -1202,7 +1158,6 @@ self: {
        homepage = "http://bnfc.digitalgrammars.com/";
        description = "A compiler front-end generator";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BNFC-meta" = callPackage
@@ -1234,7 +1189,6 @@ self: {
        homepage = "http://pageperso.lif.univ-mrs.fr/~pierre-etienne.meunier/Baggins";
        description = "Tools for self-assembly";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Bang" = callPackage
@@ -1281,7 +1235,6 @@ self: {
        homepage = "http://sep07.mroot.net/";
        description = "An ad-hoc P2P chat program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Befunge93" = callPackage
@@ -1297,7 +1250,6 @@ self: {
        homepage = "http://coder.bsimmons.name/blog/2010/05/befunge-93-interpreter-on-hackage";
        description = "An interpreter for the Befunge-93 Programming Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BenchmarkHistory" = callPackage
@@ -1344,7 +1296,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML";
        description = "Berkeley DB XML binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) db; dbxml = null; inherit (pkgs) xercesc; 
          xqilla = null;};
 
@@ -1372,7 +1323,6 @@ self: {
        homepage = "https://github.com/mchakravarty/BigPixel";
        description = "Image editor for pixel art";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Binpack" = callPackage
@@ -1407,7 +1357,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Base library for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseBlast" = callPackage
@@ -1420,7 +1369,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "BLAST-related tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseDotP" = callPackage
@@ -1433,7 +1381,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Vienna / DotBracket / ExtSS parsers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseFR3D" = callPackage
@@ -1451,7 +1398,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Importer for FR3D resources";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseFasta" = callPackage
@@ -1472,7 +1418,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "conduit-based FASTA parser";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseInfernal" = callPackage
@@ -1494,7 +1439,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Infernal data structures and tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseMAF" = callPackage
@@ -1507,7 +1451,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Multiple Alignment Format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseTrainingData" = callPackage
@@ -1529,7 +1472,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "RNA folding training data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseTurner" = callPackage
@@ -1548,7 +1490,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Import Turner RNA parameters";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseTypes" = callPackage
@@ -1590,7 +1531,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Import Vienna energy parameters";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseXNA" = callPackage
@@ -1630,7 +1570,6 @@ self: {
        jailbreak = true;
        description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BitSyntax" = callPackage
@@ -1655,9 +1594,8 @@ self: {
        sha256 = "31aba41c4abbbc003b685e3110b518e1202486551d935ceec6805d63cd7bb5de";
        libraryHaskellDepends = [ base HTTP json2 ];
        homepage = "http://bitbucket.org/jetxee/hs-bitly/";
-       description = "A library to access bit.ly URL shortener";
+       description = "A library to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BlastHTTP_1_0_1" = callPackage
@@ -1718,7 +1656,6 @@ self: {
        homepage = "http://www.cs.york.ac.uk/fp/darcs/Blobs/";
        description = "Diagram editor";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BlogLiterately_0_7_1_7" = callPackage
@@ -1970,7 +1907,6 @@ self: {
        homepage = "http://github.com/gcross/Blueprint";
        description = "Preview of a new build system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Bookshelf" = callPackage
@@ -1991,7 +1927,6 @@ self: {
        homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html";
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Boolean" = callPackage
@@ -2032,7 +1967,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Bravo";
        description = "Static text template generation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BufferedSocket" = callPackage
@@ -2070,7 +2004,6 @@ self: {
        homepage = "http://github.com/michaelxavier/Buster";
        description = "Hits a set of urls periodically to bust caches";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CBOR" = callPackage
@@ -2092,7 +2025,6 @@ self: {
        homepage = "https://github.com/orclev/CBOR";
        description = "Encode/Decode values to/from CBOR";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont" = callPackage
@@ -2105,7 +2037,6 @@ self: {
        homepage = "http://code.haskell.org/~dolio/CC-delcont";
        description = "Delimited continuations and dynamically scoped variables";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-alt" = callPackage
@@ -2123,7 +2054,6 @@ self: {
        doHaddock = false;
        description = "Three new monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-cxe" = callPackage
@@ -2135,7 +2065,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-exc" = callPackage
@@ -2147,7 +2076,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-ref" = callPackage
@@ -2159,7 +2087,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-ref-tf" = callPackage
@@ -2171,7 +2098,6 @@ self: {
        libraryHaskellDepends = [ base ref-tf transformers ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CCA" = callPackage
@@ -2221,7 +2147,6 @@ self: {
        homepage = "http://www.zonetora.co.uk/clase/";
        description = "Cursor Library for A Structured Editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CLI" = callPackage
@@ -2255,7 +2180,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/software/cmcompare/";
        description = "Infernal covariance model comparison";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CMQ" = callPackage
@@ -2284,7 +2208,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An algebraic data type similar to Prelude Ordering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CPBrainfuck" = callPackage
@@ -2298,7 +2221,6 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "A simple Brainfuck interpretter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CPL" = callPackage
@@ -2314,7 +2236,6 @@ self: {
        ];
        description = "An interpreter of Hagino's Categorical Programming Language (CPL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CSPM-CoreLanguage" = callPackage
@@ -2343,7 +2264,6 @@ self: {
        jailbreak = true;
        description = "Firing rules semantic of CSPM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CSPM-Frontend" = callPackage
@@ -2421,7 +2341,6 @@ self: {
        jailbreak = true;
        description = "cspm command line tool for analyzing CSPM specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CTRex" = callPackage
@@ -2468,7 +2387,6 @@ self: {
        homepage = "http://aleator.github.com/CV/";
        description = "OpenCV based machine vision library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {opencv_calib3d = null; opencv_contrib = null; 
          opencv_core = null; opencv_features2d = null; opencv_flann = null; 
          opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; 
@@ -2637,6 +2555,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Cabal_1_22_8_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , deepseq, directory, extensible-exceptions, filepath, HUnit
+     , old-time, pretty, process, QuickCheck, regex-posix
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , time, unix
+     }:
+     mkDerivation {
+       pname = "Cabal";
+       version = "1.22.8.0";
+       sha256 = "2a42a2ddecb6450f87ed3a2b37af81dcc573dfde8f0db16f695c78674a80a34e";
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         pretty process time unix
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory extensible-exceptions filepath
+         HUnit old-time process QuickCheck regex-posix test-framework
+         test-framework-hunit test-framework-quickcheck2 unix
+       ];
+       homepage = "http://www.haskell.org/cabal/";
+       description = "A framework for packaging Haskell software";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Cabal-ide-backend" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , deepseq, directory, extensible-exceptions, filepath, HUnit
@@ -2695,7 +2639,6 @@ self: {
        homepage = "https://github.com/Icelandjack/Capabilities";
        description = "Separate and contain effects of IO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Cardinality" = callPackage
@@ -2705,7 +2648,7 @@ self: {
        version = "0.2";
        sha256 = "b619bc5eee6c495bb047bdf34abfb739caba7710114013778f1a01ba0b017705";
        libraryHaskellDepends = [ base containers mtl ];
-       description = "Measure container capacity. Use it to safely change container";
+       description = "Measure container capacity. Use it to safely change container.";
        license = "LGPL";
      }) {};
 
@@ -2760,7 +2703,6 @@ self: {
        homepage = "http://github.com/rampion/Cascade";
        description = "Playing with reified categorical composition";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Catana" = callPackage
@@ -2772,7 +2714,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad for complex manipulation of a stream";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ChannelT" = callPackage
@@ -2880,6 +2821,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart_1_6" = callPackage
+    ({ mkDerivation, array, base, colour, data-default-class, lens, mtl
+     , old-locale, operational, time, vector
+     }:
+     mkDerivation {
+       pname = "Chart";
+       version = "1.6";
+       sha256 = "0f73779ab322346cac7c131f58dbda9bcaf1f43693a9e102510be80a07569ea5";
+       libraryHaskellDepends = [
+         array base colour data-default-class lens mtl old-locale
+         operational time vector
+       ];
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "A library for generating 2D Charts and Plots";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-cairo_1_5_1" = callPackage
     ({ mkDerivation, array, base, cairo, Chart, colour
      , data-default-class, lens, mtl, old-locale, operational, time
@@ -2916,6 +2875,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart-cairo_1_6" = callPackage
+    ({ mkDerivation, array, base, cairo, Chart, colour
+     , data-default-class, lens, mtl, old-locale, operational, time
+     }:
+     mkDerivation {
+       pname = "Chart-cairo";
+       version = "1.6";
+       sha256 = "e209b6b4d7d7f392593cbd3e8a8cde1d5af83066fee994195e4b25bda680ca0f";
+       libraryHaskellDepends = [
+         array base cairo Chart colour data-default-class lens mtl
+         old-locale operational time
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "Cairo backend for Charts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-diagrams_1_3_2" = callPackage
     ({ mkDerivation, base, blaze-svg, bytestring, Chart, colour
      , containers, data-default-class, diagrams-core, diagrams-lib
@@ -2993,6 +2971,29 @@ self: {
        pname = "Chart-diagrams";
        version = "1.5.4";
        sha256 = "e2dcab357629b180bb05b905de995475a6ed5644437aba79f4bcc4ebae5f0b10";
+       revision = "1";
+       editedCabalFile = "3a49f15ac705c529104a04e8ccf5b4a8f113b7d62a9b824876fbd159c4960df8";
+       libraryHaskellDepends = [
+         base blaze-markup bytestring Chart colour containers
+         data-default-class diagrams-core diagrams-lib diagrams-postscript
+         diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts
+         text time
+       ];
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "Diagrams backend for Charts";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "Chart-diagrams_1_6" = callPackage
+    ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour
+     , containers, data-default-class, diagrams-core, diagrams-lib
+     , diagrams-postscript, diagrams-svg, lens, lucid-svg, mtl
+     , old-locale, operational, SVGFonts, text, time
+     }:
+     mkDerivation {
+       pname = "Chart-diagrams";
+       version = "1.6";
+       sha256 = "c4c5a60bc623bb3221da113c84c0400b4dd75c481e64f5a9b6788b923ff998eb";
        libraryHaskellDepends = [
          base blaze-markup bytestring Chart colour containers
          data-default-class diagrams-core diagrams-lib diagrams-postscript
@@ -3003,6 +3004,7 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-gtk" = callPackage
@@ -3011,12 +3013,13 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-gtk";
-       version = "1.5.1";
-       sha256 = "9c06817715d0f336f0dc987c044fd9599204fb1e1949c11bd54f34abd7b2ba08";
+       version = "1.6";
+       sha256 = "f566a4fbdfcca207640a76e2c953617b27954e3f49258c7ab425270379b954c7";
        libraryHaskellDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
        ];
+       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Utility functions for using the chart library with GTK";
        license = stdenv.lib.licenses.bsd3;
@@ -3201,7 +3204,6 @@ self: {
        homepage = "https://github.com/ckkashyap/Chitra";
        description = "A platform independent mechanism to render graphics using vnc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ChristmasTree" = callPackage
@@ -3219,7 +3221,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/TTTAS";
        description = "Alternative approach of 'read' that composes grammars instead of parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CirruParser" = callPackage
@@ -3245,7 +3246,6 @@ self: {
        homepage = "http://wiki.portal.chalmers.se/cse/pmwiki.php/FP/ClassLaws";
        description = "Stating and checking laws for type class methods";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ClassyPrelude" = callPackage
@@ -3257,7 +3257,6 @@ self: {
        libraryHaskellDepends = [ base strict ];
        description = "Prelude replacement using classes instead of concrete types where reasonable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Clean" = callPackage
@@ -3270,7 +3269,6 @@ self: {
        jailbreak = true;
        description = "A light, clean and powerful utility library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Clipboard" = callPackage
@@ -3319,7 +3317,6 @@ self: {
        homepage = "http://iki.fi/matti.niemenmaa/coadjute/";
        description = "A generic build tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Codec-Compression-LZF" = callPackage
@@ -3344,7 +3341,6 @@ self: {
        librarySystemDepends = [ libdevil ];
        description = "An FFI interface to the DevIL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libdevil;};
 
   "Combinatorrent" = callPackage
@@ -3369,7 +3365,6 @@ self: {
        ];
        description = "A concurrent bittorrent client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Command" = callPackage
@@ -3406,7 +3401,6 @@ self: {
        homepage = "https://github.com/sordina/Commando";
        description = "Watch some files; Rerun a command";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ComonadSheet" = callPackage
@@ -3445,7 +3439,6 @@ self: {
        homepage = "http://alkalisoftware.net";
        description = "Concurrent utilities";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Concurrential" = callPackage
@@ -3482,7 +3475,6 @@ self: {
        homepage = "https://github.com/klangner/Condor";
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ConfigFile" = callPackage
@@ -3521,7 +3513,6 @@ self: {
        libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ];
        description = "Parse config files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Configurable" = callPackage
@@ -3574,7 +3565,6 @@ self: {
        jailbreak = true;
        description = "Repackages standard type classes with the ConstraintKinds extension";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Consumer" = callPackage
@@ -3587,7 +3577,6 @@ self: {
        homepage = "http://src.seereason.com/ghc6103/haskell-consumer";
        description = "A monad and monad transformer for consuming streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ContArrow" = callPackage
@@ -3624,7 +3613,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/~oc/contracts.html";
        description = "Practical typed lazy contracts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Control-Engine" = callPackage
@@ -3658,7 +3646,6 @@ self: {
        homepage = "https://github.com/kevinbackhouse/Control-Monad-MultiPass";
        description = "A Library for Writing Multi-Pass Algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Control-Monad-ST2" = callPackage
@@ -3677,7 +3664,6 @@ self: {
        homepage = "https://github.com/kevinbackhouse/Control-Monad-ST2";
        description = "A variation on the ST monad with two type parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CoreDump" = callPackage
@@ -3721,7 +3707,6 @@ self: {
        homepage = "https://github.com/reinerp/CoreFoundation";
        description = "Bindings to Mac OSX's CoreFoundation framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Coroutine" = callPackage
@@ -3733,7 +3718,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-safe coroutines using lightweight session types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CouchDB" = callPackage
@@ -3755,7 +3739,6 @@ self: {
        homepage = "http://github.com/hsenag/haskell-couchdb/";
        description = "CouchDB interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Craft3e" = callPackage
@@ -3774,7 +3757,6 @@ self: {
        homepage = "http://www.haskellcraft.com/";
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Crypto" = callPackage
@@ -3823,7 +3805,6 @@ self: {
        ];
        description = "CurryDB: In-memory Key/Value Database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DAG-Tournament" = callPackage
@@ -3841,7 +3822,6 @@ self: {
        ];
        description = "Real-Time Game Tournament Evaluator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DAV_1_0_3" = callPackage
@@ -3991,7 +3971,6 @@ self: {
        homepage = "https://github.com/alexkay/hdbus";
        description = "D-Bus bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DCFL" = callPackage
@@ -4038,7 +4017,6 @@ self: {
        jailbreak = true;
        description = "DOM Level 2 bindings for the WebBits package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DP" = callPackage
@@ -4056,7 +4034,6 @@ self: {
        homepage = "http://github.com/srush/SemiRings/tree/master";
        description = "Pragmatic framework for dynamic programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DPM" = callPackage
@@ -4081,7 +4058,6 @@ self: {
        jailbreak = true;
        description = "Darcs Patch Manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DRBG_0_5_4" = callPackage
@@ -4185,7 +4161,6 @@ self: {
        ];
        description = "Database Supported Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DSTM" = callPackage
@@ -4206,7 +4181,6 @@ self: {
        ];
        description = "A framework for using STM within distributed systems";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DTC" = callPackage
@@ -4219,7 +4193,6 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/DTC";
        description = "Data To Class transformation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dangerous" = callPackage
@@ -4231,7 +4204,6 @@ self: {
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Monads for operations that can exit early and produce warnings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dao" = callPackage
@@ -4262,7 +4234,6 @@ self: {
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DarcsHelpers" = callPackage
@@ -4275,7 +4246,6 @@ self: {
        jailbreak = true;
        description = "Code used by Patch-Shack that seemed sensible to open for reusability";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Data-Hash-Consistent" = callPackage
@@ -4303,7 +4273,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DataTreeView" = callPackage
@@ -4321,7 +4290,6 @@ self: {
        ];
        description = "A GTK widget for displaying arbitrary Data.Data.Data instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Deadpan-DDP" = callPackage
@@ -4392,7 +4360,6 @@ self: {
        homepage = "http://page.mi.fu-berlin.de/~aneumann/decisiontree.html";
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DeepArrow" = callPackage
@@ -4424,7 +4391,6 @@ self: {
        homepage = "http://github.com/yairchu/defend/tree";
        description = "A simple RTS game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DescriptiveKeys" = callPackage
@@ -4453,7 +4419,6 @@ self: {
        ];
        description = "Processing Real-time event streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Diff_0_3_0" = callPackage
@@ -4510,7 +4475,6 @@ self: {
        homepage = "https://github.com/dillonhuff/DifferenceLogic";
        description = "A theory solver for conjunctions of literals in difference logic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DifferentialEvolution" = callPackage
@@ -4528,7 +4492,6 @@ self: {
        homepage = "http://yousource.it.jyu.fi/optimization-with-haskell";
        description = "Global optimization using Differential Evolution";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Digit" = callPackage
@@ -4576,7 +4539,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An n-dimensional hash using Morton numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DirectSound" = callPackage
@@ -4611,7 +4573,6 @@ self: {
        homepage = "http://distract.wellquite.org/";
        description = "Distributed Bug Tracking System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DiscussionSupportSystem" = callPackage
@@ -4715,7 +4676,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Frameshift-aware alignment of protein sequences with DNA sequences";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DocTest" = callPackage
@@ -4735,7 +4695,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/DocTest";
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Docs" = callPackage
@@ -4768,7 +4727,6 @@ self: {
        homepage = "http://haskell.di.uminho.pt/wiki/DrHylo";
        description = "A tool for deriving hylomorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DrIFT" = callPackage
@@ -4786,7 +4744,6 @@ self: {
        homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DrIFT-cabalized" = callPackage
@@ -4801,7 +4758,6 @@ self: {
        homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dung" = callPackage
@@ -4841,7 +4797,6 @@ self: {
        ];
        description = "Polymorphic protocol engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dust-crypto" = callPackage
@@ -4868,7 +4823,6 @@ self: {
        ];
        description = "Cryptographic operations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "Dust-tools" = callPackage
@@ -4893,7 +4847,6 @@ self: {
        ];
        description = "Network filtering exploration tools";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dust-tools-pcap" = callPackage
@@ -4915,7 +4868,6 @@ self: {
        ];
        description = "Network filtering exploration tools that rely on pcap";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DynamicTimeWarp" = callPackage
@@ -4935,7 +4887,6 @@ self: {
        homepage = "https://github.com/zombiecalypse/DynamicTimeWarp";
        description = "Dynamic time warping of sequences";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DysFRP" = callPackage
@@ -4962,7 +4913,6 @@ self: {
        homepage = "https://github.com/tilk/DysFRP";
        description = "dysFunctional Reactive Programming on Cairo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DysFRP-Craftwerk" = callPackage
@@ -4980,7 +4930,6 @@ self: {
        homepage = "https://github.com/tilk/DysFRP";
        description = "dysFunctional Reactive Programming on Craftwerk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EEConfig" = callPackage
@@ -4992,7 +4941,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "ExtremlyEasyConfig - Extremly Simple parser for config files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Earley_0_9_0" = callPackage
@@ -5096,7 +5044,6 @@ self: {
        homepage = "http://github.com/bspaans/EditTimeReport";
        description = "Query language and report generator for edit logs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EitherT" = callPackage
@@ -5115,7 +5062,6 @@ self: {
        jailbreak = true;
        description = "EitherT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Elm" = callPackage
@@ -5173,7 +5119,6 @@ self: {
        homepage = "http://www.muitovar.com";
        description = "derives heuristic rules from nominal data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Encode" = callPackage
@@ -5189,7 +5134,6 @@ self: {
        homepage = "http://otakar-smrz.users.sf.net/";
        description = "Encoding character data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EntrezHTTP" = callPackage
@@ -5231,7 +5175,6 @@ self: {
        jailbreak = true;
        description = "More general IntMap replacement";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Eq" = callPackage
@@ -5251,7 +5194,6 @@ self: {
        jailbreak = true;
        description = "Render math formula in ASCII, and perform some simplifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EqualitySolver" = callPackage
@@ -5287,7 +5229,6 @@ self: {
        homepage = "http://cielonegro.org/EsounD.html";
        description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EstProgress" = callPackage
@@ -5325,7 +5266,6 @@ self: {
        homepage = "http://verement.github.io/etamoo";
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) pcre;};
 
   "Etage" = callPackage
@@ -5342,7 +5282,6 @@ self: {
        homepage = "http://mitar.tnode.com";
        description = "A general data-flow framework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Etage-Graph" = callPackage
@@ -5363,7 +5302,6 @@ self: {
        homepage = "http://mitar.tnode.com";
        description = "Data-flow based graph algorithms";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Eternal10Seconds" = callPackage
@@ -5378,7 +5316,6 @@ self: {
        homepage = "http://www.kryozahiro.org/eternal10/";
        description = "A 2-D shooting game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Etherbunny" = callPackage
@@ -5401,7 +5338,6 @@ self: {
        homepage = "http://etherbunny.anytini.com/";
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libpcap;};
 
   "EuroIT" = callPackage
@@ -5433,7 +5369,6 @@ self: {
        homepage = "http://haskell.cs.yale.edu/";
        description = "Library for computer music research and education";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EventSocket" = callPackage
@@ -5449,7 +5384,6 @@ self: {
        ];
        description = "Interfaces with FreeSwitch Event Socket";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Extra" = callPackage
@@ -5496,7 +5430,6 @@ self: {
        jailbreak = true;
        description = "Compose music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FM-SBLEX" = callPackage
@@ -5511,7 +5444,6 @@ self: {
        homepage = "http://spraakbanken.gu.se/eng/research/swefn/fm-sblex";
        description = "A set of computational morphology tools for Swedish diachronic lexicons";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FModExRaw" = callPackage
@@ -5525,7 +5457,6 @@ self: {
        homepage = "https://github.com/skypers/hsFModEx";
        description = "The Haskell FModEx raw API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {fmodex64 = null;};
 
   "FPretty" = callPackage
@@ -5550,7 +5481,6 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ftgl;};
 
   "FTGL-bytestring" = callPackage
@@ -5567,7 +5497,6 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ftgl;};
 
   "FTPLine" = callPackage
@@ -5613,7 +5542,6 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols mmtl ];
        description = "Failure Monad Transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FastxPipe" = callPackage
@@ -5694,7 +5622,6 @@ self: {
        homepage = "http://www.scannedinavian.com/";
        description = "Annotate ps and pdf documents";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FerryCore" = callPackage
@@ -5711,7 +5638,6 @@ self: {
        ];
        description = "Ferry Core Components";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Feval" = callPackage
@@ -5744,7 +5670,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/FieldTrip";
        description = "Functional 3D";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FileManip" = callPackage
@@ -5760,7 +5685,6 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FileManipCompat" = callPackage
@@ -5776,7 +5700,6 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FilePather" = callPackage
@@ -5811,7 +5734,6 @@ self: {
        homepage = "http://ddiaz.asofilak.es/packages/FileSystem";
        description = "File system data structure and monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Finance-Quote-Yahoo" = callPackage
@@ -5828,7 +5750,6 @@ self: {
        homepage = "http://www.b7j0c.org/stuff/haskell-yquote.xhtml";
        description = "Obtain quote data from finance.yahoo.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Finance-Treasury" = callPackage
@@ -5846,7 +5767,6 @@ self: {
        homepage = "http://www.ecoin.net/haskell/Finance-Treasury.html";
        description = "Obtain Treasury yield curve data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FindBin" = callPackage
@@ -5870,7 +5790,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
        license = stdenv.lib.licenses.bsdOriginal;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FirstOrderTheory" = callPackage
@@ -5883,7 +5802,6 @@ self: {
        jailbreak = true;
        description = "Grammar and typeclass for first order theories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FixedPoint-simple" = callPackage
@@ -5914,7 +5832,6 @@ self: {
        homepage = "http://www.flippac.org/projects/flippi/";
        description = "Wiki";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Focus" = callPackage
@@ -6061,7 +5978,6 @@ self: {
        homepage = "http://www.ict.kth.se/forsyde/";
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ForkableT" = callPackage
@@ -6098,7 +6014,6 @@ self: {
        homepage = "https://github.com/choener/FormalGrammars";
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Foster" = callPackage
@@ -6117,7 +6032,6 @@ self: {
        jailbreak = true;
        description = "Utilities to generate and solve puzzles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FpMLv53" = callPackage
@@ -6153,7 +6067,6 @@ self: {
        homepage = "https://github.com/TomSmeets/FractalArt";
        description = "Generates colorful wallpapers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11;};
 
   "Fractaler" = callPackage
@@ -6171,7 +6084,6 @@ self: {
        ];
        jailbreak = true;
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Frames" = callPackage
@@ -6204,7 +6116,6 @@ self: {
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/Frank/";
        description = "An experimental programming language with typed algebraic effects";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FreeTypeGL" = callPackage
@@ -6219,7 +6130,6 @@ self: {
        jailbreak = true;
        description = "Loadable texture fonts for OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FunGEn" = callPackage
@@ -6238,7 +6148,6 @@ self: {
        homepage = "http://joyful.com/fungen";
        description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Fungi" = callPackage
@@ -6313,7 +6222,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;};
 
   "GLFW-OGL" = callPackage
@@ -6327,7 +6235,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/GLFW-OGL";
        description = "A binding for GLFW (OGL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
   "GLFW-b" = callPackage
@@ -6346,7 +6253,6 @@ self: {
        doCheck = false;
        description = "Bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "GLFW-b-demo" = callPackage
@@ -6365,7 +6271,6 @@ self: {
        jailbreak = true;
        description = "GLFW-b demo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "GLFW-task" = callPackage
@@ -6381,7 +6286,6 @@ self: {
        homepage = "http://github.com/ninegua/GLFW-task";
        description = "GLFW utility functions to use together with monad-task";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "GLHUI" = callPackage
@@ -6394,7 +6298,6 @@ self: {
        librarySystemDepends = [ libX11 mesa ];
        description = "Open OpenGL context windows in X11 with libX11";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;};
 
   "GLM" = callPackage
@@ -6437,7 +6340,6 @@ self: {
        homepage = "https://github.com/fiendfan1/GLMatrix";
        description = "Utilities for working with OpenGL matrices";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GLURaw_1_4_0_1" = callPackage
@@ -6530,7 +6432,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT_2_5_1_1" = callPackage
@@ -6633,7 +6534,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUtil" = callPackage
@@ -6652,7 +6552,6 @@ self: {
        jailbreak = true;
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPX" = callPackage
@@ -6671,7 +6570,6 @@ self: {
        homepage = "https://github.com/tonymorris/geo-gpx";
        description = "Parse GPX files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPipe_2_1_5" = callPackage
@@ -6740,7 +6638,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GPipe";
        description = "Load GPipe meshes from Collada files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPipe-Examples" = callPackage
@@ -6758,10 +6655,9 @@ self: {
        ];
        description = "Examples for the GPipes package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "GPipe-GLFW" = callPackage
+  "GPipe-GLFW_1_2_1" = callPackage
     ({ mkDerivation, base, GLFW-b, GPipe, transformers }:
      mkDerivation {
        pname = "GPipe-GLFW";
@@ -6771,7 +6667,19 @@ self: {
        homepage = "https://github.com/plredmond/GPipe-GLFW";
        description = "GLFW OpenGL context creation for GPipe";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "GPipe-GLFW" = callPackage
+    ({ mkDerivation, base, GLFW-b, GPipe, transformers }:
+     mkDerivation {
+       pname = "GPipe-GLFW";
+       version = "1.2.2";
+       sha256 = "b2c2764511504225550b7e03badba80ba6e264eb86bee3fcc2f7d54e2e11d652";
+       libraryHaskellDepends = [ base GLFW-b GPipe transformers ];
+       homepage = "https://github.com/plredmond/GPipe-GLFW";
+       description = "GLFW OpenGL context creation for GPipe";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "GPipe-TextureLoad" = callPackage
@@ -6784,7 +6692,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GPipe";
        description = "Load GPipe textures from filesystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GTALib" = callPackage
@@ -6805,7 +6712,6 @@ self: {
        homepage = "https://bitbucket.org/emoto/gtalib";
        description = "A library for GTA programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Gamgine" = callPackage
@@ -6826,7 +6732,6 @@ self: {
        jailbreak = true;
        description = "Some kind of game library or set of utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ganymede" = callPackage
@@ -6846,7 +6751,6 @@ self: {
        homepage = "https://github.com/BMeph/Ganymede";
        description = "An Io interpreter in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GaussQuadIntegration" = callPackage
@@ -6908,7 +6812,6 @@ self: {
        homepage = "http://projects.haskell.org/GenI";
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenSmsPdu" = callPackage
@@ -6922,7 +6825,6 @@ self: {
        executableHaskellDepends = [ base haskell98 QuickCheck random ];
        description = "Automatic SMS message generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Genbank" = callPackage
@@ -6956,7 +6858,6 @@ self: {
        homepage = "http://afonso.xyz";
        description = "A general TicTacToe game implementation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenericPretty" = callPackage
@@ -6998,7 +6899,6 @@ self: {
        homepage = "https://github.com/choener/GenussFold";
        description = "MCFGs for Genus-1 RNA Pseudoknots";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GeoIp" = callPackage
@@ -7010,7 +6910,6 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-mmap syb ];
        description = "Pure bindings for the MaxMind IP database";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GeocoderOpenCage" = callPackage
@@ -7024,7 +6923,6 @@ self: {
        homepage = "https://github.com/juergenhah/Haskell-Geocoder-OpenCage.git";
        description = "Geocoder and Reverse Geocoding Service Wrapper";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Geodetic" = callPackage
@@ -7059,7 +6957,6 @@ self: {
        libraryHaskellDepends = [ base GeomPredicates ];
        description = "Geometric predicates (Intel SSE)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GiST" = callPackage
@@ -7078,8 +6975,8 @@ self: {
     ({ mkDerivation, base, directory, gtk3, process, temporary }:
      mkDerivation {
        pname = "Gifcurry";
-       version = "0.1.0.5";
-       sha256 = "6a862236c56993145cbcc015739a596c4ee46d5488f28544e0cf7ee8759b362c";
+       version = "0.1.0.6";
+       sha256 = "73a6b620ced2f499d52563803fc5684d4470947713328afe347df63ce115772f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -7130,7 +7027,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Glome";
        description = "Ray Tracing Library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GlomeVec" = callPackage
@@ -7162,7 +7058,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Glome";
        description = "SDL Frontend for Glome ray tracer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GoogleChart" = callPackage
@@ -7191,7 +7086,6 @@ self: {
        homepage = "https://github.com/favilo/GoogleDirections.git";
        description = "Haskell Interface to Google Directions API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GoogleSB" = callPackage
@@ -7207,7 +7101,6 @@ self: {
        ];
        description = "Interface to Google Safe Browsing API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GoogleSuggest" = callPackage
@@ -7235,7 +7128,6 @@ self: {
        ];
        description = "Interface to Google Translate API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GotoT-transformers" = callPackage
@@ -7272,7 +7164,6 @@ self: {
        homepage = "https://github.com/choener/GrammarProducts";
        description = "Grammar products and higher-dimensional grammars";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Graph500" = callPackage
@@ -7291,7 +7182,6 @@ self: {
        executableHaskellDepends = [ array base mtl ];
        description = "Graph500 benchmark-related definitions and data set generator";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GraphHammer" = callPackage
@@ -7306,7 +7196,6 @@ self: {
        ];
        description = "GraphHammer Haskell graph analyses framework inspired by STINGER";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GraphHammer-examples" = callPackage
@@ -7324,7 +7213,6 @@ self: {
        ];
        description = "Test harness for TriangleCount analysis";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GraphSCC" = callPackage
@@ -7369,7 +7257,6 @@ self: {
        ];
        description = "Embedded grammar DSL and LALR parser generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GroteTrap" = callPackage
@@ -7406,7 +7293,6 @@ self: {
        homepage = "http://coiffier.net/projects/grow.html";
        description = "A declarative make-like interpreter";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GrowlNotify" = callPackage
@@ -7427,7 +7313,6 @@ self: {
        ];
        description = "Notification utility for Growl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Gtk2hsGenerics" = callPackage
@@ -7443,7 +7328,6 @@ self: {
        ];
        description = "Convenience functions to extend Gtk2hs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GtkGLTV" = callPackage
@@ -7459,7 +7343,6 @@ self: {
        ];
        description = "OpenGL support for Gtk-based GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GtkTV" = callPackage
@@ -7493,7 +7376,6 @@ self: {
        homepage = "http://www-users.cs.york.ac.uk/~ndm/guihaskell/";
        description = "A graphical REPL and development environment for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GuiTV" = callPackage
@@ -7506,7 +7388,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/GuiTV";
        description = "GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "H" = callPackage
@@ -7531,7 +7412,6 @@ self: {
        doCheck = false;
        description = "The Haskell/R mixed programming environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HARM" = callPackage
@@ -7547,7 +7427,6 @@ self: {
        homepage = "http://www.engr.uconn.edu/~jeffm/Classes/CSE240-Spring-2001/Lectures/index.html";
        description = "A simple ARM emulator in haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppS-Data" = callPackage
@@ -7565,7 +7444,6 @@ self: {
        jailbreak = true;
        description = "HAppS data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppS-IxSet" = callPackage
@@ -7581,7 +7459,6 @@ self: {
          syb-with-class template-haskell
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppS-Server" = callPackage
@@ -7603,7 +7480,6 @@ self: {
        jailbreak = true;
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppS-State" = callPackage
@@ -7624,7 +7500,6 @@ self: {
        jailbreak = true;
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppS-Util" = callPackage
@@ -7641,7 +7516,6 @@ self: {
        ];
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppSHelpers" = callPackage
@@ -7671,7 +7545,6 @@ self: {
        homepage = "http://github.com/m4dc4p/hcl/tree/master";
        description = "High-level library for building command line interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HCard" = callPackage
@@ -7686,7 +7559,6 @@ self: {
        homepage = "http://patch-tag.com/publicrepos/HCard";
        description = "A library for implementing a Deck of Cards";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HCodecs" = callPackage
@@ -7733,7 +7605,6 @@ self: {
        homepage = "http://github.com/bos/hdbc-mysql";
        description = "MySQL driver for HDBC";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HDBC-odbc" = callPackage
@@ -7832,7 +7703,6 @@ self: {
        homepage = "http://vis.renci.org/jeff/pfs";
        description = "Utilities for reading, manipulating, and writing HDR images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) pfstools;};
 
   "HERA" = callPackage
@@ -7844,7 +7714,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ mpfr ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mpfr;};
 
   "HFrequencyQueue" = callPackage
@@ -7858,7 +7727,6 @@ self: {
        homepage = "https://github.com/Bellaz/HfrequencyList";
        description = "A Queue with a random (weighted) pick function";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HFuse" = callPackage
@@ -7877,7 +7745,6 @@ self: {
        homepage = "https://github.com/m15k/hfuse";
        description = "HFuse is a binding for the Linux FUSE library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) fuse;};
 
   "HGL" = callPackage
@@ -7889,7 +7756,6 @@ self: {
        libraryHaskellDepends = [ array base X11 ];
        description = "A simple graphics library based on X11 or Win32";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D" = callPackage
@@ -7909,7 +7775,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {Urho3D = null; hgamer3d062 = null;};
 
   "HGamer3D-API" = callPackage
@@ -7928,7 +7793,6 @@ self: {
        homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - API";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Audio" = callPackage
@@ -7945,7 +7809,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer - Audio Functionality";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Bullet-Binding" = callPackage
@@ -7958,7 +7821,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Windows Game Engine for the Haskell Programmer - Bullet Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-CAudio-Binding" = callPackage
@@ -7974,7 +7836,6 @@ self: {
        homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - cAudio Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {HGamer3DCAudio015 = null;};
 
   "HGamer3D-CEGUI-Binding" = callPackage
@@ -7992,7 +7853,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {CEGUIBase = null; CEGUIOgreRenderer = null; 
          hg3dcegui050 = null;};
 
@@ -8011,7 +7871,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer - Game Engine and Utilities";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Data" = callPackage
@@ -8028,7 +7887,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer - Data Definitions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Enet-Binding" = callPackage
@@ -8042,7 +7900,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Enet Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) enet; hg3denet050 = null;};
 
   "HGamer3D-GUI" = callPackage
@@ -8060,7 +7917,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "GUI Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Graphics3D" = callPackage
@@ -8081,7 +7937,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer - 3D Graphics Functionality";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-InputSystem" = callPackage
@@ -8099,7 +7954,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Joystick, Mouse and Keyboard Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Network" = callPackage
@@ -8116,7 +7970,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Networking Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-OIS-Binding" = callPackage
@@ -8135,7 +7988,6 @@ self: {
        homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - OIS Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {HGamer3DOIS015 = null;};
 
   "HGamer3D-Ogre-Binding" = callPackage
@@ -8155,7 +8007,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Ogre Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OgreMain = null; OgrePaging = null; OgreProperty = null; 
          OgreRTShaderSystem = null; OgreTerrain = null; 
          hg3dogre050 = null;};
@@ -8175,7 +8026,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "SDL2 Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; 
          inherit (pkgs.xorg) libX11;};
 
@@ -8194,7 +8044,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "SFML Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; 
          sfml-system = null; sfml-window = null;};
 
@@ -8212,7 +8061,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Windowing and Event Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Wire" = callPackage
@@ -8232,7 +8080,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Wire Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGraphStorage" = callPackage
@@ -8258,7 +8105,6 @@ self: {
        homepage = "https://github.com/JPMoresmau/HGraphStorage";
        description = "Graph database stored on disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HHDL" = callPackage
@@ -8272,7 +8118,6 @@ self: {
        homepage = "http://thesz.mskhug.ru/svn/hhdl/hackage/hhdl/";
        description = "Hardware Description Language embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HJScript" = callPackage
@@ -8308,7 +8153,6 @@ self: {
        homepage = "https://github.com/JPMoresmau/HJVM";
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {jvm = null;};
 
   "HJavaScript" = callPackage
@@ -8339,7 +8183,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/HLearn/";
        description = "Algebraic foundation for homomorphic learning";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HLearn-approximation" = callPackage
@@ -8356,7 +8199,6 @@ self: {
          HLearn-datastructures HLearn-distributions list-extras vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HLearn-classification" = callPackage
@@ -8379,7 +8221,6 @@ self: {
        jailbreak = true;
        homepage = "http://github.com/mikeizbicki/HLearn/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HLearn-datastructures" = callPackage
@@ -8395,7 +8236,6 @@ self: {
          MonadRandom QuickCheck vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HLearn-distributions" = callPackage
@@ -8418,7 +8258,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/HLearn/";
        description = "Distributions for use with the HLearn library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HList_0_4_1_0" = callPackage
@@ -8495,7 +8334,6 @@ self: {
        homepage = "http://www.pontarius.org/sub-projects/hlogger/";
        description = "Simple, concurrent and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HMM" = callPackage
@@ -8507,7 +8345,6 @@ self: {
        homepage = "https://github.com/mikeizbicki/hmm";
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HMap" = callPackage
@@ -8524,7 +8361,6 @@ self: {
        homepage = "https://github.com/atzeus/HMap";
        description = "Fast heterogeneous maps and unconstrained typeable like functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HNM" = callPackage
@@ -8547,7 +8383,6 @@ self: {
        homepage = "http://sert.homedns.org/hs/hnm/";
        description = "Happy Network Manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HODE" = callPackage
@@ -8560,7 +8395,6 @@ self: {
        librarySystemDepends = [ ode ];
        description = "Binding to libODE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ode;};
 
   "HOpenCV" = callPackage
@@ -8577,7 +8411,6 @@ self: {
        executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) opencv;};
 
   "HPDF" = callPackage
@@ -8620,7 +8453,6 @@ self: {
        homepage = "http://github.com/solidsnack/HPath";
        description = "Extract Haskell declarations by name";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HPi" = callPackage
@@ -8634,7 +8466,6 @@ self: {
        homepage = "https://github.com/WJWH/HPi";
        description = "GPIO, I2C and SPI functions for the Raspberry Pi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {bcm2835 = null;};
 
   "HPlot" = callPackage
@@ -8654,7 +8485,6 @@ self: {
        homepage = "http://yakov.cc/HPlot.html";
        description = "A minimal monadic PLplot interface for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {plplotd-gnome2 = null;};
 
   "HPong" = callPackage
@@ -8673,7 +8503,6 @@ self: {
        homepage = "http://bonsaicode.wordpress.com/2009/04/23/hpong-012/";
        description = "A simple OpenGL Pong game based on GLFW";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HROOT" = callPackage
@@ -8693,7 +8522,6 @@ self: {
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT RooFit modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HROOT-core" = callPackage
@@ -8706,7 +8534,6 @@ self: {
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Core modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HROOT-graf" = callPackage
@@ -8721,7 +8548,6 @@ self: {
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Graf modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HROOT-hist" = callPackage
@@ -8734,7 +8560,6 @@ self: {
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Hist modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HROOT-io" = callPackage
@@ -8747,7 +8572,6 @@ self: {
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT IO modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HROOT-math" = callPackage
@@ -8760,7 +8584,6 @@ self: {
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Math modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HRay" = callPackage
@@ -8775,7 +8598,6 @@ self: {
        homepage = "http://boegel.kejo.be/ELIS/Haskell/HRay/";
        description = "Haskell raytracer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSFFIG" = callPackage
@@ -8798,7 +8620,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/HSFFIG";
        description = "Generate FFI import declarations from C include files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSGEP" = callPackage
@@ -8818,7 +8639,6 @@ self: {
        homepage = "http://github.com/mjsottile/hsgep/";
        description = "Gene Expression Programming evolutionary algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSH" = callPackage
@@ -8857,7 +8677,6 @@ self: {
        jailbreak = true;
        description = "Convenience functions that use HSH, instances for HSH";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSlippyMap" = callPackage
@@ -8889,7 +8708,6 @@ self: {
        homepage = "https://github.com/agrafix/HSmarty";
        description = "Small template engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSoundFile" = callPackage
@@ -8906,7 +8724,6 @@ self: {
        homepage = "http://mml.music.utexas.edu/jwlato/HSoundFile";
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HStringTemplate_0_7_3" = callPackage
@@ -8985,7 +8802,6 @@ self: {
        homepage = "http://patch-tag.com/tphyahoo/r/tphyahoo/HStringTemplateHelpers";
        description = "Convenience functions and instances for HStringTemplate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSvm" = callPackage
@@ -8997,7 +8813,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Haskell Bindings for libsvm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTF_0_12_2_3" = callPackage
@@ -9375,7 +9190,6 @@ self: {
        homepage = "http://www.glyc.dc.uba.ar/intohylo/htab.php";
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTicTacToe" = callPackage
@@ -9393,7 +9207,6 @@ self: {
        homepage = "http://github.com/snkkid/HTicTacToe";
        description = "An SDL tic-tac-toe game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit_1_2_5_2" = callPackage
@@ -9463,7 +9276,6 @@ self: {
        homepage = "https://github.com/dag/HUnit-Diff";
        description = "Assertions for HUnit with difference reporting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit-Plus" = callPackage
@@ -9485,7 +9297,6 @@ self: {
        homepage = "https://github.com/emc2/HUnit-Plus";
        description = "A test framework building on HUnit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit-approx" = callPackage
@@ -9527,7 +9338,6 @@ self: {
        homepage = "http://www.pontarius.org/sub-projects/hxmpp/";
        description = "A (prototyped) easy to use XMPP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HXQ" = callPackage
@@ -9545,7 +9355,6 @@ self: {
        homepage = "http://lambda.uta.edu/HXQ/";
        description = "A Compiler from XQuery to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaLeX" = callPackage
@@ -9560,7 +9369,6 @@ self: {
        homepage = "http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html";
        description = "HaLeX enables modelling, manipulation and animation of regular languages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaMinitel" = callPackage
@@ -9718,7 +9526,6 @@ self: {
        homepage = "https://github.com/RefactoringTools/HaRe/wiki";
        description = "the Haskell Refactorer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX_3_15_0_0" = callPackage
@@ -9823,9 +9630,8 @@ self: {
          haskell-src-exts mtl parsec
        ];
        jailbreak = true;
-       description = "This package is deprecated. From version 3, HaTeX does not need this anymore";
+       description = "This package is deprecated. From version 3, HaTeX does not need this anymore.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX-qq" = callPackage
@@ -9862,7 +9668,6 @@ self: {
        jailbreak = true;
        description = "An implementation of the Version Space Algebra learning framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaXml_1_24_1" = callPackage
@@ -9962,7 +9767,6 @@ self: {
        homepage = "http://github.com/dmalikov/HaCh";
        description = "Simple chat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HackMail" = callPackage
@@ -9984,7 +9788,6 @@ self: {
        homepage = "http://patch-tag.com/publicrepos/Hackmail";
        description = "A Procmail Replacement as Haskell EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Haggressive" = callPackage
@@ -10003,7 +9806,6 @@ self: {
        homepage = "https://github.com/Pold87/Haggressive";
        description = "Aggression analysis for Tweets on Twitter";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HandlerSocketClient" = callPackage
@@ -10104,7 +9906,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/HarmTrace";
        description = "Harmony Analysis and Retrieval of Music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HarmTrace-Base" = callPackage
@@ -10125,7 +9926,6 @@ self: {
        homepage = "https://bitbucket.org/bash/harmtrace-base";
        description = "Parsing and unambiguously representing musical chords";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HasGP" = callPackage
@@ -10143,7 +9943,6 @@ self: {
        homepage = "http://www.cl.cam.ac.uk/~sbh11/HasGP";
        description = "A Haskell library for inference using Gaussian processes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Haschoo" = callPackage
@@ -10163,7 +9962,6 @@ self: {
        homepage = "http://iki.fi/matti.niemenmaa/misc-projects.html#haschoo";
        description = "Minimalist R5RS Scheme interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hashell" = callPackage
@@ -10183,7 +9981,6 @@ self: {
        jailbreak = true;
        description = "Simple shell written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaskRel" = callPackage
@@ -10222,7 +10019,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaskellNN" = callPackage
@@ -10234,7 +10030,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix random ];
        description = "High Performance Neural Network in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaskellNet_0_4_2" = callPackage
@@ -10362,7 +10157,6 @@ self: {
        ];
        description = "A concurrent bittorrent client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaskellTutorials" = callPackage
@@ -10397,7 +10191,6 @@ self: {
        homepage = "http://www.matthewhayden.co.uk";
        description = "A reproduction of the Atari 1979 classic \"Asteroids\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hate" = callPackage
@@ -10423,7 +10216,6 @@ self: {
        homepage = "http://github.com/bananu7/Hate";
        description = "A small 2D game framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hawk" = callPackage
@@ -10446,7 +10238,6 @@ self: {
        jailbreak = true;
        description = "Haskell Web Application Kit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hayoo" = callPackage
@@ -10475,7 +10266,6 @@ self: {
        homepage = "http://holumbus.fh-wedel.de";
        description = "The Hayoo! search engine for Haskell API search on hackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hclip" = callPackage
@@ -10509,7 +10299,6 @@ self: {
        ];
        description = "Line oriented editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HerbiePlugin" = callPackage
@@ -10547,7 +10336,6 @@ self: {
        jailbreak = true;
        description = "Message-based middleware layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hieroglyph" = callPackage
@@ -10567,7 +10355,6 @@ self: {
        homepage = "http://vis.renci.org/jeff/hieroglyph";
        description = "Purely functional 2D graphics for visualization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HiggsSet" = callPackage
@@ -10585,7 +10372,6 @@ self: {
        homepage = "http://github.com/lpeterse/HiggsSet";
        description = "A multi-index set with advanced query capabilites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hipmunk" = callPackage
@@ -10600,7 +10386,6 @@ self: {
        homepage = "https://github.com/meteficha/Hipmunk";
        description = "A Haskell binding for Chipmunk";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "HipmunkPlayground" = callPackage
@@ -10620,7 +10405,6 @@ self: {
        homepage = "https://github.com/meteficha/HipmunkPlayground";
        description = "A playground for testing Hipmunk";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Hish" = callPackage
@@ -10669,7 +10453,6 @@ self: {
        ];
        description = "An MPD client designed for a Home Theatre PC";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hoed" = callPackage
@@ -10691,7 +10474,6 @@ self: {
        homepage = "https://wiki.haskell.org/Hoed";
        description = "Lightweight algorithmic debugging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HoleyMonoid" = callPackage
@@ -10724,7 +10506,6 @@ self: {
        homepage = "http://holumbus.fh-wedel.de";
        description = "intra- and inter-program communication";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Holumbus-MapReduce" = callPackage
@@ -10747,7 +10528,6 @@ self: {
        homepage = "http://holumbus.fh-wedel.de";
        description = "a distributed MapReduce framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Holumbus-Searchengine" = callPackage
@@ -10769,7 +10549,6 @@ self: {
        homepage = "http://holumbus.fh-wedel.de";
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Holumbus-Storage" = callPackage
@@ -10790,7 +10569,6 @@ self: {
        homepage = "http://holumbus.fh-wedel.de";
        description = "a distributed storage system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Homology" = callPackage
@@ -10823,7 +10601,6 @@ self: {
        jailbreak = true;
        description = "A Simple Key Value Store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HostAndPort" = callPackage
@@ -10852,7 +10629,6 @@ self: {
        homepage = "http://github.com/Raynes/Hricket";
        description = "A Cricket scoring application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hs2lib" = callPackage
@@ -10881,7 +10657,6 @@ self: {
        homepage = "http://blog.zhox.com/category/hs2lib/";
        description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsASA" = callPackage
@@ -10905,7 +10680,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell binding to libharu (http://libharu.sourceforge.net/)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsHyperEstraier" = callPackage
@@ -10924,7 +10698,6 @@ self: {
        homepage = "http://cielonegro.org/HsHyperEstraier.html";
        description = "HyperEstraier binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {hyperestraier = null; qdbm = null;};
 
   "HsJudy" = callPackage
@@ -10938,7 +10711,6 @@ self: {
        homepage = "http://www.pugscode.org/";
        description = "Judy bindings, and some nice APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
@@ -10999,7 +10771,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to embedded Perl 5 interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsSVN" = callPackage
@@ -11013,7 +10784,6 @@ self: {
        homepage = "https://github.com/phonohawk/HsSVN";
        description = "Partial Subversion (SVN) binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsSyck" = callPackage
@@ -11061,7 +10831,6 @@ self: {
        homepage = "http://github.com/rukav/Hsed";
        description = "Stream Editor in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hsmtlib" = callPackage
@@ -11081,7 +10850,6 @@ self: {
        homepage = "https://github.com/MfesGA/Hsmtlib";
        description = "Haskell library for easy interaction with SMT-LIB 2 compliant solvers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HueAPI" = callPackage
@@ -11116,7 +10884,6 @@ self: {
        homepage = "http://github.com/tobs169/HulkImport#readme";
        description = "Easily bulk import CSV data to SQL Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hungarian-Munkres" = callPackage
@@ -11145,7 +10912,6 @@ self: {
        jailbreak = true;
        description = "Indexable, serializable form of Data.Dynamic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IFS" = callPackage
@@ -11162,7 +10928,6 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "Iterated Function System generation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "INblobs" = callPackage
@@ -11182,7 +10947,6 @@ self: {
        homepage = "http://haskell.di.uminho.pt/jmvilaca/INblobs/";
        description = "Editor and interpreter for Interaction Nets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IOR" = callPackage
@@ -11194,7 +10958,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IORefCAS" = callPackage
@@ -11212,7 +10975,6 @@ self: {
        homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
        description = "Atomic compare and swap for IORefs and STRefs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IOSpec" = callPackage
@@ -11290,7 +11052,6 @@ self: {
        homepage = "https://github.com/mmirman/ImperativeHaskell";
        description = "A library for writing Imperative style haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IndentParser" = callPackage
@@ -11327,7 +11088,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "liftA2 for infix operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Interpolation" = callPackage
@@ -11411,7 +11171,6 @@ self: {
        homepage = "https://github.com/yunxing/Irc";
        description = "DSL for IRC bots";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IrrHaskell" = callPackage
@@ -11462,7 +11221,6 @@ self: {
        ];
        description = "A combinator library on top of a generalised JSON type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JSON-Combinator-Examples" = callPackage
@@ -11476,7 +11234,6 @@ self: {
        ];
        description = "Example uses of the JSON-Combinator library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JSONb" = callPackage
@@ -11503,7 +11260,6 @@ self: {
        homepage = "http://github.com/solidsnack/JSONb/";
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JYU-Utils" = callPackage
@@ -11524,7 +11280,6 @@ self: {
        jailbreak = true;
        description = "Some utility functions for JYU projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JackMiniMix" = callPackage
@@ -11537,7 +11292,6 @@ self: {
        homepage = "http://www.renickbell.net/doku.php?id=jackminimix";
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Javasf" = callPackage
@@ -11554,7 +11308,6 @@ self: {
        ];
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Javav" = callPackage
@@ -11568,7 +11321,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JsContracts" = callPackage
@@ -11592,7 +11344,6 @@ self: {
        homepage = "http://www.cs.brown.edu/research/plt/";
        description = "Design-by-contract for JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JsonGrammar" = callPackage
@@ -11618,7 +11369,6 @@ self: {
        homepage = "https://github.com/MedeaMelana/JsonGrammar2";
        description = "Combinators for bidirectional JSON parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels_3_1_7_1" = callPackage
@@ -11999,7 +11749,6 @@ self: {
        ];
        jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JunkDB-driver-hashtables" = callPackage
@@ -12098,7 +11847,6 @@ self: {
        homepage = "https://github.com/Hamcha/Ketchup";
        description = "A super small web framework for those who don't like big and fancy codebases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "KiCS" = callPackage
@@ -12124,7 +11872,6 @@ self: {
        homepage = "http://www.curry-language.org";
        description = "A compiler from Curry to Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {kics = null;};
 
   "KiCS-debugger" = callPackage
@@ -12147,7 +11894,6 @@ self: {
        homepage = "http://curry-language.org";
        description = "debug features for kics";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "KiCS-prophecy" = callPackage
@@ -12164,7 +11910,6 @@ self: {
        homepage = "http://curry-language.org";
        description = "a transformation used by the kics debugger";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Kleislify" = callPackage
@@ -12174,7 +11919,7 @@ self: {
        version = "0.0.4";
        sha256 = "d4f78a0d7a526398301c5e959ae61151acc2325bdcf86e7a4b909cb3ba36ee38";
        libraryHaskellDepends = [ base ];
-       description = "Variants of Control.Arrow functions, specialised to kleislis";
+       description = "Variants of Control.Arrow functions, specialised to kleislis.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -12189,7 +11934,6 @@ self: {
        homepage = "http://www.gkayaalp.com/p/konf.html";
        description = "A configuration language and a parser";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Kriens" = callPackage
@@ -12217,7 +11961,6 @@ self: {
        homepage = "https://code.google.com/p/kyotocabinet-hs/";
        description = "Kyoto Cabinet DB bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) kyotocabinet;};
 
   "L-seed" = callPackage
@@ -12237,7 +11980,6 @@ self: {
        homepage = "http://www.entropia.de/wiki/L-seed";
        description = "Plant growing programming game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LDAP" = callPackage
@@ -12295,7 +12037,6 @@ self: {
        ];
        description = "A basic lambda calculator with beta reduction and a REPL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaHack" = callPackage
@@ -12338,7 +12079,6 @@ self: {
        homepage = "http://github.com/LambdaHack/LambdaHack";
        description = "A game engine library for roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk2 = pkgs.gnome2.gtk;};
 
   "LambdaINet" = callPackage
@@ -12358,7 +12098,6 @@ self: {
        homepage = "not available";
        description = "Graphical Interaction Net Evaluator for Optimal Evaluation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaNet" = callPackage
@@ -12375,7 +12114,6 @@ self: {
        jailbreak = true;
        description = "A configurable and extensible neural network library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaPrettyQuote" = callPackage
@@ -12401,7 +12139,6 @@ self: {
        homepage = "http://github.com/jfischoff/LambdaPrettyQuote";
        description = "Quasiquoter, and Arbitrary helpers for the lambda calculus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaShell" = callPackage
@@ -12420,7 +12157,6 @@ self: {
        homepage = "http://rwd.rdockins.name/lambda/home/";
        description = "Simple shell for evaluating lambda expressions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Lambdajudge" = callPackage
@@ -12480,7 +12216,6 @@ self: {
        homepage = "http://code.google.com/p/lastik";
        description = "A library for compiling programs in a variety of languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Lattices" = callPackage
@@ -12543,7 +12278,6 @@ self: {
        homepage = "http://quasimal.com/projects/level_0.html";
        description = "A Snake II clone written using SDL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "LibClang" = callPackage
@@ -12565,7 +12299,6 @@ self: {
        homepage = "https://github.com/chetant/LibClang/issues";
        description = "Haskell bindings for libclang (a C++ parsing library)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "LibZip" = callPackage
@@ -12582,7 +12315,6 @@ self: {
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Bindings to libzip, a library for manipulating zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LibZip_0_11_1" = callPackage
@@ -12616,7 +12348,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Wrapper for data that can be unbounded";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LinearSplit" = callPackage
@@ -12631,7 +12362,6 @@ self: {
        homepage = "http://github.com/rukav/LinearSplit";
        description = "Partition the sequence of items to the subsequences in the order given";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LinguisticsTypes" = callPackage
@@ -12675,7 +12405,6 @@ self: {
        homepage = "http://janzzstimmpfle.de/~jens/software/LinkChecker/";
        description = "Check a bunch of local html files for broken links";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "List" = callPackage
@@ -12821,7 +12550,6 @@ self: {
        jailbreak = true;
        description = "a parallel implementation of logic programming using distributed tree exploration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LogicGrowsOnTrees-MPI" = callPackage
@@ -12848,7 +12576,6 @@ self: {
        jailbreak = true;
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openmpi;};
 
   "LogicGrowsOnTrees-network" = callPackage
@@ -12878,7 +12605,6 @@ self: {
        jailbreak = true;
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LogicGrowsOnTrees-processes" = callPackage
@@ -12908,7 +12634,6 @@ self: {
        jailbreak = true;
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LslPlus" = callPackage
@@ -12931,7 +12656,6 @@ self: {
        homepage = "http:/lslplus.sourceforge.net/";
        description = "An execution and testing framework for the Linden Scripting Language (LSL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Lucu" = callPackage
@@ -12954,7 +12678,6 @@ self: {
        homepage = "http://cielonegro.org/Lucu.html";
        description = "HTTP Daemonic Library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MASMGen" = callPackage
@@ -12986,7 +12709,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/software/mcfolddp/";
        description = "Folding algorithm based on nucleotide cyclic motifs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MFlow_0_4_5_9" = callPackage
@@ -13051,7 +12773,6 @@ self: {
        homepage = "https://github.com/DanBurton/MHask#readme";
        description = "The category of monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MSQueue" = callPackage
@@ -13107,7 +12828,6 @@ self: {
        homepage = "http://nautilus.cs.miyazaki-u.ac.jp/~skata/MagicHaskeller.html";
        description = "Automatic inductive functional programmer by systematic search";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MailchimpSimple" = callPackage
@@ -13141,7 +12861,6 @@ self: {
        jailbreak = true;
        description = "MaybeT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MaybeT-monads-tf" = callPackage
@@ -13154,7 +12873,6 @@ self: {
        jailbreak = true;
        description = "MaybeT monad transformer compatible with monads-tf (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MaybeT-transformers" = callPackage
@@ -13167,7 +12885,6 @@ self: {
        jailbreak = true;
        description = "MaybeT monad transformer using transformers instead of mtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MazesOfMonad" = callPackage
@@ -13186,7 +12903,6 @@ self: {
        ];
        description = "Console-based Role Playing Game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MeanShift" = callPackage
@@ -13211,7 +12927,6 @@ self: {
        jailbreak = true;
        description = "A library for units of measurement";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MemoTrie_0_6_2" = callPackage
@@ -13297,7 +13012,6 @@ self: {
        homepage = "http://github.com/benhamner/Metrics/";
        description = "Evaluation metrics commonly used in supervised machine learning";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Mhailist" = callPackage
@@ -13317,7 +13031,6 @@ self: {
        jailbreak = true;
        description = "Haskell mailing list manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Michelangelo" = callPackage
@@ -13334,7 +13047,6 @@ self: {
        ];
        description = "OpenGL for dummies";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MicrosoftTranslator" = callPackage
@@ -13372,7 +13084,6 @@ self: {
        homepage = "http://www.tcs.ifi.lmu.de/~abel/miniagda/";
        description = "A toy dependently typed programming language with type-based termination";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MissingH" = callPackage
@@ -13441,7 +13152,6 @@ self: {
        homepage = "http://github.com/softmechanics/missingpy";
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Modulo" = callPackage
@@ -13467,7 +13177,6 @@ self: {
        executableHaskellDepends = [ base GLUT random ];
        description = "A FRP library based on signal functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "MoeDict" = callPackage
@@ -13513,7 +13222,6 @@ self: {
        jailbreak = true;
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadCatchIO-transformers_0_3_1_2" = callPackage
@@ -13564,7 +13272,6 @@ self: {
        jailbreak = true;
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadCompose" = callPackage
@@ -13600,7 +13307,6 @@ self: {
        homepage = "http://monadgarden.cs.missouri.edu/MonadLab";
        description = "Automatically generate layered monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadPrompt" = callPackage
@@ -13723,7 +13429,6 @@ self: {
        libraryHaskellDepends = [ base MonadRandom mtl random ];
        description = "Lazy monad for psuedo random-number generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadStack" = callPackage
@@ -13750,7 +13455,6 @@ self: {
        homepage = "http://www.geocities.jp/takascience/haskell/monadius_en.html";
        description = "2-D arcade scroller";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Monaris" = callPackage
@@ -13769,7 +13473,6 @@ self: {
        homepage = "https://github.com/fumieval/Monaris/";
        description = "A simple tetris clone";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Monatron" = callPackage
@@ -13781,7 +13484,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monad transformer library with uniform liftings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Monatron-IO" = callPackage
@@ -13795,7 +13497,6 @@ self: {
        homepage = "https://github.com/kreuzschlitzschraubenzieher/Monatron-IO";
        description = "MonadIO instances for the Monatron transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Monocle" = callPackage
@@ -13807,7 +13508,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "Symbolic computations in strict monoidal categories with LaTeX output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MorseCode" = callPackage
@@ -14027,7 +13727,6 @@ self: {
        executableHaskellDepends = [ base HCL HTTP network regex-compat ];
        description = "Simple application for calculating n-grams using Google";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NTRU" = callPackage
@@ -14045,7 +13744,6 @@ self: {
        jailbreak = true;
        description = "NTRU Cryptography";
        license = "GPL";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "NXT" = callPackage
@@ -14071,7 +13769,6 @@ self: {
        homepage = "http://mitar.tnode.com";
        description = "A Haskell interface to Lego Mindstorms NXT";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {bluetooth = null;};
 
   "NXTDSL" = callPackage
@@ -14091,7 +13788,6 @@ self: {
        homepage = "https://github.com/agrafix/legoDSL";
        description = "Generate NXC Code from DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NanoProlog" = callPackage
@@ -14232,7 +13928,6 @@ self: {
        homepage = "https://github.com/ptek/netsnmp";
        description = "Bindings for net-snmp's C API for clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) net_snmp;};
 
   "Network-NineP" = callPackage
@@ -14298,7 +13993,6 @@ self: {
        homepage = "http://github.com/glguy/ninjas";
        description = "Ninja game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NoSlow" = callPackage
@@ -14320,7 +14014,6 @@ self: {
        homepage = "http://code.haskell.org/NoSlow";
        description = "Microbenchmarks for various array libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NoTrace" = callPackage
@@ -14366,7 +14059,6 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nomyx-Core" = callPackage
@@ -14394,7 +14086,6 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nomyx-Language" = callPackage
@@ -14415,7 +14106,6 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nomyx-Rules" = callPackage
@@ -14432,7 +14122,6 @@ self: {
        ];
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nomyx-Web" = callPackage
@@ -14458,7 +14147,6 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "Web gui for Nomyx";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NonEmpty" = callPackage
@@ -14487,7 +14175,6 @@ self: {
        homepage = "http://code.google.com/p/nonempty/";
        description = "A list with a length of at least one";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NumInstances" = callPackage
@@ -14523,7 +14210,6 @@ self: {
        homepage = "http://patch-tag.com/r/lpsmith/NumberSieves";
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NumberTheory" = callPackage
@@ -14567,7 +14253,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/adpfusion";
        description = "Nussinov78 using the ADPfusion library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nutri" = callPackage
@@ -14593,7 +14278,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/OGL";
        description = "A context aware binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OSM" = callPackage
@@ -14610,7 +14294,6 @@ self: {
        homepage = "https://github.com/tonymorris/geo-osm";
        description = "Parse OpenStreetMap files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OTP" = callPackage
@@ -14636,7 +14319,6 @@ self: {
        homepage = "https://github.com/yokto/object";
        description = "Object oriented programming for haskell using multiparameter typeclasses";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ObjectIO" = callPackage
@@ -14652,7 +14334,6 @@ self: {
          winspool
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {comctl32 = null; comdlg32 = null; gdi32 = null; 
          kernel32 = null; ole32 = null; shell32 = null; user32 = null; 
          winmm = null; winspool = null;};
@@ -14763,7 +14444,6 @@ self: {
        homepage = "http://www.gekkou.co.uk/";
        description = "Provides a wrapper for deriving word types with fewer bits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "Omega" = callPackage
@@ -14776,7 +14456,6 @@ self: {
        testHaskellDepends = [ base containers HUnit ];
        description = "Integer sets and relations using Presburger arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OneTuple" = callPackage
@@ -14805,7 +14484,6 @@ self: {
        homepage = "https://github.com/audreyt/openafp/";
        description = "IBM AFP document format parser and generator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenAFP-Utils" = callPackage
@@ -14826,7 +14504,6 @@ self: {
        ];
        description = "Assorted utilities to work with AFP data streams";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenAL" = callPackage
@@ -14847,7 +14524,6 @@ self: {
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding to the OpenAL cross-platform 3D audio API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) openal;};
 
   "OpenCL" = callPackage
@@ -14864,7 +14540,6 @@ self: {
        homepage = "https://github.com/IFCA/opencl";
        description = "Haskell high-level wrapper for OpenCL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OpenCL = null;};
 
   "OpenCLRaw" = callPackage
@@ -14878,7 +14553,6 @@ self: {
        homepage = "http://vis.renci.org/jeff/opencl";
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenCLWrappers" = callPackage
@@ -14982,7 +14656,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "OpenGLCheck" = callPackage
@@ -14996,7 +14669,6 @@ self: {
        ];
        description = "Quickcheck instances for various data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenGLRaw_1_5_0_0" = callPackage
@@ -15086,7 +14758,6 @@ self: {
        jailbreak = true;
        description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenSCAD" = callPackage
@@ -15107,7 +14778,6 @@ self: {
        homepage = "https://chiselapp.com/user/mwm/repository/OpenSCAD/";
        description = "ADT wrapper and renderer for OpenSCAD models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenVG" = callPackage
@@ -15120,7 +14790,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "OpenVG (ShivaVG-0.2.1) binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenVGRaw" = callPackage
@@ -15132,9 +14801,8 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw ];
        jailbreak = true;
        homepage = "http://code.google.com/p/copperbox/";
-       description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation)";
+       description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation).";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Operads" = callPackage
@@ -15148,7 +14816,6 @@ self: {
        homepage = "http://math.stanford.edu/~mik/operads";
        description = "Groebner basis computation for Operads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OptDir" = callPackage
@@ -15197,7 +14864,6 @@ self: {
        homepage = "https://github.com/dwd31415/Haskell-OrchestrateDB";
        description = "Unofficial Haskell Client Library for the Orchestrate.io API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OrderedBits" = callPackage
@@ -15270,7 +14936,6 @@ self: {
        homepage = "http://github.com/Andrey-Sisoyev/PCLT";
        description = "Extension to Show: templating, catalogizing, languages, parameters, etc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PCLT-DB" = callPackage
@@ -15288,7 +14953,6 @@ self: {
        homepage = "http://github.com/Andrey-Sisoyev/PCLT-DB";
        description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PDBtools" = callPackage
@@ -15350,7 +15014,6 @@ self: {
        ];
        description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PageIO" = callPackage
@@ -15377,7 +15040,6 @@ self: {
        ];
        description = "Page-oriented extraction and composition library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Paillier" = callPackage
@@ -15417,7 +15079,6 @@ self: {
        jailbreak = true;
        description = "Pandoc support for literate Agda";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Paraiso" = callPackage
@@ -15443,7 +15104,6 @@ self: {
        homepage = "http://www.paraiso-lang.org/wiki/index.php/Main_Page";
        description = "a code generator for partial differential equations solvers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Parry" = callPackage
@@ -15462,7 +15122,6 @@ self: {
        homepage = "http://parry.lif.univ-mrs.fr";
        description = "A proven synchronization server for high performance computing";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ParsecTools" = callPackage
@@ -15537,7 +15196,6 @@ self: {
        librarySystemDepends = [ libxml2 ];
        description = "Relational optimiser and code generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libxml2;};
 
   "Peano" = callPackage
@@ -15578,7 +15236,6 @@ self: {
        jailbreak = true;
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cmph = null;};
 
   "PermuteEffects" = callPackage
@@ -15592,7 +15249,6 @@ self: {
        homepage = "https://github.com/MedeaMelana/PermuteEffects";
        description = "Permutations of effectful computations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Phsu" = callPackage
@@ -15619,7 +15275,6 @@ self: {
        homepage = "localhost:9119";
        description = "Personal Happstack Server Utils";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Pipe" = callPackage
@@ -15632,7 +15287,6 @@ self: {
        homepage = "http://iki.fi/matti.niemenmaa/pipe/";
        description = "Process piping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Piso" = callPackage
@@ -15719,7 +15373,6 @@ self: {
        homepage = "LLayland.wordpress.com";
        description = "So far just a lint like program for PL/SQL. Diff and refactoring tools are planned";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Plural" = callPackage
@@ -15744,7 +15397,6 @@ self: {
        executableHaskellDepends = [ array base clock GLUT random ];
        description = "An imaginary world";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PortFusion" = callPackage
@@ -15772,7 +15424,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/PortMidi";
        description = "A binding for PortMedia/PortMidi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "PostgreSQL" = callPackage
@@ -15784,7 +15435,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Thin wrapper over the C postgresql library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PrimitiveArray" = callPackage
@@ -15819,7 +15469,6 @@ self: {
        sha256 = "7ddb98d79c320b71c5ffd9f2a0eda2f1898f31ff53ee5f84dfc95c108ada2f58";
        libraryHaskellDepends = [ base haskell98 pretty template-haskell ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PriorityChansConverger" = callPackage
@@ -15831,7 +15480,6 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        description = "Read single output from an array of inputs - channels with priorities";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ProbabilityMonads" = callPackage
@@ -15843,7 +15491,6 @@ self: {
        libraryHaskellDepends = [ base MaybeT MonadRandom mtl ];
        description = "Probability distribution monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PropLogic" = callPackage
@@ -15874,7 +15521,6 @@ self: {
        homepage = "https://github.com/dillonhuff/Proper";
        description = "An implementation of propositional logic in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ProxN" = callPackage
@@ -15911,7 +15557,6 @@ self: {
        homepage = "http://pugscode.org/";
        description = "A Perl 6 Implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Pup-Events" = callPackage
@@ -15964,7 +15609,6 @@ self: {
        ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Pup-Events-PQueue" = callPackage
@@ -16003,7 +15647,6 @@ self: {
        homepage = "http://www.cs.nott.ac.uk/~asg/QIO/";
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuadEdge" = callPackage
@@ -16015,7 +15658,6 @@ self: {
        libraryHaskellDepends = [ base random vector ];
        description = "QuadEdge structure for representing triangulations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuadTree" = callPackage
@@ -16081,7 +15723,6 @@ self: {
        homepage = "http://code.haskell.org/QuickAnnotate/";
        description = "Annotation Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuickCheck_1_2_0_1" = callPackage
@@ -16174,7 +15815,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/QuickCheck-GenT";
        description = "A GenT monad transformer for QuickCheck library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuickCheck-safe" = callPackage
@@ -16224,7 +15864,6 @@ self: {
        homepage = "https://github.com/ssadler/quickson";
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "R-pandoc" = callPackage
@@ -16289,7 +15928,6 @@ self: {
        jailbreak = true;
        description = "A framework for writing RESTful applications";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RFC1751" = callPackage
@@ -16324,7 +15962,6 @@ self: {
        ];
        description = "A reflective JSON serializer/parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RMP" = callPackage
@@ -16345,7 +15982,6 @@ self: {
        executableSystemDepends = [ canlib ftd2xx ];
        description = "Binding to code that controls a Segway RMP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {canlib = null; ftd2xx = null;};
 
   "RNAFold" = callPackage
@@ -16369,7 +16005,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/adpfusion";
        description = "RNA secondary structure prediction";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAFoldProgs" = callPackage
@@ -16390,7 +16025,6 @@ self: {
        jailbreak = true;
        description = "RNA secondary structure folding";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAdesign" = callPackage
@@ -16416,7 +16050,6 @@ self: {
        executableHaskellDepends = [ bytestring cmdargs file-embed ];
        description = "Multi-target RNA sequence design";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAdraw" = callPackage
@@ -16437,7 +16070,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Draw RNA secondary structures";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAlien_1_0_0" = callPackage
@@ -16519,7 +16151,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/software/rnawolf/";
        description = "RNA folding with non-canonical basepairs and base-triplets";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RSA_2_1_0_1" = callPackage
@@ -16538,7 +16169,7 @@ self: {
          base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
          QuickCheck SHA tagged test-framework test-framework-quickcheck2
        ];
-       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1";
+       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -16559,7 +16190,7 @@ self: {
          base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
          QuickCheck SHA tagged test-framework test-framework-quickcheck2
        ];
-       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1";
+       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -16580,7 +16211,7 @@ self: {
          base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
          QuickCheck SHA tagged test-framework test-framework-quickcheck2
        ];
-       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1";
+       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -16601,7 +16232,6 @@ self: {
        homepage = "http://raincat.bysusanlin.com/";
        description = "A puzzle game written in Haskell with a cat in lead role";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Random123" = callPackage
@@ -16631,7 +16261,6 @@ self: {
        libraryHaskellDepends = [ base HTTP-Simple network ];
        description = "Interface to random.org";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Randometer" = callPackage
@@ -16686,7 +16315,6 @@ self: {
        homepage = "http://kagami.touhou.ru/projects/show/ranka";
        description = "HTTP to XMPP omegle chats gate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Rasenschach" = callPackage
@@ -16707,7 +16335,6 @@ self: {
        homepage = "http://hub.darcs.net/martingw/Rasenschach";
        description = "Soccer simulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Rasterific_0_4" = callPackage
@@ -16876,7 +16503,6 @@ self: {
        homepage = "https://github.com/lookunder/RedmineHs";
        description = "Library to access Redmine's REST services";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ref" = callPackage
@@ -16890,7 +16516,6 @@ self: {
        homepage = "https://bitbucket.org/carter/ref";
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RefSerialize_0_3_1_3" = callPackage
@@ -16944,7 +16569,6 @@ self: {
        homepage = "https://github.com/pablocouto/Referees";
        description = "A utility for computing distributions of material to review among reviewers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RepLib" = callPackage
@@ -16991,7 +16615,6 @@ self: {
        ];
        description = "Haskell bindings to ReviewBoard";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RichConditional" = callPackage
@@ -17053,7 +16676,6 @@ self: {
        ];
        description = "Limits the size of a directory's contents";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RoyalMonad" = callPackage
@@ -17078,7 +16700,6 @@ self: {
        homepage = "https://github.com/jspahrsummers/RxHaskell";
        description = "Reactive Extensions for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SBench" = callPackage
@@ -17096,7 +16717,6 @@ self: {
        ];
        description = "A benchmark suite for runtime and heap measurements over a series of inputs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SConfig" = callPackage
@@ -17123,7 +16743,6 @@ self: {
        librarySystemDepends = [ SDL ];
        description = "Binding to libSDL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL;};
 
   "SDL-gfx" = callPackage
@@ -17136,7 +16755,6 @@ self: {
        librarySystemDepends = [ SDL_gfx ];
        description = "Binding to libSDL_gfx";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL_gfx;};
 
   "SDL-image" = callPackage
@@ -17151,7 +16769,6 @@ self: {
        librarySystemDepends = [ SDL_image ];
        description = "Binding to libSDL_image";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL_image;};
 
   "SDL-mixer" = callPackage
@@ -17166,7 +16783,6 @@ self: {
        librarySystemDepends = [ SDL_mixer ];
        description = "Binding to libSDL_mixer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL_mixer;};
 
   "SDL-mpeg" = callPackage
@@ -17179,7 +16795,6 @@ self: {
        librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) smpeg;};
 
   "SDL-ttf" = callPackage
@@ -17192,7 +16807,6 @@ self: {
        librarySystemDepends = [ SDL_ttf ];
        description = "Binding to libSDL_ttf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL_ttf;};
 
   "SDL2-ttf" = callPackage
@@ -17226,7 +16840,6 @@ self: {
        homepage = "https://github.com/jeannekamikaze/SFML";
        description = "SFML bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {csfml-audio = null; csfml-graphics = null; 
          csfml-network = null; csfml-system = null; csfml-window = null; 
          sfml-audio = null; sfml-graphics = null; sfml-network = null; 
@@ -17242,7 +16855,6 @@ self: {
        homepage = "https://github.com/SFML-haskell/SFML-control";
        description = "Higher level library on top of SFML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SFont" = callPackage
@@ -17255,7 +16867,6 @@ self: {
        homepage = "http://liamoc.net/static/SFont";
        description = "SFont SDL Bitmap Fonts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SG" = callPackage
@@ -17267,7 +16878,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SGdemo" = callPackage
@@ -17282,7 +16892,6 @@ self: {
        jailbreak = true;
        description = "An example of using the SG and OpenGL libraries";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SHA_1_6_4_1" = callPackage
@@ -17364,7 +16973,6 @@ self: {
        homepage = "http://www.snet-home.org/";
        description = "Declarative coördination language for streaming networks";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SQLDeps" = callPackage
@@ -17386,8 +16994,8 @@ self: {
     ({ mkDerivation, attoparsec, base, bytestring, cereal, text }:
      mkDerivation {
        pname = "STL";
-       version = "0.3.0.3";
-       sha256 = "382247812f11b9f73cd9a02474fa68d402fac91471fac83dd0e15604a191548a";
+       version = "0.3.0.4";
+       sha256 = "298b4cdeaa80c28ae773c135405e04bb8112ec5dee3f0c1b35eb7de9d703ba5a";
        libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
        homepage = "http://github.com/bergey/STL";
        description = "STL 3D geometry format parsing and pretty-printing";
@@ -17422,7 +17030,6 @@ self: {
        homepage = "http://www.informatik.uni-kiel.de/~jgr/svg2q";
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SVGFonts_1_4_0_3" = callPackage
@@ -17549,7 +17156,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Salsa";
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "Saturnin" = callPackage
@@ -17591,7 +17197,6 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ScratchFs" = callPackage
@@ -17612,7 +17217,6 @@ self: {
        homepage = "http://github.com/hirschenberger/ScratchFS";
        description = "Size limited temp filesystem based on fuse";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Scurry" = callPackage
@@ -17632,7 +17236,6 @@ self: {
        homepage = "http://code.google.com/p/scurry/";
        description = "A cross platform P2P VPN application built using Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SegmentTree" = callPackage
@@ -17665,7 +17268,6 @@ self: {
        jailbreak = true;
        description = "Command-line tool for maintaining the Semantique database";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Semigroup" = callPackage
@@ -17689,7 +17291,6 @@ self: {
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SessionLogger" = callPackage
@@ -17706,7 +17307,6 @@ self: {
        jailbreak = true;
        description = "Easy Loggingframework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ShellCheck" = callPackage
@@ -17744,7 +17344,6 @@ self: {
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "A framework for creating shell envinronments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-compatline" = callPackage
@@ -17757,7 +17356,6 @@ self: {
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "\"compatline\" backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-editline" = callPackage
@@ -17770,7 +17368,6 @@ self: {
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Editline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-haskeline" = callPackage
@@ -17783,7 +17380,6 @@ self: {
        jailbreak = true;
        description = "Haskeline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-readline" = callPackage
@@ -17796,7 +17392,6 @@ self: {
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Readline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ShowF" = callPackage
@@ -17834,7 +17429,6 @@ self: {
        homepage = "http://www.geocities.jp/takascience/index_en.html";
        description = "A vector shooter game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SimpleAES" = callPackage
@@ -17875,7 +17469,6 @@ self: {
        jailbreak = true;
        description = "A Simple Graphics Library from the SimpleH framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SimpleH" = callPackage
@@ -17893,7 +17486,6 @@ self: {
        jailbreak = true;
        description = "A light, clean and powerful Haskell utility library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SimpleLog" = callPackage
@@ -17914,7 +17506,6 @@ self: {
        homepage = "https://github.com/exFalso/SimpleLog/";
        description = "Simple, configurable logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SimpleServer" = callPackage
@@ -17962,7 +17553,6 @@ self: {
        testHaskellDepends = [ base file-embed ];
        description = "Generate slides from Haskell code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Smooth" = callPackage
@@ -17979,7 +17569,6 @@ self: {
        jailbreak = true;
        description = "A tiny, lazy SMT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SmtLib" = callPackage
@@ -18017,7 +17606,6 @@ self: {
        homepage = "http://bitbucket.org/jetxee/snusmumrik/";
        description = "E-library directory based on FUSE virtual file system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zip;};
 
   "SoOSiM" = callPackage
@@ -18036,7 +17624,6 @@ self: {
        homepage = "http://www.soos-project.eu/";
        description = "Abstract full system simulator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SoccerFun" = callPackage
@@ -18057,7 +17644,6 @@ self: {
        homepage = "http://www.cs.ru.nl/~peter88/SoccerFun/SoccerFun.html";
        description = "Football simulation framework for teaching functional programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SoccerFunGL" = callPackage
@@ -18078,7 +17664,6 @@ self: {
        homepage = "http://www.cs.ru.nl/~peter88/SoccerFun/SoccerFun.html";
        description = "OpenGL UI for the SoccerFun framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Sonnex" = callPackage
@@ -18112,7 +17697,6 @@ self: {
        jailbreak = true;
        description = "Static code analysis using graph-theoretic techniques";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Southpaw" = callPackage
@@ -18145,7 +17729,6 @@ self: {
        homepage = "http://www.haskell.org/yampa/";
        description = "Video game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SpacePrivateers" = callPackage
@@ -18168,7 +17751,6 @@ self: {
        homepage = "https://github.com/tuturto/space-privateers";
        description = "Simple space pirate roguelike";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SpinCounter" = callPackage
@@ -18463,7 +18045,6 @@ self: {
        homepage = "https://github.com/agrafix/Spock-auth";
        description = "Provides authentification helpers for Spock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-digestive_0_1_0_0" = callPackage
@@ -18558,7 +18139,6 @@ self: {
        homepage = "http://liamoc.net/static/Sprig";
        description = "Binding to Sprig";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Stasis" = callPackage
@@ -18666,7 +18246,6 @@ self: {
        homepage = "http://github.com/rukav/Stomp";
        description = "Client library for Stomp brokers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Strafunski-ATermLib" = callPackage
@@ -18698,7 +18277,6 @@ self: {
        jailbreak = true;
        description = "Converts SDF to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Strafunski-StrategyLib" = callPackage
@@ -18763,7 +18341,6 @@ self: {
        homepage = "http://bonsaicode.wordpress.com/2009/06/07/strictbench-0-1/";
        description = "Benchmarking code through strict evaluation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SuffixStructures" = callPackage
@@ -18821,7 +18398,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/Center/SyntaxMacrosForFree";
        description = "Syntax Macros in the form of an EDSL";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Sysmon" = callPackage
@@ -18840,7 +18416,6 @@ self: {
        homepage = "http://github.com/rukav/Sysmon";
        description = "Sybase 15 sysmon reports processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TBC" = callPackage
@@ -18861,7 +18436,6 @@ self: {
        ];
        description = "Testing By Convention";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TBit" = callPackage
@@ -18879,7 +18453,6 @@ self: {
        jailbreak = true;
        description = "Utilities for condensed matter physics tight binding calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TCache" = callPackage
@@ -18946,7 +18519,6 @@ self: {
        ];
        description = "Template Your Boilerplate - a Template Haskell version of SYB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TableAlgebra" = callPackage
@@ -18976,7 +18548,6 @@ self: {
        jailbreak = true;
        description = "A client for Quill databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tablify" = callPackage
@@ -19017,7 +18588,6 @@ self: {
        executableHaskellDepends = [ base mtl old-time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tape" = callPackage
@@ -19083,7 +18653,6 @@ self: {
        homepage = "http://liamoc.net/tea";
        description = "TeaHS Game Creation Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tensor" = callPackage
@@ -19140,7 +18709,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ogg theora ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ogg = null; theora = null;};
 
   "Thingie" = callPackage
@@ -19152,7 +18720,6 @@ self: {
        libraryHaskellDepends = [ base cairo gtk mtl ];
        description = "Purely functional 2D drawing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ThreadObjects" = callPackage
@@ -19182,7 +18749,6 @@ self: {
        homepage = "http://thrift.apache.org";
        description = "Haskell bindings for the Apache Thrift RPC system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tic-Tac-Toe" = callPackage
@@ -19213,7 +18779,6 @@ self: {
        ];
        description = "A sub-project (exercise) for a functional programming course";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TigerHash" = callPackage
@@ -19247,7 +18812,6 @@ self: {
        ];
        description = "A simple tile-based digital clock screen saver";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TinyLaunchbury" = callPackage
@@ -19259,7 +18823,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Simple implementation of call-by-need using Launchbury's semantics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TinyURL" = callPackage
@@ -19271,7 +18834,6 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Use TinyURL to compress URLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Titim" = callPackage
@@ -19286,7 +18848,6 @@ self: {
        jailbreak = true;
        description = "Game for Lounge Marmelade";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Top" = callPackage
@@ -19302,7 +18863,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "Constraint solving framework employed by the Helium Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tournament" = callPackage
@@ -19322,7 +18882,6 @@ self: {
        homepage = "http://github.com/clux/tournament.hs";
        description = "Tournament related algorithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TraceUtils" = callPackage
@@ -19427,7 +18986,6 @@ self: {
        jailbreak = true;
        description = "A simple trend Graph script";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TrieMap" = callPackage
@@ -19445,7 +19003,6 @@ self: {
        ];
        description = "Automatic type inference of generalized tries with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Twofish" = callPackage
@@ -19485,7 +19042,6 @@ self: {
        jailbreak = true;
        description = "Typing speed game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TypeCompose" = callPackage
@@ -19512,7 +19068,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/people/staff/oc/TypeIlluminator/";
        description = "TypeIlluminator is a prototype tool exploring debugging of type errors/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TypeNat" = callPackage
@@ -19555,7 +19110,6 @@ self: {
        homepage = "http://haskell.cs.yale.edu/";
        description = "Library for Arrowized Graphical User Interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "UMM" = callPackage
@@ -19574,7 +19128,6 @@ self: {
        homepage = "http://www.korgwal.com/umm/";
        description = "A small command-line accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "URLT" = callPackage
@@ -19592,7 +19145,6 @@ self: {
        ];
        description = "Library for maintaining correctness of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "URLb" = callPackage
@@ -19632,7 +19184,6 @@ self: {
        homepage = "http://github.com/cirquit/UTFTConverter";
        description = "Processing popular picture formats into .c or .raw format in RGB565";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Unique" = callPackage
@@ -19678,7 +19229,6 @@ self: {
        homepage = "http://src.seereason.com/haskell-unixutils-shadow";
        description = "A simple interface to shadow passwords (aka, shadow.h)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Updater" = callPackage
@@ -19702,9 +19252,8 @@ self: {
        libraryHaskellDepends = [ base cgi MaybeT mtl ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/UrlDisp";
-       description = "Url dispatcher. Helps to retain friendly URLs in web applications";
+       description = "Url dispatcher. Helps to retain friendly URLs in web applications.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Useful" = callPackage
@@ -19791,7 +19340,6 @@ self: {
        jailbreak = true;
        description = "Provides Boolean instances for the Vec package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Vec-OpenGLRaw" = callPackage
@@ -19804,7 +19352,6 @@ self: {
        homepage = "http://www.downstairspeople.org/darcs/Vec-opengl";
        description = "Instances and functions to interoperate Vec and OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Vec-Transform" = callPackage
@@ -19817,7 +19364,6 @@ self: {
        homepage = "https://github.com/tobbebex/Vec-Transform";
        description = "This package is obsolete";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "VecN" = callPackage
@@ -19925,7 +19471,6 @@ self: {
        jailbreak = true;
        description = "A simple command line tools to control the Asus WL500gP router";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WL500gPLib" = callPackage
@@ -19961,7 +19506,6 @@ self: {
        jailbreak = true;
        description = "WebMoney authentication module";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "WURFL" = callPackage
@@ -19973,7 +19517,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "Convert the WURFL file into a Parsec parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WXDiffCtrl" = callPackage
@@ -19986,7 +19529,6 @@ self: {
        homepage = "http://wewantarock.wordpress.com";
        description = "WXDiffCtrl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WashNGo" = callPackage
@@ -20007,7 +19549,6 @@ self: {
        homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/";
        description = "WASH is a family of EDSLs for programming Web applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WaveFront" = callPackage
@@ -20023,7 +19564,6 @@ self: {
        ];
        description = "Parsers and utilities for the OBJ WaveFront 3D model format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Weather" = callPackage
@@ -20069,7 +19609,6 @@ self: {
        homepage = "http://www.cs.brown.edu/research/plt/";
        description = "JavaScript analysis tools";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WebBits-multiplate" = callPackage
@@ -20086,7 +19625,6 @@ self: {
        jailbreak = true;
        description = "A Multiplate instance for JavaScript";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WebCont" = callPackage
@@ -20106,7 +19644,6 @@ self: {
        homepage = "http://patch-tag.com/r/salazar/webconts/snapshot/current/content/pretty";
        description = "Continuation based web programming for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WeberLogic" = callPackage
@@ -20150,7 +19687,6 @@ self: {
        jailbreak = true;
        description = "Regexp-like engine to scrap web data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Wheb" = callPackage
@@ -20177,7 +19713,6 @@ self: {
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "The frictionless WAI Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WikimediaParser" = callPackage
@@ -20189,7 +19724,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "A parser for wikimedia style article markup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Win32" = callPackage
@@ -20338,7 +19872,6 @@ self: {
        homepage = "http://www.cse.chalmers.se/~emax/wired/";
        description = "Wire-aware hardware description";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "WordAlignment" = callPackage
@@ -20379,7 +19912,6 @@ self: {
        homepage = "https://github.com/choener/WordAlignment";
        description = "Bigram word pair alignments";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WordNet" = callPackage
@@ -20391,7 +19923,6 @@ self: {
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WordNet-ghc74" = callPackage
@@ -20403,7 +19934,6 @@ self: {
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Wordlint" = callPackage
@@ -20420,7 +19950,6 @@ self: {
        homepage = "https://github.com/gbgar/Wordlint";
        description = "Plaintext prose redundancy linter";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Workflow_0_8_1" = callPackage
@@ -20474,7 +20003,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/WxGeneric";
        description = "Generic (SYB3) construction of wxHaskell widgets";
        license = "LGPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "X11" = callPackage
@@ -20509,7 +20037,6 @@ self: {
        jailbreak = true;
        description = "Missing bindings to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11;};
 
   "X11-rm" = callPackage
@@ -20521,7 +20048,6 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        description = "A binding to the resource management functions missing from X11";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "X11-xdamage" = callPackage
@@ -20535,7 +20061,6 @@ self: {
        homepage = "http://darcs.haskell.org/X11-xdamage";
        description = "A binding to the Xdamage X11 extension library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {Xdamage = null;};
 
   "X11-xfixes" = callPackage
@@ -20549,7 +20074,6 @@ self: {
        homepage = "https://github.com/reacocard/x11-xfixes";
        description = "A binding to the Xfixes X11 extension library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {Xfixes = null;};
 
   "X11-xft" = callPackage
@@ -20612,7 +20136,6 @@ self: {
        homepage = "http://kawais.org.ua/XMMS/";
        description = "XMMS2 client library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {xmmsclient = null; xmmsclient-glib = null;};
 
   "XMPP" = callPackage
@@ -20630,7 +20153,6 @@ self: {
        homepage = "http://kagami.touhou.ru/projects/show/matsuri";
        description = "XMPP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "XSaiga" = callPackage
@@ -20655,7 +20177,6 @@ self: {
        homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html";
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Xauth" = callPackage
@@ -20686,7 +20207,6 @@ self: {
        ];
        description = "Gtk command launcher with identicon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "XmlHtmlWriter" = callPackage
@@ -20699,7 +20219,6 @@ self: {
        homepage = "http://github.com/mmirman/haskogeneous/tree/XmlHtmlWriter";
        description = "A library for writing XML and HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Xorshift128Plus" = callPackage
@@ -20732,7 +20251,6 @@ self: {
        homepage = "http://github.com/snkkid/YACPong";
        description = "Yet Another Pong Clone using SDL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "YFrob" = callPackage
@@ -20745,7 +20263,6 @@ self: {
        homepage = "http://www.haskell.org/yampa/";
        description = "Yampa-based library for programming robots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Yablog" = callPackage
@@ -20781,7 +20298,6 @@ self: {
        homepage = "http://gitweb.konn-san.com/repo/Yablog/tree/master";
        description = "A simple blog engine powered by Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "YamlReference" = callPackage
@@ -20807,7 +20323,6 @@ self: {
        homepage = "http://www.ben-kiki.org/oren/YamlReference";
        description = "YAML reference implementation";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Yampa_0_9_6" = callPackage
@@ -20952,7 +20467,6 @@ self: {
        homepage = "http://code.google.com/p/yogurt-mud/";
        description = "A MUD client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Yogurt-Standalone" = callPackage
@@ -20973,7 +20487,6 @@ self: {
        homepage = "http://code.google.com/p/yogurt-mud/";
        description = "A functional MUD client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) readline;};
 
   "ZEBEDDE" = callPackage
@@ -21002,7 +20515,6 @@ self: {
        homepage = "https://github.com/jkarni/ZipperFS";
        description = "Oleg's Zipper FS";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ZMachine" = callPackage
@@ -21016,7 +20528,6 @@ self: {
        executableHaskellDepends = [ array base gtk mtl random ];
        description = "A Z-machine interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ZipFold" = callPackage
@@ -21071,7 +20582,6 @@ self: {
        homepage = "https://github.com/MedeaMelana/Zwaluw";
        description = "Combinators for bidirectional URL routing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "a50" = callPackage
@@ -21121,7 +20631,6 @@ self: {
        homepage = "https://github.com/pa-ba/abc-puzzle";
        description = "Generate instances of the ABC Logic Puzzle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "abcBridge" = callPackage
@@ -21147,7 +20656,6 @@ self: {
        ];
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) abc;};
 
   "abcnotation" = callPackage
@@ -21241,7 +20749,6 @@ self: {
        homepage = "https://github.com/simonmar/monad-par";
        description = "Provides the class ParAccelerate, nothing more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "abt" = callPackage
@@ -21342,7 +20849,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/accelerate-arithmetic/";
        description = "Linear algebra and interpolation using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-cublas" = callPackage
@@ -21505,7 +21011,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/accelerate-fourier/";
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-fourier-benchmark" = callPackage
@@ -21567,7 +21072,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/accelerate-utility/";
        description = "Utility functions for the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accentuateus" = callPackage
@@ -21579,9 +21083,8 @@ self: {
        libraryHaskellDepends = [ base bytestring HTTP json network text ];
        jailbreak = true;
        homepage = "http://accentuate.us/";
-       description = "A Haskell implementation of the Accentuate.us API";
+       description = "A Haskell implementation of the Accentuate.us API.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "access-time" = callPackage
@@ -21595,7 +21098,6 @@ self: {
        homepage = "http://www.github.com/batterseapower/access-time";
        description = "Cross-platform support for retrieving file access times";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ace" = callPackage
@@ -21680,7 +21182,6 @@ self: {
        jailbreak = true;
        description = "A replication backend for acid-state";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acid-state-tls" = callPackage
@@ -21845,7 +21346,6 @@ self: {
        homepage = "http://github.com/joeyadams/haskell-acme-hq9plus";
        description = "An embedded DSL for the HQ9+ programming language";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-http" = callPackage
@@ -21879,7 +21379,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Evil inventions in the Tri-State area";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-io" = callPackage
@@ -21987,7 +21486,6 @@ self: {
        jailbreak = true;
        description = "Define the less than and add and subtract for nats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-omitted" = callPackage
@@ -22087,7 +21585,6 @@ self: {
        ];
        description = "Proper names for curry and uncurry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-strfry" = callPackage
@@ -22161,7 +21658,6 @@ self: {
        homepage = "https://github.com/ion1/acme-zero-one";
        description = "The absorbing element of package dependencies";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "action-permutations" = callPackage
@@ -22317,7 +21813,6 @@ self: {
        jailbreak = true;
        description = "Haskell code presentation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "activehs-base" = callPackage
@@ -22357,7 +21852,6 @@ self: {
        homepage = "http://sulzmann.blogspot.com/2008/10/actors-with-multi-headed-receive.html";
        description = "Actors with multi-headed receive clauses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ad_4_2_1_1" = callPackage
@@ -22494,7 +21988,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/adaptive-containers";
        description = "Self optimizing container types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adaptive-tuple" = callPackage
@@ -22507,7 +22000,6 @@ self: {
        homepage = "http://inmachina.net/~jwlato/haskell/";
        description = "Self-optimizing tuple types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adb" = callPackage
@@ -22544,7 +22036,6 @@ self: {
        homepage = "https://projects.zubr.me/wiki/adblock2privoxy";
        description = "Convert adblock config files to privoxy format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "addLicenseInfo" = callPackage
@@ -22576,7 +22067,6 @@ self: {
        homepage = "http://sep07.mroot.net/";
        description = "Ad-hoc P2P network protocol";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adict" = callPackage
@@ -22597,7 +22087,6 @@ self: {
        homepage = "https://github.com/kawu/adict";
        description = "Approximate dictionary searching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adjunctions_4_2" = callPackage
@@ -22713,7 +22202,6 @@ self: {
        homepage = "https://github.com/stepcut/ase2css";
        description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adp-multi" = callPackage
@@ -22736,7 +22224,6 @@ self: {
        homepage = "http://adp-multi.ruhoh.com";
        description = "ADP for multiple context-free languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adp-multi-monadiccp" = callPackage
@@ -22758,7 +22245,6 @@ self: {
        homepage = "http://adp-multi.ruhoh.com";
        description = "Subword construction in adp-multi using monadiccp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson_0_7_0_6" = callPackage
@@ -22880,28 +22366,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson_0_11_0_0" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
-     , dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck
-     , quickcheck-instances, scientific, semigroups, syb
-     , template-haskell, test-framework, test-framework-hunit
+  "aeson_0_11_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-orphans, bytestring
+     , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl
+     , QuickCheck, quickcheck-instances, scientific, semigroups, syb
+     , tagged, template-haskell, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, time, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson";
-       version = "0.11.0.0";
-       sha256 = "ad3849d5d73824edea0fa3aa552d4c4630e67a8cf1295250e92d34b5e824add5";
+       version = "0.11.1.0";
+       sha256 = "91a03c818312f422d17dddfb91b3d63e8b0e5bbea548a04fea325e926a019eca";
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq dlist fail ghc-prim
-         hashable mtl scientific semigroups syb template-haskell text time
-         transformers unordered-containers vector
+         hashable mtl scientific semigroups syb tagged template-haskell text
+         time transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         attoparsec base bytestring containers ghc-prim HUnit QuickCheck
-         quickcheck-instances template-haskell test-framework
-         test-framework-hunit test-framework-quickcheck2 text time
-         unordered-containers vector
+         attoparsec base base-orphans bytestring containers ghc-prim HUnit
+         QuickCheck quickcheck-instances semigroups tagged template-haskell
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time unordered-containers vector
        ];
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
@@ -22955,7 +22441,6 @@ self: {
        jailbreak = true;
        description = "Mapping between Aeson's JSON and Bson objects";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-casing" = callPackage
@@ -23223,7 +22708,6 @@ self: {
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-filthy" = callPackage
@@ -23292,7 +22776,6 @@ self: {
        homepage = "http://github.com/mailrank/aeson";
        description = "Fast JSON parsing and encoding (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-parsec-picky" = callPackage
@@ -23486,7 +22969,6 @@ self: {
        homepage = "https://github.com/lassoinc/aeson-smart";
        description = "Smart derivation of Aeson instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-streams" = callPackage
@@ -23695,7 +23177,6 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "Infinite state model checking of iterative C programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ag-pictgen" = callPackage
@@ -23729,7 +23210,6 @@ self: {
        ];
        description = "Http server for Agda (prototype)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "agda-snippets" = callPackage
@@ -23895,7 +23375,6 @@ self: {
        homepage = "https://github.com/joelteon/airbrake";
        description = "An Airbrake notifier for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "airship_0_4_1_0" = callPackage
@@ -24104,7 +23583,6 @@ self: {
        homepage = "http://www.aivikasoft.com/en/products/aivika.html";
        description = "Transformers for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ajhc" = callPackage
@@ -24132,7 +23610,6 @@ self: {
        homepage = "http://ajhc.metasepi.org/";
        description = "Haskell compiler that produce binary through C language";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "al" = callPackage
@@ -24145,9 +23622,8 @@ self: {
        libraryPkgconfigDepends = [ openal ];
        libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/phaazon/al";
-       description = "OpenAL 1.1 raw API";
+       description = "OpenAL 1.1 raw API.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openal;};
 
   "alarmclock_0_2_0_5" = callPackage
@@ -24204,7 +23680,6 @@ self: {
        homepage = "https://github.com/Rnhmjoj/alea";
        description = "a diceware passphrase generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alex_3_1_3" = callPackage
@@ -24445,7 +23920,6 @@ self: {
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic" = callPackage
@@ -24459,7 +23933,6 @@ self: {
        homepage = "https://github.com/wdanilo/algebraic";
        description = "General linear algebra structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic-classes" = callPackage
@@ -24577,7 +24050,6 @@ self: {
        homepage = "http://www.ccs.neu.edu/~tov/pubs/alms/";
        description = "a practical affine language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alpha" = callPackage
@@ -24600,7 +24072,6 @@ self: {
        homepage = "http://www.alpha-lang.net/";
        description = "A compiler for the Alpha language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alpino-tools" = callPackage
@@ -24625,7 +24096,6 @@ self: {
        homepage = "http://github.com/danieldk/alpino-tools";
        description = "Alpino data manipulation tools";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alsa" = callPackage
@@ -24644,7 +24114,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-core" = callPackage
@@ -24658,7 +24127,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (Exceptions)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-gui" = callPackage
@@ -24678,7 +24146,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Some simple interactive programs for sending MIDI control messages via ALSA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "alsa-midi" = callPackage
@@ -24700,7 +24167,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-mixer" = callPackage
@@ -24715,7 +24181,6 @@ self: {
        homepage = "https://github.com/ttuegel/alsa-mixer";
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
@@ -24736,7 +24201,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (PCM audio)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm-tests" = callPackage
@@ -24750,7 +24214,6 @@ self: {
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA audio signal library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alsa-seq" = callPackage
@@ -24772,7 +24235,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (MIDI sequencer)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-seq-tests" = callPackage
@@ -24787,7 +24249,6 @@ self: {
        jailbreak = true;
        description = "Tests for the ALSA sequencer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "altcomposition" = callPackage
@@ -24829,7 +24290,6 @@ self: {
        homepage = "http://repo.or.cz/w/altfloat.git";
        description = "Alternative floating point support for GHC";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alure" = callPackage
@@ -24842,7 +24302,6 @@ self: {
        librarySystemDepends = [ alure ];
        description = "A Haskell binding for ALURE";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {alure = null;};
 
   "amazon-emailer" = callPackage
@@ -24864,7 +24323,6 @@ self: {
        homepage = "https://github.com/dbp/amazon-emailer";
        description = "A queue daemon for Amazon's SES with a PostgreSQL table as a queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazon-emailer-client-snap" = callPackage
@@ -24908,7 +24366,6 @@ self: {
        homepage = "https://github.com/AndrewRademacher/hs-amazon-products";
        description = "Connector for Amazon Products API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka_0_3_3_1" = callPackage
@@ -26271,7 +25728,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-ecs_0_3_3" = callPackage
@@ -27270,7 +26726,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-redshift_0_3_3" = callPackage
@@ -27526,7 +26981,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-sdb_0_3_3" = callPackage
@@ -27767,7 +27221,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-ssm_0_3_3" = callPackage
@@ -28069,7 +27522,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-test" = callPackage
@@ -28173,7 +27625,6 @@ self: {
        homepage = "http://wiki.tarski.nl";
        description = "Toolsuite for automated design of business processes";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amqp_0_10_1" = callPackage
@@ -28429,7 +27880,6 @@ self: {
        homepage = "https://john-millikin.com/software/anansi/";
        description = "Looms which use Pandoc to parse and produce a variety of formats";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anatomy" = callPackage
@@ -28456,7 +27906,6 @@ self: {
        homepage = "http://atomo-lang.org/";
        description = "Anatomy: Atomo documentation system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "android" = callPackage
@@ -28496,7 +27945,6 @@ self: {
        homepage = "https://github.com/passy/android-lint-summary";
        description = "A pretty printer for Android Lint errors";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "angel" = callPackage
@@ -28597,8 +28045,8 @@ self: {
      }:
      mkDerivation {
        pname = "ansi-pretty";
-       version = "0.1.1.0";
-       sha256 = "46190d94e4fc2aa01c8bc4dfc1caf59fe38a0ed4a0c22d4d0567637d64b5ff45";
+       version = "0.1.2.0";
+       sha256 = "11079e97b7faaf3825d0ab2bb3e111b5d1b9085343e6505fc2b58240c4eaa424";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base bytestring containers generics-sop
          nats scientific semigroups tagged text time unordered-containers
@@ -28763,7 +28211,6 @@ self: {
        homepage = "http://hub.darcs.net/kowey/antfarm";
        description = "Referring expressions for definitions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anticiv" = callPackage
@@ -28788,7 +28235,6 @@ self: {
        jailbreak = true;
        description = "This is an IRC bot for Mafia and Resistance";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antigate" = callPackage
@@ -28807,7 +28253,6 @@ self: {
        homepage = "https://github.com/exbb2/antigate";
        description = "Interface for antigate.com captcha recognition API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antimirov" = callPackage
@@ -28822,7 +28267,6 @@ self: {
        executableHaskellDepends = [ base containers QuickCheck ];
        description = "Define the language containment (=subtyping) relation on regulare expressions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antiquoter" = callPackage
@@ -28872,7 +28316,6 @@ self: {
        homepage = "https://github.com/markwright/antlrc";
        description = "Haskell binding to the ANTLR parser generator C runtime library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {antlr3c = null;};
 
   "anydbm" = callPackage
@@ -28888,7 +28331,6 @@ self: {
        homepage = "http://software.complete.org/anydbm";
        description = "Interface for DBM-like database systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aosd" = callPackage
@@ -28909,7 +28351,6 @@ self: {
        ];
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libaosd = null;};
 
   "ap-reflect" = callPackage
@@ -28966,7 +28407,6 @@ self: {
        homepage = "http://ojeling.net/apelsin";
        description = "Server and community browser for the game Tremulous";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "api-builder" = callPackage
@@ -29044,7 +28484,6 @@ self: {
        homepage = "http://github.com/iconnect/api-tools";
        description = "DSL for generating API boilerplate and docs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apiary_1_4_3" = callPackage
@@ -29207,7 +28646,6 @@ self: {
        homepage = "https://github.com/philopon/apiary";
        description = "helics support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apiary-logger" = callPackage
@@ -29310,7 +28748,6 @@ self: {
        homepage = "https://github.com/philopon/apiary";
        description = "purescript compiler for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apiary-session" = callPackage
@@ -29367,7 +28804,6 @@ self: {
        homepage = "https://github.com/fabianbergmark/APIs";
        description = "A Template Haskell library for generating type safe API calls";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apotiki" = callPackage
@@ -29399,7 +28835,6 @@ self: {
        homepage = "https://github.com/pyr/apotiki";
        description = "a faster debian repository";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "app-lens" = callPackage
@@ -29413,7 +28848,6 @@ self: {
        homepage = "https://bitbucket.org/kztk/app-lens";
        description = "applicative (functional) bidirectional programming beyond composition chains";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "app-settings" = callPackage
@@ -29469,7 +28903,6 @@ self: {
        ];
        description = "app container types and tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "applicative-extras" = callPackage
@@ -29648,7 +29081,6 @@ self: {
        homepage = "http://github.com/danieldk/approx-rand-test";
        description = "Approximate randomization test";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "approximate_0_2_1_1" = callPackage
@@ -29825,7 +29257,6 @@ self: {
        homepage = "https://github.com/ian-ross/arb-fft";
        description = "Pure Haskell arbitrary length FFT library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arbb-vm" = callPackage
@@ -29843,7 +29274,6 @@ self: {
        homepage = "https://github.com/svenssonjoel/arbb-vm/wiki";
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {arbb_dev = null;};
 
   "arbtt_0_8_1_4" = callPackage
@@ -30098,7 +29528,6 @@ self: {
        ];
        description = "Archive supplied URLs in WebCite & Internet Archive";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "archlinux" = callPackage
@@ -30115,7 +29544,6 @@ self: {
        homepage = "http://github.com/archhaskell/";
        description = "Support for working with Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "archlinux-web" = callPackage
@@ -30142,7 +29570,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/archlinux";
        description = "Website maintenance for Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "archnews" = callPackage
@@ -30177,7 +29604,6 @@ self: {
        homepage = "http://code.haskell.org/~StefanKersten/code/arff";
        description = "Generate Attribute-Relation File Format (ARFF) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arghwxhaskell" = callPackage
@@ -30268,7 +29694,6 @@ self: {
        homepage = "https://github.com/ocharles/argon2.git";
        description = "Haskell bindings to libargon2 - the reference implementation of the Argon2 password-hashing function";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "argparser" = callPackage
@@ -30281,7 +29706,6 @@ self: {
        testHaskellDepends = [ base containers HTF HUnit ];
        description = "Command line parsing framework for console applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arguedit" = callPackage
@@ -30300,7 +29724,6 @@ self: {
        jailbreak = true;
        description = "A computer assisted argumentation transcription and editing software";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ariadne" = callPackage
@@ -30329,7 +29752,6 @@ self: {
        homepage = "https://github.com/feuerbach/ariadne";
        description = "Go-to-definition for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arion" = callPackage
@@ -30354,7 +29776,6 @@ self: {
        homepage = "http://github.com/karun012/arion";
        description = "Watcher and runner for Hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arith-encode" = callPackage
@@ -30376,7 +29797,6 @@ self: {
        homepage = "https://github.com/emc2/arith-encode";
        description = "A practical arithmetic encoding (aka Godel numbering) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arithmatic" = callPackage
@@ -30415,7 +29835,6 @@ self: {
        ];
        description = "Natural number arithmetic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "arithmoi_0_4_1_1" = callPackage
@@ -30434,7 +29853,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://bitbucket.org/dafis/arithmoi";
-       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms";
+       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -30453,7 +29872,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/cartazio/arithmoi";
-       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms";
+       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -30472,9 +29891,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/cartazio/arithmoi";
-       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms";
+       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "armada" = callPackage
@@ -30488,7 +29906,6 @@ self: {
        executableHaskellDepends = [ base GLUT mtl OpenGL stm ];
        description = "Space-based real time strategy game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arpa" = callPackage
@@ -30543,7 +29960,6 @@ self: {
        jailbreak = true;
        description = "A simple interpreter for arrayForth, the language used on GreenArrays chips";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "array-memoize" = callPackage
@@ -30593,7 +30009,6 @@ self: {
        homepage = "https://github.com/prophile/arrow-improve/";
        description = "Improved arrows";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrow-list_0_6_1_5" = callPackage
@@ -30630,7 +30045,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities for working with ArrowApply instances more naturally";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrowp" = callPackage
@@ -30645,7 +30059,6 @@ self: {
        homepage = "http://www.haskell.org/arrows/";
        description = "preprocessor translating arrow notation into Haskell 98";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrows" = callPackage
@@ -30682,8 +30095,8 @@ self: {
      }:
      mkDerivation {
        pname = "arx";
-       version = "0.2.1";
-       sha256 = "9d6f2a8e04209f9e208814b8aa8c693a4ea005ce7138d00e959214067fd34970";
+       version = "0.2.2";
+       sha256 = "a294fdbeb0e5da2762e855620c75289fbac09872efa76c14e1a47dd2d2ef8011";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30697,7 +30110,6 @@ self: {
        homepage = "http://github.com/solidsnack/arx/";
        description = "Archive execution tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arxiv" = callPackage
@@ -30797,7 +30209,6 @@ self: {
        jailbreak = true;
        description = "Conduit for encoding ByteString into Ascii85";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asciidiagram_1_1_1_1" = callPackage
@@ -30860,7 +30271,6 @@ self: {
        homepage = "http://www.pros.upv.es/fittest/";
        description = "Action Script Instrumentation Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asil" = callPackage
@@ -30880,7 +30290,6 @@ self: {
        homepage = "http://www.pros.upv.es/fittest/";
        description = "Action Script Instrumentation Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asn1-data_0_7_1" = callPackage
@@ -31153,7 +30562,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "The Assimp asset import library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) assimp;};
 
   "astar" = callPackage
@@ -31184,7 +30592,6 @@ self: {
        jailbreak = true;
        description = "an incomplete 2d space game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "astview" = callPackage
@@ -31204,7 +30611,6 @@ self: {
        ];
        description = "A GTK-based abstract syntax tree viewer for custom languages and parsers";
        license = stdenv.lib.licenses.bsdOriginal;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "astview-utils" = callPackage
@@ -31300,7 +30706,6 @@ self: {
        homepage = "http://github.com/jfischoff/async-extras";
        description = "Extra Utilities for the Async Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-manager" = callPackage
@@ -31377,7 +30782,6 @@ self: {
        homepage = "https://github.com/GaloisInc/aterm-utils";
        description = "Utility functions for working with aterms as generated by Minitermite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atl" = callPackage
@@ -31414,7 +30818,6 @@ self: {
        homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core";
        description = "Atlassian Connect snaplet for the Snap Framework and helper code";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atlassian-connect-descriptor" = callPackage
@@ -31437,7 +30840,6 @@ self: {
        jailbreak = true;
        description = "Code that helps you create a valid Atlassian Connect Descriptor";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atmos" = callPackage
@@ -31507,29 +30909,30 @@ self: {
 
   "atom-conduit" = callPackage
     ({ mkDerivation, base, conduit, conduit-parse, data-default
-     , exceptions, foldl, hlint, lens, mono-traversable, parsers
+     , exceptions, foldl, hlint, lens-simple, mono-traversable, parsers
      , quickcheck-instances, resourcet, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, timerep, total, uri-bytestring
+     , tasty-quickcheck, text, time, timerep, uri-bytestring
      , xml-conduit, xml-conduit-parse, xml-types
      }:
      mkDerivation {
        pname = "atom-conduit";
-       version = "0.2.0.0";
-       sha256 = "3dc3d6b784ebb2dc6a8cfc901f4c75351de5254efb6d12c6242d2cd5605e780e";
+       version = "0.3.0.0";
+       sha256 = "8e82a8ec5d0e21153883b7dc0e28a8dd27ff14db0a64cb572578dba989a42d68";
+       revision = "1";
+       editedCabalFile = "76c749fd2807f1fb328d997a819eedcaa879b9a1920272d7bc93940089e0ff33";
        libraryHaskellDepends = [
-         base conduit conduit-parse exceptions foldl lens mono-traversable
-         parsers text time timerep total uri-bytestring xml-conduit
-         xml-conduit-parse xml-types
+         base conduit conduit-parse exceptions foldl lens-simple
+         mono-traversable parsers text time timerep uri-bytestring
+         xml-conduit xml-conduit-parse xml-types
        ];
        testHaskellDepends = [
-         base conduit conduit-parse data-default exceptions hlint lens
-         mono-traversable parsers quickcheck-instances resourcet tasty
-         tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit
-         xml-conduit-parse xml-types
+         base conduit conduit-parse data-default exceptions hlint
+         lens-simple mono-traversable parsers quickcheck-instances resourcet
+         tasty tasty-hunit tasty-quickcheck text time uri-bytestring
+         xml-conduit xml-conduit-parse xml-types
        ];
-       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)";
+       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atom-msp430" = callPackage
@@ -31542,7 +30945,6 @@ self: {
        homepage = "https://github.com/eightyeight/atom-msp430";
        description = "Convenience functions for using Atom with the MSP430 microcontroller family";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atomic-primops_0_8" = callPackage
@@ -31588,7 +30990,6 @@ self: {
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "An atomic counter implemented using the FFI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "atomic-primops-vector" = callPackage
@@ -31602,7 +31003,6 @@ self: {
        jailbreak = true;
        description = "Atomic operations on Data.Vector types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atomic-write" = callPackage
@@ -31648,7 +31048,6 @@ self: {
        homepage = "http://atomo-lang.org/";
        description = "A highly dynamic, extremely simple, very fun programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atp-haskell" = callPackage
@@ -31899,7 +31298,6 @@ self: {
        homepage = "https://github.com/robinbb/attoparsec-csv";
        description = "A parser for CSV files that uses Attoparsec";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-enumerator_0_3_3" = callPackage
@@ -31971,7 +31369,6 @@ self: {
        homepage = "http://github.com/gregorycollins";
        description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-parsec" = callPackage
@@ -32001,7 +31398,6 @@ self: {
        homepage = "http://patch-tag.com/r/felipe/attoparsec-text/home";
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-text-enumerator" = callPackage
@@ -32014,7 +31410,6 @@ self: {
        jailbreak = true;
        description = "(deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-trans" = callPackage
@@ -32056,7 +31451,6 @@ self: {
        homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
        description = "Embedded Turtle language compiler in Haskell, with Epic output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "audacity" = callPackage
@@ -32088,10 +31482,10 @@ self: {
          hashable JuicyPixels JuicyPixels-util lens linear mtl objective
          random template-haskell transformers vector void WAVE
        ];
+       jailbreak = true;
        homepage = "https://github.com/fumieval/audiovisual";
        description = "A battery-included audiovisual framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "augeas" = callPackage
@@ -32111,7 +31505,6 @@ self: {
        homepage = "http://trac.haskell.org/augeas";
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) augeas;};
 
   "augur" = callPackage
@@ -32131,7 +31524,6 @@ self: {
        jailbreak = true;
        description = "Renaming media collections in a breeze";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aur" = callPackage
@@ -32291,7 +31683,6 @@ self: {
        homepage = "http://github.com/nushio3/authoring";
        description = "A library for writing papers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "auto" = callPackage
@@ -32429,7 +31820,6 @@ self: {
        homepage = "http://code.haskell.org/autoproc";
        description = "EDSL for Procmail scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avahi" = callPackage
@@ -32441,7 +31831,6 @@ self: {
        libraryHaskellDepends = [ base dbus-core text ];
        description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avatar-generator" = callPackage
@@ -32525,7 +31914,6 @@ self: {
        ];
        description = "empty";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avers-api_0_0_1" = callPackage
@@ -32644,7 +32032,7 @@ self: {
        sha256 = "cf5edb7500a02aaba7400f3baab984680898dbedc0cf5b09ded2ca40568e6e57";
        libraryHaskellDepends = [ base ];
        homepage = "https://notabug.org/koz.ross/awesome-prelude";
-       description = "A prelude which I can be happy with. Based on base-prelude";
+       description = "A prelude which I can be happy with. Based on base-prelude.";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -32661,7 +32049,6 @@ self: {
        ];
        description = "High-level Awesomium bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "awesomium-glut" = callPackage
@@ -32673,7 +32060,6 @@ self: {
        libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ];
        description = "Utilities for using Awesomium with GLUT";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "awesomium-raw" = callPackage
@@ -32687,7 +32073,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Low-level Awesomium bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {awesomium = null;};
 
   "aws_0_11" = callPackage
@@ -32963,7 +32348,6 @@ self: {
        ];
        description = "Configuration types, parsers & renderers for AWS services";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-dynamodb-conduit" = callPackage
@@ -33006,7 +32390,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for Amazon DynamoDB Streams";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-ec2" = callPackage
@@ -33059,7 +32442,6 @@ self: {
        homepage = "http://github.com/iconnect/aws-elastic-transcoder";
        description = "Haskell suite for the Elastic Transcoder service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-general" = callPackage
@@ -33086,7 +32468,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-aws-general";
        description = "Bindings for Amazon Web Services (AWS) General Reference";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-kinesis" = callPackage
@@ -33113,7 +32494,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-aws-kinesis";
        description = "Bindings for Amazon Kinesis";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-kinesis-client" = callPackage
@@ -33149,7 +32529,6 @@ self: {
        jailbreak = true;
        description = "A producer & consumer client library for AWS Kinesis";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-kinesis-reshard" = callPackage
@@ -33180,7 +32559,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-aws-kinesis-reshard";
        description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-lambda" = callPackage
@@ -33202,7 +32580,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-aws-lambda";
        description = "Haskell bindings for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-performance-tests" = callPackage
@@ -33229,7 +32606,6 @@ self: {
        homepage = "http://github.com/alephcloud/hs-aws-performance-tests";
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-route53" = callPackage
@@ -33276,7 +32652,6 @@ self: {
        homepage = "http://worksap-ate.github.com/aws-sdk";
        description = "AWS SDK for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-sdk-text-converter" = callPackage
@@ -33345,7 +32720,6 @@ self: {
        homepage = "http://github.com/iconnect/aws-sign4";
        description = "Amazon Web Services (AWS) Signature v4 HTTP request signer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-sns" = callPackage
@@ -33370,7 +32744,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-aws-sns";
        description = "Bindings for AWS SNS Version 2013-03-31";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "azure-acs" = callPackage
@@ -33409,7 +32782,6 @@ self: {
        homepage = "github.com/haskell-distributed/azure-service-api";
        description = "Haskell bindings for the Microsoft Azure Service Management API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "azure-servicebus" = callPackage
@@ -33459,7 +32831,6 @@ self: {
        homepage = "http://arnovanlumig.com/azure";
        description = "A simple library for accessing Azure blob storage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "b-tree" = callPackage
@@ -33729,7 +33100,6 @@ self: {
        ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "backdropper" = callPackage
@@ -33748,7 +33118,6 @@ self: {
        jailbreak = true;
        description = "Rotates backdrops for X11 displays using Imagemagic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "backtracking-exceptions" = callPackage
@@ -33805,7 +33174,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple stable bag";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bake_0_2" = callPackage
@@ -33881,7 +33249,6 @@ self: {
        homepage = "http://github.com/nfjinjing/bamboo/tree/master";
        description = "A blog engine on Hack";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamboo-launcher" = callPackage
@@ -33902,7 +33269,6 @@ self: {
        homepage = "http://github.com/nfjinjing/bamboo-launcher";
        description = "bamboo-launcher";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamboo-plugin-highlight" = callPackage
@@ -33920,7 +33286,6 @@ self: {
        homepage = "http://github.com/nfjinjing/bamboo-plugin-highlight/";
        description = "A highlight middleware";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamboo-plugin-photo" = callPackage
@@ -33939,7 +33304,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "A photo album middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamboo-theme-blueprint" = callPackage
@@ -33958,7 +33322,6 @@ self: {
        homepage = "http://github.com/nfjinjing/bamboo-theme-blueprint";
        description = "bamboo blueprint theme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamboo-theme-mini-html5" = callPackage
@@ -33981,7 +33344,6 @@ self: {
        homepage = "http://github.com/nfjinjing/bamboo-theme-mini-html5";
        description = "bamboo mini html5 theme";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamse" = callPackage
@@ -34000,7 +33362,6 @@ self: {
        executableHaskellDepends = [ HUnit QuickCheck ];
        description = "A Windows Installer (MSI) generator framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamstats" = callPackage
@@ -34093,7 +33454,6 @@ self: {
        homepage = "http://sebfisch.github.com/haskell-barchart";
        description = "Creating Bar Charts in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barcodes-code128" = callPackage
@@ -34106,7 +33466,6 @@ self: {
        jailbreak = true;
        description = "Generate Code 128 barcodes as PDFs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barecheck_0_2_0_6" = callPackage
@@ -34154,7 +33513,6 @@ self: {
        jailbreak = true;
        description = "A web based environment for learning and tinkering with Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barrie" = callPackage
@@ -34167,7 +33525,6 @@ self: {
        homepage = "http://thewhitelion.org/haskell/barrie";
        description = "Declarative Gtk GUI library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barrier" = callPackage
@@ -34204,7 +33561,6 @@ self: {
        jailbreak = true;
        description = "Implementation of barrier monad, can use custom front/back type";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base_4_8_2_0" = callPackage
@@ -34286,7 +33642,7 @@ self: {
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/HaskellZhangSong/base-generics";
-       description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well";
+       description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -34391,7 +33747,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-orphans" = callPackage
+  "base-orphans_0_5_2" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "base-orphans";
@@ -34402,6 +33758,20 @@ self: {
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "base-orphans" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "base-orphans";
+       version = "0.5.3";
+       sha256 = "5def4ae2210a4ed75454aa268d166923bef7e9f1c1e6345fefa9c76eabc49062";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/haskell-compat/base-orphans#readme";
+       description = "Backwards-compatible orphan instances for base";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "base-prelude_0_1_6" = callPackage
@@ -34622,7 +33992,6 @@ self: {
        homepage = "https://github.com/pxqr/base32-bytestring";
        description = "Fast base32 and base32hex codec for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "base32string" = callPackage
@@ -34945,7 +34314,6 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "An interpreter for a small functional language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "battlenet" = callPackage
@@ -35010,7 +34378,6 @@ self: {
        homepage = "https://github.com/zrho/afp";
        description = "A web-based implementation of battleships including an AI opponent";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bayes-stack" = callPackage
@@ -35031,7 +34398,6 @@ self: {
        homepage = "https://github.com/bgamari/bayes-stack";
        description = "Framework for inferring generative probabilistic models with Gibbs sampling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bbdb" = callPackage
@@ -35165,7 +34531,6 @@ self: {
        jailbreak = true;
        description = "Generic serializer/deserializer with compact representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beautifHOL" = callPackage
@@ -35180,7 +34545,6 @@ self: {
        homepage = "http://www.cs.indiana.edu/~lepike/pub_pages/holpp.html";
        description = "A pretty-printer for higher-order logic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bed-and-breakfast" = callPackage
@@ -35201,7 +34565,6 @@ self: {
        homepage = "https://hackage.haskell.org/package/bed-and-breakfast";
        description = "Efficient Matrix operations in 100% Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bein" = callPackage
@@ -35224,7 +34587,6 @@ self: {
        ];
        description = "Bein is a provenance and workflow management system for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "benchmark-function" = callPackage
@@ -35294,7 +34656,6 @@ self: {
        librarySystemDepends = [ db ];
        description = "Pretty BerkeleyDB v4 binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) db;};
 
   "berp" = callPackage
@@ -35322,7 +34683,6 @@ self: {
        homepage = "http://wiki.github.com/bjpop/berp/";
        description = "An implementation of Python 3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bert" = callPackage
@@ -35384,9 +34744,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/Noeda/bet/";
-       description = "Betfair API bindings. Bet on sports on betting exchanges";
+       description = "Betfair API bindings. Bet on sports on betting exchanges.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "betacode" = callPackage
@@ -35402,7 +34761,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        jailbreak = true;
-       description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code)";
+       description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code).";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -35446,7 +34805,6 @@ self: {
        jailbreak = true;
        description = "Bidirectionalization for Free! (POPL'09)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bff-mono" = callPackage
@@ -35487,7 +34845,6 @@ self: {
        ];
        description = "Blocked GZip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bibtex" = callPackage
@@ -35521,7 +34878,6 @@ self: {
        homepage = "http://www.kb.ecei.tohoku.ac.jp/~kztk/b18n-combined/desc.html";
        description = "Prototype Implementation of Combining Syntactic and Semantic Bidirectionalization (ICFP'10)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bidispec" = callPackage
@@ -35533,7 +34889,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Specification of generators and parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bidispec-extras" = callPackage
@@ -35690,7 +35045,6 @@ self: {
        homepage = "http://ddmal.music.mcgill.ca/billboard";
        description = "A parser for the Billboard chord dataset";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "billeksah-forms" = callPackage
@@ -35710,7 +35064,6 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "billeksah-main" = callPackage
@@ -35731,7 +35084,6 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Leksah plugin base";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "billeksah-main-static" = callPackage
@@ -35775,7 +35127,6 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "billeksah-services" = callPackage
@@ -35793,7 +35144,6 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bimap_0_3_0" = callPackage
@@ -35967,7 +35317,6 @@ self: {
        jailbreak = true;
        description = "Automatic deriving of Binary using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-enum" = callPackage
@@ -35996,7 +35345,6 @@ self: {
        homepage = "https://skami.iocikun.jp/haskell/packages/binary-file";
        description = "read/write binary file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-generic" = callPackage
@@ -36022,9 +35370,8 @@ self: {
        version = "0.1";
        sha256 = "8dd0f54f68c36f107dfbc35412e873c4bbf057d16629417df38e3996f9ac4bb3";
        libraryHaskellDepends = [ array base ];
-       description = "Binary Indexed Trees (a.k.a. Fenwick Trees)";
+       description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-list_1_0_1_0" = callPackage
@@ -36274,7 +35621,6 @@ self: {
        homepage = "http://github.com/NicolasT/binary-protocol-zmq";
        description = "Monad to ease implementing a binary network protocol over ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-search_0_1" = callPackage
@@ -36309,7 +35655,6 @@ self: {
        doCheck = false;
        description = "Binary and exponential searches";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-shared" = callPackage
@@ -36331,7 +35676,7 @@ self: {
        version = "0.1.1";
        sha256 = "f44da50068bf57b2bea5dc7ef70aa4bb6fb14272bde724fc887c57417dc7631b";
        libraryHaskellDepends = [ base binary bytestring containers mtl ];
-       description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads";
+       description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -36373,7 +35718,6 @@ self: {
        homepage = "http://github.com/jonpetterbergman/binary-streams";
        description = "data serialization/deserialization io-streams library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-strict" = callPackage
@@ -36386,7 +35730,6 @@ self: {
        homepage = "https://github.com/idontgetoutmuch/binary-low-level";
        description = "Binary deserialisation using strict ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-tagged_0_1_1_0" = callPackage
@@ -36541,7 +35884,6 @@ self: {
        homepage = "https://github.com/coreyoconnor/bind-marshal";
        description = "Data marshaling library that uses type level equations to optimize buffering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binding-core" = callPackage
@@ -36572,7 +35914,6 @@ self: {
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in Gtk2Hs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binding-wx" = callPackage
@@ -36588,7 +35929,6 @@ self: {
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings" = callPackage
@@ -36651,7 +35991,6 @@ self: {
        homepage = "http://cielonegro.org/Bindings-EsounD.html";
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {esound = null;};
 
   "bindings-GLFW" = callPackage
@@ -36675,7 +36014,6 @@ self: {
        doCheck = false;
        description = "Low-level bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; 
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; 
          inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; 
@@ -36693,7 +36031,6 @@ self: {
        homepage = "https://github.com/jputcu/bindings-K8055";
        description = "Bindings to Velleman K8055 dll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {K8055D = null;};
 
   "bindings-apr" = callPackage
@@ -36708,7 +36045,6 @@ self: {
        homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime (APR)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {apr-1 = null;};
 
   "bindings-apr-util" = callPackage
@@ -36723,7 +36059,6 @@ self: {
        homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {apr-util-1 = null;};
 
   "bindings-audiofile" = callPackage
@@ -36737,7 +36072,6 @@ self: {
        homepage = "http://cielonegro.org/Bindings-AudioFile.html";
        description = "Low level bindings to audiofile";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) audiofile;};
 
   "bindings-bfd" = callPackage
@@ -36755,7 +36089,6 @@ self: {
        homepage = "http://projects.haskell.org/bindings-bfd/";
        description = "Bindings for libbfd, a library of the GNU `binutils'";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {bfd = null; opcodes = null;};
 
   "bindings-cctools" = callPackage
@@ -36769,7 +36102,6 @@ self: {
        homepage = "http://bitbucket.org/badi/bindings-cctools";
        description = "Bindings to the CCTools WorkQueue C library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {dttools = null;};
 
   "bindings-codec2" = callPackage
@@ -36790,7 +36122,6 @@ self: {
        homepage = "https://github.com/relrod/bindings-codec2";
        description = "Very low-level FFI bindings for Codec2";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {codec2 = null;};
 
   "bindings-common" = callPackage
@@ -36800,9 +36131,8 @@ self: {
        version = "1.3.4";
        sha256 = "8b55c6b28a4d7df6854d8b94933f58ca246e917b96080fa0f1ea92dbcb4675fd";
        libraryHaskellDepends = [ base ];
-       description = "This package is obsolete. Look for bindings-DSL instead";
+       description = "This package is obsolete. Look for bindings-DSL instead.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings-dc1394" = callPackage
@@ -36817,7 +36147,6 @@ self: {
        homepage = "http://github.com/aleator/bindings-dc1394";
        description = "Library for using firewire (iidc-1394) cameras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {dc1394 = null;};
 
   "bindings-directfb" = callPackage
@@ -36830,7 +36159,6 @@ self: {
        libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) directfb;};
 
   "bindings-eskit" = callPackage
@@ -36846,7 +36174,6 @@ self: {
        homepage = "http://github.com/a1kmm/bindings-eskit";
        description = "Bindings to ESKit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {eskit = null;};
 
   "bindings-fann" = callPackage
@@ -36859,7 +36186,6 @@ self: {
        libraryPkgconfigDepends = [ fann ];
        description = "Low level bindings to FANN neural network library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {fann = null;};
 
   "bindings-fluidsynth" = callPackage
@@ -36873,7 +36199,6 @@ self: {
        homepage = "http://github.com/bgamari/bindings-fluidsynth";
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) fluidsynth;};
 
   "bindings-friso" = callPackage
@@ -36886,7 +36211,6 @@ self: {
        librarySystemDepends = [ friso ];
        description = "Low level bindings for friso";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {friso = null;};
 
   "bindings-glib" = callPackage
@@ -36936,7 +36260,6 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl;};
 
   "bindings-gts" = callPackage
@@ -36949,7 +36272,6 @@ self: {
        libraryPkgconfigDepends = [ gts ];
        description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gts;};
 
   "bindings-hamlib" = callPackage
@@ -36979,7 +36301,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to HDF5 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings-levmar" = callPackage
@@ -37006,7 +36327,6 @@ self: {
        homepage = "http://bitbucket.org/mauricio/bindings-libcddb";
        description = "Low level binding to libcddb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libcddb;};
 
   "bindings-libffi" = callPackage
@@ -37031,7 +36351,6 @@ self: {
        libraryPkgconfigDepends = [ libftdi libusb ];
        description = "Low level bindings to libftdi";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;};
 
   "bindings-librrd" = callPackage
@@ -37045,7 +36364,6 @@ self: {
        homepage = "http://cielonegro.org/Bindings-librrd.html";
        description = "Low level bindings to RRDtool";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {librrd = null;};
 
   "bindings-libstemmer" = callPackage
@@ -37062,7 +36380,6 @@ self: {
        librarySystemDepends = [ stemmer ];
        description = "Binding for libstemmer with low level binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {stemmer = null;};
 
   "bindings-libusb" = callPackage
@@ -37089,7 +36406,6 @@ self: {
        homepage = "https://gitorious.org/hsv4l2";
        description = "bindings to libv4l2 for Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {v4l2 = null;};
 
   "bindings-libzip" = callPackage
@@ -37103,7 +36419,6 @@ self: {
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Low level bindings to libzip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libzip;};
 
   "bindings-libzip_0_11" = callPackage
@@ -37130,7 +36445,6 @@ self: {
        homepage = "https://gitorious.org/hsv4l2";
        description = "bindings to Video For Linux Two (v4l2) kernel interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings-lxc" = callPackage
@@ -37144,7 +36458,6 @@ self: {
        homepage = "https://github.com/fizruk/bindings-lxc";
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) lxc;};
 
   "bindings-mmap" = callPackage
@@ -37169,7 +36482,6 @@ self: {
        homepage = "http://www.github.com/massysett/bindings-mpdecimal";
        description = "bindings to mpdecimal library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings-nettle" = callPackage
@@ -37211,7 +36523,6 @@ self: {
        libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) portaudio;};
 
   "bindings-posix" = callPackage
@@ -37247,7 +36558,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "PPDev bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings-saga-cmd" = callPackage
@@ -37282,7 +36592,6 @@ self: {
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {saneBackends = null;};
 
   "bindings-sc3" = callPackage
@@ -37296,7 +36605,6 @@ self: {
        homepage = "https://github.com/kaoskorobase/bindings-sc3/";
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {scsynth = null;};
 
   "bindings-sipc" = callPackage
@@ -37313,7 +36621,6 @@ self: {
        homepage = "https://github.com/justinethier/hs-bindings-sipc";
        description = "Low level bindings to SIPC";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {sipc = null;};
 
   "bindings-sophia" = callPackage
@@ -37349,7 +36656,6 @@ self: {
        homepage = "http://github.com/tanimoto/bindings-svm";
        description = "Low level bindings to libsvm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings-uname" = callPackage
@@ -37422,7 +36728,6 @@ self: {
        homepage = "http://code.mathr.co.uk/binembed";
        description = "Example project using binembed to embed data in object files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bini" = callPackage
@@ -37460,7 +36765,6 @@ self: {
        homepage = "http://biohaskell.org/Libraries/Bio";
        description = "A bioinformatics library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bioace" = callPackage
@@ -37555,7 +36859,6 @@ self: {
        homepage = "http://github.com/udo-stenzel/biohazard";
        description = "bioinformatics support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bioinformatics-toolkit" = callPackage
@@ -37587,7 +36890,6 @@ self: {
        ];
        description = "A collection of bioinformatics tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "biophd" = callPackage
@@ -37685,7 +36987,6 @@ self: {
        homepage = "http://biohaskell.org/";
        description = "Library and executables for working with SFF files";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "biostockholm" = callPackage
@@ -37709,7 +37010,6 @@ self: {
        jailbreak = true;
        description = "Parsing and rendering of Stockholm files (used by Pfam, Rfam and Infernal)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bird" = callPackage
@@ -37730,7 +37030,6 @@ self: {
        homepage = "http://github.com/moonmaster9000/bird";
        description = "A simple, sinatra-inspired web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bit-array" = callPackage
@@ -37744,7 +37043,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/bit-array";
        description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bit-vector" = callPackage
@@ -37762,7 +37060,6 @@ self: {
        homepage = "https://github.com/acfoltzer/bit-vector";
        description = "Simple bit vectors for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "bitarray" = callPackage
@@ -37867,7 +37164,6 @@ self: {
        jailbreak = true;
        description = "Library to communicate with the Satoshi Bitcoin daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitcoin-script" = callPackage
@@ -37939,9 +37235,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://bitbucket.org/jetxee/hs-bitly/";
-       description = "A command line tool to access bit.ly URL shortener";
+       description = "A command line tool to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitmap" = callPackage
@@ -37964,9 +37259,8 @@ self: {
        sha256 = "fba6d684213fbf56f8ca1109ec4087433dfe9f1a780ae8ef03e5b8b837b801f3";
        libraryHaskellDepends = [ base bitmap OpenGL ];
        homepage = "http://code.haskell.org/~bkomuves/";
-       description = "OpenGL support for Data.Bitmap";
+       description = "OpenGL support for Data.Bitmap.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bitmaps" = callPackage
@@ -38027,7 +37321,6 @@ self: {
        jailbreak = true;
        description = "Bitstream support for Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bits-extras" = callPackage
@@ -38042,7 +37335,6 @@ self: {
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gcc_s = null;};
 
   "bitset" = callPackage
@@ -38059,7 +37351,6 @@ self: {
        jailbreak = true;
        description = "A space-efficient set data structure";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gmp;};
 
   "bitspeak" = callPackage
@@ -38079,7 +37370,6 @@ self: {
        jailbreak = true;
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk2 = null; gtk2 = pkgs.gnome2.gtk; 
          inherit (pkgs.gnome) pango;};
 
@@ -38101,7 +37391,6 @@ self: {
        homepage = "https://github.com/phonohawk/bitstream";
        description = "Fast, packed, strict and lazy bit streams with stream fusion";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitstring" = callPackage
@@ -38148,7 +37437,6 @@ self: {
        homepage = "https://github.com/cobit/bittorrent";
        description = "Bittorrent protocol implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitvec" = callPackage
@@ -38167,6 +37455,20 @@ self: {
        homepage = "https://github.com/mokus0/bitvec";
        description = "Unboxed vectors of bits / dense IntSets";
        license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
+  "bitwise_0_1_0_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, QuickCheck }:
+     mkDerivation {
+       pname = "bitwise";
+       version = "0.1.0.2";
+       sha256 = "ae41a4f36c6d52edbfd17ad186abbf9536f46bbbda4bb2341fd6fb965d02afa4";
+       libraryHaskellDepends = [ array base bytestring ];
+       testHaskellDepends = [ base QuickCheck ];
+       jailbreak = true;
+       homepage = "http://code.mathr.co.uk/bitwise";
+       description = "fast multi-dimensional unboxed bit packed Bool arrays";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -38174,8 +37476,8 @@ self: {
     ({ mkDerivation, array, base, bytestring, QuickCheck }:
      mkDerivation {
        pname = "bitwise";
-       version = "0.1.0.2";
-       sha256 = "ae41a4f36c6d52edbfd17ad186abbf9536f46bbbda4bb2341fd6fb965d02afa4";
+       version = "0.1.1";
+       sha256 = "d4c8ad8673585a40c549fdd24313551bda98f6fbfc7f4be8693a31d54d4b8a84";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "http://code.mathr.co.uk/bitwise";
@@ -38241,7 +37543,6 @@ self: {
        homepage = "https://github.com/ingesson/bkr";
        description = "Backup utility for backing up to cloud storage services (S3 only right now)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bktrees" = callPackage
@@ -38267,7 +37568,6 @@ self: {
        homepage = "http://github.com/nfjinjing/bla";
        description = "a stupid cron";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "black-jewel" = callPackage
@@ -38289,7 +37589,6 @@ self: {
        homepage = "http://git.kaction.name/black-jewel";
        description = "The pirate bay client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blacktip" = callPackage
@@ -38340,7 +37639,6 @@ self: {
        homepage = "https://github.com/killerswan/Haskell-BLAKE";
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blakesum-demo" = callPackage
@@ -38360,7 +37658,6 @@ self: {
        homepage = "https://github.com/killerswan/Haskell-BLAKE";
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blank-canvas_0_5" = callPackage
@@ -38411,7 +37708,6 @@ self: {
        homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
        description = "HTML5 Canvas Graphics Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blas" = callPackage
@@ -38425,7 +37721,6 @@ self: {
        homepage = "http://github.com/patperry/blas";
        description = "Bindings to the BLAS library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blas-hs" = callPackage
@@ -38440,7 +37735,6 @@ self: {
        homepage = "https://github.com/Rufflewind/blas-hs";
        description = "Low-level Haskell bindings to Blas";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas;};
 
   "blastxml" = callPackage
@@ -38730,7 +38024,6 @@ self: {
        homepage = "https://github.com/egonSchiele/blaze-html-contrib";
        description = "Some contributions to add handy things to blaze html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-html-hexpat" = callPackage
@@ -38744,7 +38037,6 @@ self: {
        homepage = "https://github.com/jaspervdj/blaze-html-hexpat";
        description = "A hexpat backend for blaze-html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-html-truncate" = callPackage
@@ -39018,7 +38310,6 @@ self: {
        homepage = "http://github.com/mailrank/blaze-textual";
        description = "Fast rendering of common datatypes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blazeMarker" = callPackage
@@ -39028,9 +38319,8 @@ self: {
        version = "0.1.0.0";
        sha256 = "0c0dedca6cee4a5547a73f3a825925ca447bc8a86d8cf8ac41aa9fdfa91ffd0d";
        libraryHaskellDepends = [ base blaze-html blaze-markup ];
-       description = "..";
+       description = "...";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blink1" = callPackage
@@ -39065,7 +38355,6 @@ self: {
        homepage = "https://github.com/bjpop/blip";
        description = "Python to bytecode compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bliplib" = callPackage
@@ -39115,7 +38404,6 @@ self: {
        executableHaskellDepends = [ base ConfigFile haskell98 old-time ];
        description = "Very simple static blog software";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloodhound_0_4_0_2" = callPackage
@@ -39230,7 +38518,6 @@ self: {
        homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloomfilter" = callPackage
@@ -39262,7 +38549,6 @@ self: {
        executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "blubber" = callPackage
@@ -39282,7 +38568,6 @@ self: {
        homepage = "https://secure.plaimi.net/games/blubber.html";
        description = "The blubber client; connects to the blubber server";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "blubber-server" = callPackage
@@ -39327,7 +38612,6 @@ self: {
        homepage = "http://www.bluetile.org/";
        description = "full-featured tiling for the GNOME desktop environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk2 = pkgs.gnome2.gtk;};
 
   "bluetileutils" = callPackage
@@ -39402,7 +38686,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/games/";
        description = "Three games for inclusion in a web server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bogre-banana" = callPackage
@@ -39420,7 +38703,6 @@ self: {
        ];
        executableHaskellDepends = [ base hogre hois random ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bond" = callPackage
@@ -39452,7 +38734,6 @@ self: {
        homepage = "https://github.com/Microsoft/bond";
        description = "Bond schema compiler and code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bool-extras" = callPackage
@@ -39496,7 +38777,6 @@ self: {
        ];
        description = "Boolean normal form: NNF, DNF & CNF";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boolexpr" = callPackage
@@ -39530,7 +38810,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simplification tools for simple propositional formulas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boomange" = callPackage
@@ -39595,7 +38874,6 @@ self: {
        jailbreak = true;
        description = "Boomshine clone";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "borel" = callPackage
@@ -39629,7 +38907,6 @@ self: {
        homepage = "https://github.com/anchor/borel-core";
        description = "Metering System for OpenStack metrics provided by Vaultaire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bot" = callPackage
@@ -39642,7 +38919,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Bot";
        description = "bots for functional reactive programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "both" = callPackage
@@ -39946,7 +39222,6 @@ self: {
        homepage = "http://github.com/Peaker/breakout/tree/master";
        description = "A simple Breakout game implementation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "breve" = callPackage
@@ -39984,7 +39259,6 @@ self: {
        homepage = "http://github.com/willdonnelly/brians-brain";
        description = "A Haskell implementation of the Brian's Brain cellular automaton";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brick_0_3_1" = callPackage
@@ -40053,7 +39327,6 @@ self: {
        jailbreak = true;
        description = "Simple part of speech tagger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan" = callPackage
@@ -40092,7 +39365,6 @@ self: {
        homepage = "https://github.com/capn-freako/broker-haskell";
        description = "Haskell bindings to Broker, Bro's messaging library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {broker = null;};
 
   "bsd-sysctl" = callPackage
@@ -40104,7 +39376,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Access to the BSD sysctl(3) interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bson_0_3_1" = callPackage
@@ -40204,7 +39475,6 @@ self: {
        jailbreak = true;
        description = "Generics functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bson-lens" = callPackage
@@ -40232,7 +39502,6 @@ self: {
        ];
        description = "Mapping between BSON and algebraic data types";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bspack" = callPackage
@@ -40285,7 +39554,6 @@ self: {
        homepage = "https://github.com/brinchj/btree-concurrent";
        description = "A backend agnostic, concurrent BTree";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "btrfs_0_1_1_1" = callPackage
@@ -40317,7 +39585,6 @@ self: {
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "buffer-builder_0_2_4_0" = callPackage
@@ -40362,7 +39629,6 @@ self: {
        homepage = "https://github.com/chadaustin/buffer-builder";
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "buffer-builder-aeson" = callPackage
@@ -40388,7 +39654,6 @@ self: {
        ];
        description = "Serialize Aeson values with Data.BufferBuilder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buffer-pipe" = callPackage
@@ -40419,7 +39684,6 @@ self: {
        homepage = "https://github.com/derekelkins/buffon";
        description = "An implementation of Buffon machines";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bugzilla" = callPackage
@@ -40487,7 +39751,6 @@ self: {
        homepage = "http://code.ouroborus.net/buildbox";
        description = "Tools for working with buildbox benchmark result files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buildwrapper" = callPackage
@@ -40527,7 +39790,6 @@ self: {
        homepage = "https://github.com/JPMoresmau/BuildWrapper";
        description = "A library and an executable that provide an easy API for a Haskell IDE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bullet" = callPackage
@@ -40542,7 +39804,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Bullet";
        description = "A wrapper for the Bullet physics engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) bullet;};
 
   "bumper_0_6_0_2" = callPackage
@@ -40631,7 +39892,6 @@ self: {
        homepage = "http://vis.renci.org/jeff/buster";
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buster-gtk" = callPackage
@@ -40649,7 +39909,6 @@ self: {
        homepage = "http://vis.renci.org/jeff/buster";
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buster-network" = callPackage
@@ -40667,7 +39926,6 @@ self: {
        homepage = "http://vis.renci.org/jeff/buster";
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bustle_0_5_2" = callPackage
@@ -40751,7 +40009,6 @@ self: {
        homepage = "http://www.freedesktop.org/wiki/Software/Bustle/";
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {system-glib = pkgs.glib;};
 
   "butterflies" = callPackage
@@ -40773,7 +40030,6 @@ self: {
        homepage = "http://code.mathr.co.uk/butterflies";
        description = "butterfly tilings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bv" = callPackage
@@ -40819,7 +40075,6 @@ self: {
        libraryHaskellDepends = [ base bytestring word24 ];
        description = "data from/to ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "byteable" = callPackage
@@ -41039,7 +40294,6 @@ self: {
        homepage = "https://github.com/tsuraan/bytestring-arbitrary";
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-builder_0_10_4_0_1" = callPackage
@@ -41126,7 +40380,6 @@ self: {
        jailbreak = true;
        description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-conversion_0_3_0" = callPackage
@@ -41180,7 +40433,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/bytestring-csv";
        description = "Parse CSV formatted data efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-delta" = callPackage
@@ -41394,7 +40646,6 @@ self: {
        homepage = "github.com/tcrayford/rematch";
        description = "Rematch support for ByteString";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-short" = callPackage
@@ -41407,7 +40658,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Backport copy of ShortByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-show" = callPackage
@@ -41481,7 +40731,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestringparser-temporary" = callPackage
@@ -41504,7 +40753,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A ReadP style parser library for ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bzlib_0_5_0_4" = callPackage
@@ -41578,7 +40826,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "C IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "c-storable-deriving" = callPackage
@@ -41763,7 +41010,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/cabal-audit.git";
-       description = "Check how up-to-date your .cabal dependencies are";
+       description = "Check how up-to-date your .cabal dependencies are.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -41825,7 +41072,6 @@ self: {
        homepage = "https://github.com/benarmston/cabal-constraints";
        description = "Repeatable builds for cabalized Haskell projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-db" = callPackage
@@ -41950,7 +41196,6 @@ self: {
        homepage = "https://github.com/ddssff/cabal-debian";
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dependency-licenses" = callPackage
@@ -41990,7 +41235,6 @@ self: {
        homepage = "http://github.com/creswick/cabal-dev";
        description = "Manage sandboxed Haskell build environments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dir" = callPackage
@@ -42048,7 +41292,6 @@ self: {
        homepage = "http://github.com/atnnn/cabal-ghci";
        description = "Set up ghci with options taken from a .cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-graphdeps" = callPackage
@@ -42067,7 +41310,6 @@ self: {
        homepage = "https://john-millikin.com/software/cabal-graphdeps/";
        description = "Generate graphs of install-time Cabal dependencies";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-helper_0_6_2_0" = callPackage
@@ -42467,6 +41709,40 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
+  "cabal-install_1_22_9_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers
+     , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl
+     , network, network-uri, pretty, process, QuickCheck, random
+     , regex-posix, stm, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, time, unix, zlib
+     }:
+     mkDerivation {
+       pname = "cabal-install";
+       version = "1.22.9.0";
+       sha256 = "874035e5730263653c7aa459f270efbffc06da92ea0c828e09ebc04400e94940";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bytestring Cabal containers directory filepath HTTP mtl
+         network network-uri pretty process random stm time unix zlib
+       ];
+       testHaskellDepends = [
+         array base bytestring Cabal containers directory
+         extensible-exceptions filepath HTTP HUnit mtl network network-uri
+         pretty process QuickCheck regex-posix stm test-framework
+         test-framework-hunit test-framework-quickcheck2 time unix zlib
+       ];
+       postInstall = ''
+         mkdir $out/etc
+         mv bash-completion $out/etc/bash_completion.d
+       '';
+       homepage = "http://www.haskell.org/cabal/";
+       description = "The command-line interface for Cabal and Hackage";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {};
+
   "cabal-install-bundle" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, old-time, pretty, process, time, unix, zlib
@@ -42484,7 +41760,6 @@ self: {
        executableSystemDepends = [ zlib ];
        description = "The (bundled) command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "cabal-install-ghc72" = callPackage
@@ -42506,7 +41781,6 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "Temporary version of cabal-install for ghc-7.2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-install-ghc74" = callPackage
@@ -42528,7 +41802,6 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "Temporary version of cabal-install for ghc-7.4";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-lenses" = callPackage
@@ -42662,7 +41935,6 @@ self: {
        homepage = "http://github.com/explicitcall/cabal-query";
        description = "Helpers for quering .cabal files or hackageDB's 00-index.tar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-rpm_0_9_4" = callPackage
@@ -42821,7 +42093,6 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "The user interface for building and installing Cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-sign" = callPackage
@@ -42996,7 +42267,6 @@ self: {
        ];
        description = "Automated test tool for cabal projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-test-bin" = callPackage
@@ -43079,7 +42349,6 @@ self: {
        jailbreak = true;
        description = "Command-line tool for uploading packages to Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal2arch" = callPackage
@@ -43099,7 +42368,6 @@ self: {
        homepage = "http://github.com/archhaskell/";
        description = "Create Arch Linux packages from Cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal2doap" = callPackage
@@ -43117,7 +42385,6 @@ self: {
        homepage = "http://gregheartsfield.com/cabal2doap/";
        description = "Cabal to Description-of-a-Project (DOAP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal2ebuild" = callPackage
@@ -43195,7 +42462,6 @@ self: {
        homepage = "https://fedorahosted.org/cabal2spec/";
        description = "Generates RPM Spec files from cabal files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabalQuery" = callPackage
@@ -43249,7 +42515,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/cabalgraph";
        description = "Generate pretty graphs of module trees from cabal files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabalmdvrpm" = callPackage
@@ -43265,7 +42530,6 @@ self: {
        homepage = "http://nanardon.zarb.org/darcsweb/darcsweb.cgi?r=haskell-cabalmdvrpm;a=shortlog;topi=0";
        description = "Create mandriva rpm from cabal package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabalrpmdeps" = callPackage
@@ -43281,7 +42545,6 @@ self: {
        homepage = "http://nanardon.zarb.org/darcsweb/darcsweb.cgi?r=haskell-CabalRpmDeps;a=summary";
        description = "Autogenerate rpm dependencies from cabal files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabalvchk" = callPackage
@@ -43326,7 +42589,6 @@ self: {
        testHaskellDepends = [ base text-format ];
        homepage = "http://github.com/pecorarista/hscabocha";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cabocha = null;};
 
   "cached-io" = callPackage
@@ -43586,7 +42848,6 @@ self: {
        homepage = "https://github.com/grwlf/cake3";
        description = "Third cake the Makefile EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cakyrespa" = callPackage
@@ -43605,7 +42866,6 @@ self: {
        homepage = "http://homepage3.nifty.com/salamander/myblog/cakyrespa.html";
        description = "run turtle like LOGO with lojban";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cal3d" = callPackage
@@ -43619,7 +42879,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cal3d = null;};
 
   "cal3d-examples" = callPackage
@@ -43635,7 +42894,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Examples for the Cal3d animation library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cal3d-opengl" = callPackage
@@ -43649,7 +42907,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "OpenGL rendering for the Cal3D animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "calc" = callPackage
@@ -43663,7 +42920,6 @@ self: {
        executableHaskellDepends = [ array base harpy haskell98 mtl ];
        description = "A small compiler for arithmetic expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "calculator" = callPackage
@@ -43706,7 +42962,6 @@ self: {
        ];
        description = "Calculation tool and library supporting units";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "caledon" = callPackage
@@ -43726,7 +42981,6 @@ self: {
        homepage = "https://github.com/mmirman/caledon";
        description = "a logic programming language based on the calculus of constructions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "call" = callPackage
@@ -43754,7 +43008,6 @@ self: {
        homepage = "https://github.com/fumieval/call";
        description = "The call game engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "call-haskell-from-anything" = callPackage
@@ -43774,7 +43027,6 @@ self: {
        homepage = "https://github.com/nh2/call-haskell-from-anything";
        description = "Call Haskell functions from other languages via serialization and dynamic libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "camh" = callPackage
@@ -43809,7 +43061,6 @@ self: {
        homepage = "http://github.com/michaelxavier/Campfire";
        description = "Haskell implementation of the Campfire API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "canonical-filepath" = callPackage
@@ -43906,7 +43157,6 @@ self: {
        homepage = "https://github.com/klangner/cantor";
        description = "Application for analysis of java source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cao" = callPackage
@@ -43928,7 +43178,6 @@ self: {
        homepage = "http://haslab.uminho.pt/mbb/software/cao-domain-specific-language-cryptography";
        description = "CAO Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cap" = callPackage
@@ -43942,7 +43191,6 @@ self: {
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "Interprets and debug the cap language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "capped-list" = callPackage
@@ -43969,7 +43217,6 @@ self: {
        ];
        description = "A simple wrapper over cabal-install to operate in project-private mode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "car-pool" = callPackage
@@ -44037,7 +43284,6 @@ self: {
        homepage = "http://github.com/jdevelop/carboncopy";
        description = "Drop emails from threads being watched into special CC folder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "carettah" = callPackage
@@ -44179,7 +43425,6 @@ self: {
        homepage = "http://github.com/ghorn/casadi-bindings";
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {casadi = null;};
 
   "casadi-bindings-control" = callPackage
@@ -44197,7 +43442,6 @@ self: {
        jailbreak = true;
        description = "low level bindings to casadi-control";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {casadi_control = null;};
 
   "casadi-bindings-core" = callPackage
@@ -44214,7 +43458,6 @@ self: {
        libraryPkgconfigDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {casadi = null;};
 
   "casadi-bindings-internal" = callPackage
@@ -44228,7 +43471,6 @@ self: {
        homepage = "http://github.com/ghorn/casadi-bindings";
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {casadi = null;};
 
   "casadi-bindings-ipopt-interface" = callPackage
@@ -44245,7 +43487,6 @@ self: {
        libraryPkgconfigDepends = [ casadi_ipopt_interface ];
        description = "low level bindings to casadi-ipopt_interface";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {casadi_ipopt_interface = null;};
 
   "casadi-bindings-snopt-interface" = callPackage
@@ -44262,7 +43503,6 @@ self: {
        libraryPkgconfigDepends = [ casadi_snopt_interface ];
        description = "low level bindings to casadi-snopt_interface";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {casadi_snopt_interface = null;};
 
   "cascading" = callPackage
@@ -44280,7 +43520,6 @@ self: {
        jailbreak = true;
        description = "DSL for HTML CSS (Cascading Style Sheets)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "case-conversion" = callPackage
@@ -44461,7 +43700,6 @@ self: {
        homepage = "http://www.cs.st-andrews.ac.uk/~hwloidl/SCIEnce/SymGrid-Par/CASH/";
        description = "the Computer Algebra SHell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "casing" = callPackage
@@ -44520,7 +43758,6 @@ self: {
        homepage = "http://cassandra.apache.org/";
        description = "thrift bindings to the cassandra database";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassava_0_4_2_0" = callPackage
@@ -44801,7 +44038,6 @@ self: {
        homepage = "https://github.com/pjones/cassava-streams";
        description = "io-streams interface for the cassava CSV library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassette" = callPackage
@@ -44842,7 +44078,6 @@ self: {
        homepage = "http://github.com/ozataman/cassy";
        description = "A high level driver for the Cassandra datastore";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "castle" = callPackage
@@ -44877,7 +44112,6 @@ self: {
        homepage = "http://code.atnnn.com/projects/casui";
        description = "Equation Manipulator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "catamorphism" = callPackage
@@ -44903,7 +44137,6 @@ self: {
        homepage = "http://github.com/sonyandy/catch-fd";
        description = "MonadThrow and MonadCatch, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "categorical-algebra" = callPackage
@@ -44915,7 +44148,6 @@ self: {
        libraryHaskellDepends = [ base newtype pointless-haskell void ];
        description = "Categorical Monoids and Semirings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "categories" = callPackage
@@ -44956,7 +44188,6 @@ self: {
        homepage = "http://comonad.com/reader/";
        description = "A meta-package documenting various packages inspired by category theory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "category-traced" = callPackage
@@ -45099,7 +44330,6 @@ self: {
        ];
        description = "Bindings for the CCI networking library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cci = null;};
 
   "ccnx" = callPackage
@@ -45130,7 +44360,6 @@ self: {
        homepage = "http://bitbucket.org/badi/hs-cctools-workqueue";
        description = "High-level interface to CCTools' WorkQueue library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {dttools = null;};
 
   "cedict" = callPackage
@@ -45149,7 +44378,6 @@ self: {
        jailbreak = true;
        description = "Convenient Chinese phrase & character lookup";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cef" = callPackage
@@ -45189,7 +44417,6 @@ self: {
        homepage = "https://github.com/anchor/ceilometer-common";
        description = "Common Haskell types and encoding for OpenStack Ceilometer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cellrenderer-cairo" = callPackage
@@ -45343,7 +44570,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal enumerator ];
        description = "Deserialize things with cereal and enumerator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-ieee754" = callPackage
@@ -45357,7 +44583,6 @@ self: {
        homepage = "http://github.com/jystic/cereal-ieee754";
        description = "Floating point support for the 'cereal' serialization library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-plus" = callPackage
@@ -45383,7 +44608,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/cereal-plus";
        description = "An extended serialization library on top of \"cereal\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-text" = callPackage
@@ -45407,7 +44631,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal vector ];
        testHaskellDepends = [ base cereal QuickCheck vector ];
        homepage = "https://github.com/acfoltzer/cereal-vector";
-       description = "Serialize instances for Data.Vector types";
+       description = "Serialize instances for Data.Vector types.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -45432,7 +44656,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "Certificates and Key Reader/Writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cf" = callPackage
@@ -45451,7 +44674,6 @@ self: {
        homepage = "http://github.com/mvr/cf";
        description = "Exact real arithmetic using continued fractions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cfipu" = callPackage
@@ -45470,7 +44692,6 @@ self: {
        homepage = "https://github.com/bairyn/cfipu";
        description = "cfipu processor for toy brainfuck-like language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cflp" = callPackage
@@ -45490,7 +44711,6 @@ self: {
        homepage = "http://www-ps.informatik.uni-kiel.de/~sebf/projects/cflp.html";
        description = "Constraint Functional-Logic Programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cfopu" = callPackage
@@ -45508,7 +44728,6 @@ self: {
        ];
        description = "cfopu processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cg" = callPackage
@@ -45530,7 +44749,6 @@ self: {
        jailbreak = true;
        description = "Parser for categorial grammars";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "cgen" = callPackage
@@ -45551,7 +44769,6 @@ self: {
        homepage = "http://anttisalonen.github.com/cgen";
        description = "generates Haskell bindings and C wrappers for C++ libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cgi_3001_2_2_2" = callPackage
@@ -45614,7 +44831,6 @@ self: {
        homepage = "http://github.com/chrisdone/haskell-cgi-utils";
        description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cgrep" = callPackage
@@ -45626,8 +44842,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.6.2";
-       sha256 = "3c4aa9458da80a7df400479f969a432b331d9e47e57cd1358749a465e728f437";
+       version = "6.6.3";
+       sha256 = "cb603a7127c922a63a0c91f64f4d35782860a96cb1da66d5d9ae5fa8f91a634f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -45685,7 +44901,6 @@ self: {
        homepage = "http://www.ittc.ku.edu/csdl/fpg/ChalkBoard";
        description = "Combinators for building and processing 2D images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chalkboard-viewer" = callPackage
@@ -45699,7 +44914,6 @@ self: {
        homepage = "http://ittc.ku.edu/~andygill/chalkboard.php";
        description = "OpenGL based viewer for chalkboard rendered images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chalmers-lava2000" = callPackage
@@ -45722,7 +44936,7 @@ self: {
        sha256 = "2c2f2f9e90d5ee0e283eeae7e3ff727763165476ea1d0983d16f18e158cffbd7";
        libraryHaskellDepends = [ base stm ];
        homepage = "http://brandon.si/code/module-chan-split-released/";
-       description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class";
+       description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -45763,7 +44977,6 @@ self: {
        homepage = "https://github.com/soostone/charade";
        description = "Rapid prototyping websites with Snap and Heist";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "charset_0_3_7" = callPackage
@@ -45810,7 +45023,6 @@ self: {
        homepage = "http://www.github.com/batterseapower/charsetdetect";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "charsetdetect-ae" = callPackage
@@ -45823,7 +45035,6 @@ self: {
        homepage = "http://github.com/aelve/charsetdetect-ae";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "chart-histogram" = callPackage
@@ -45894,7 +45105,6 @@ self: {
        homepage = "http://github.com/creswick/chatter";
        description = "A library of simple NLP algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chatty" = callPackage
@@ -46020,7 +45230,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Import_modules_properly";
        description = "Check whether module and package imports conform to the PVP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "checked" = callPackage
@@ -46032,7 +45241,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bounds-checking integer types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "checkers_0_4_1" = callPackage
@@ -46132,7 +45340,6 @@ self: {
        homepage = "https://john-millikin.com/software/chell/";
        description = "HUnit support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chell-quickcheck_0_2_4" = callPackage
@@ -46191,7 +45398,6 @@ self: {
        jailbreak = true;
        description = "Query interface for Chevalier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chp" = callPackage
@@ -46208,7 +45414,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "An implementation of concurrency ideas from Communicating Sequential Processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chp-mtl" = callPackage
@@ -46222,7 +45427,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "MTL class instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chp-plus" = callPackage
@@ -46240,7 +45444,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "A set of high-level concurrency utilities built on Communicating Haskell Processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chp-spec" = callPackage
@@ -46258,7 +45461,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "A mirror implementation of chp that generates a specification of the program";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chp-transformers" = callPackage
@@ -46272,7 +45474,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "Transformers instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chronograph" = callPackage
@@ -46323,7 +45524,6 @@ self: {
        homepage = "http://github.com/marcotmarcot/chuchu";
        description = "Behaviour Driven Development like Cucumber for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chunked-data_0_1_0_1" = callPackage
@@ -46374,7 +45574,6 @@ self: {
        homepage = "http://www.wellquite.org/chunks/";
        description = "Simple template library with static safety";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chunky" = callPackage
@@ -46416,7 +45615,6 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "An interface to CIL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cinvoke" = callPackage
@@ -46430,7 +45628,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Library/cinvoke";
        description = "A binding to cinvoke";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cinvoke = null;};
 
   "cio" = callPackage
@@ -46443,7 +45640,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/cio";
        description = "A monad for concurrent IO on a thread pool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cipher-aes_0_2_9" = callPackage
@@ -46656,7 +45852,6 @@ self: {
        homepage = "http://github.com/BartMassey/ciphersaber";
        description = "Implementation of CipherSaber2 RC4 cryptography";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "circ" = callPackage
@@ -46739,7 +45934,6 @@ self: {
        homepage = "https://github.com/nushio3/citation-resolve";
        description = "convert document IDs such as DOI, ISBN, arXiv ID to bibliographic reference";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "citeproc-hs" = callPackage
@@ -46760,7 +45954,6 @@ self: {
        homepage = "http://istitutocolli.org/repos/citeproc-hs/";
        description = "A Citation Style Language implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "citeproc-hs-pandoc-filter" = callPackage
@@ -46781,7 +45974,6 @@ self: {
        homepage = "http://istitutocolli.org/repos/citeproc-hs-pandoc-filter/";
        description = "A Pandoc filter for processing bibliographic references with citeproc-hs";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cityhash" = callPackage
@@ -46800,7 +45992,6 @@ self: {
        homepage = "http://github.com/thoughtpolice/hs-cityhash";
        description = "Bindings to CityHash";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "cjk" = callPackage
@@ -46818,7 +46009,6 @@ self: {
        homepage = "http://github.com/batterseapower/cjk";
        description = "Data about Chinese, Japanese and Korean characters and languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clac" = callPackage
@@ -46873,7 +46063,6 @@ self: {
        homepage = "http://clafer.org";
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "claferIG" = callPackage
@@ -46907,7 +46096,6 @@ self: {
        homepage = "http://clafer.org";
        description = "claferIG is an interactive tool that generates instances of Clafer models";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "claferwiki" = callPackage
@@ -46928,7 +46116,6 @@ self: {
        homepage = "http://github.com/gsdlab/claferwiki";
        description = "A wiki-based IDE for literate modeling with Clafer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clang-pure" = callPackage
@@ -46999,7 +46186,6 @@ self: {
        homepage = "http://clash.ewi.utwente.nl/";
        description = "CAES Language for Synchronous Hardware (CLaSH)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-ghc_0_5_11" = callPackage
@@ -47528,7 +46714,6 @@ self: {
        jailbreak = true;
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-systemverilog_0_5_7" = callPackage
@@ -48819,7 +48004,6 @@ self: {
        homepage = "http://clckwrks.com/";
        description = "bug tracking plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-plugin-ircbot" = callPackage
@@ -48963,7 +48147,6 @@ self: {
        homepage = "http://divshot.github.com/geo-bootstrap/";
        description = "geo bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cld2" = callPackage
@@ -48978,7 +48161,6 @@ self: {
        homepage = "https://github.com/dfoxfranke/haskell-cld2";
        description = "Haskell bindings to Google's Compact Language Detector 2";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "clean-home" = callPackage
@@ -49043,7 +48225,6 @@ self: {
        homepage = "http://sandbox.pocoo.org/clevercss-hs/";
        description = "A CSS preprocessor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cli" = callPackage
@@ -49078,9 +48259,8 @@ self: {
          transformers
        ];
        jailbreak = true;
-       description = "Toy game (tetris on billiard board). Hipmunk in action";
+       description = "Toy game (tetris on billiard board). Hipmunk in action.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clientsession" = callPackage
@@ -49138,7 +48318,6 @@ self: {
        homepage = "http://github.com/spacekitteh/haskell-clifford";
        description = "A Clifford algebra library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clippard" = callPackage
@@ -49164,7 +48343,6 @@ self: {
        homepage = "https://github.com/chetant/clipper";
        description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clippings" = callPackage
@@ -49189,7 +48367,6 @@ self: {
        ];
        description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clist" = callPackage
@@ -49288,7 +48465,6 @@ self: {
        homepage = "http://patch-tag.com/r/shahn/clocked/home";
        description = "timer functionality to clock IO commands";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {QtCore = null;};
 
   "clogparse" = callPackage
@@ -49305,7 +48481,6 @@ self: {
        ];
        description = "Parse IRC logs such as the #haskell logs on tunes.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clone-all" = callPackage
@@ -49327,7 +48502,6 @@ self: {
        homepage = "https://github.com/silky/clone-all";
        description = "Clone all github repositories from a given user";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "closure" = callPackage
@@ -49366,7 +48540,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/cloud-haskell";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cloudfront-signer" = callPackage
@@ -49384,7 +48557,6 @@ self: {
        homepage = "http://github.com/cdornan/cloudfront-signer";
        description = "CloudFront URL signer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cloudyfs" = callPackage
@@ -49405,7 +48577,6 @@ self: {
        homepage = "https://github.com/bhickey/cloudyfs";
        description = "A cloud in the file system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cltw" = callPackage
@@ -49438,7 +48609,6 @@ self: {
        homepage = "http://zwizwa.be/-/meta";
        description = "C to Lua data wrapper generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clumpiness" = callPackage
@@ -49462,7 +48632,6 @@ self: {
        homepage = "https://github.com/Kinokkory/cluss";
        description = "simple alternative to type classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clustering" = callPackage
@@ -49503,7 +48672,6 @@ self: {
        homepage = "http://malde.org/~ketil/";
        description = "Tools for manipulating sequence clusters";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clutterhs" = callPackage
@@ -49521,7 +48689,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) clutter; inherit (pkgs.gnome) pango;};
 
   "cmaes" = callPackage
@@ -49592,7 +48759,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/cmath";
        description = "A binding to the standard C math library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmathml3" = callPackage
@@ -49612,7 +48778,6 @@ self: {
        executableHaskellDepends = [ base Cabal filepath ];
        description = "Data model, parser, serialiser and transformations for Content MathML 3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmd-item" = callPackage
@@ -49708,7 +48873,6 @@ self: {
        homepage = "http://community.haskell.org/~ndm/cmdargs/";
        description = "Helper to enter cmdargs command lines using a web browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmdlib" = callPackage
@@ -49745,7 +48909,6 @@ self: {
        homepage = "http://github.com/eli-frey/cmdtheline";
        description = "Declarative command-line option parsing and documentation library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cml" = callPackage
@@ -49769,7 +48932,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "A library for C-like programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmu" = callPackage
@@ -49805,7 +48967,6 @@ self: {
        homepage = "http://software.intel.com/en-us/articles/intel-concurrent-collections-for-cc/";
        description = "Compiler/Translator for CnC Specification Files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cndict" = callPackage
@@ -49877,7 +49038,6 @@ self: {
        ];
        description = "Cross-platform structure serialisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codec-mbox" = callPackage
@@ -49910,9 +49070,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/codecov-haskell";
-       description = "Codecov.io support for Haskell";
+       description = "Codecov.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codemonitor" = callPackage
@@ -49932,7 +49091,6 @@ self: {
        homepage = "http://github.com/rickardlindberg/codemonitor";
        description = "Tool that automatically runs arbitrary commands when files change on disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codepad" = callPackage
@@ -49946,9 +49104,8 @@ self: {
        libraryHaskellDepends = [ base curl mtl network tagsoup ];
        jailbreak = true;
        homepage = "http://github.com/chrisdone/codepad";
-       description = "Submit and retrieve paste output from CodePad.org";
+       description = "Submit and retrieve paste output from CodePad.org.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codex_0_3_0_8" = callPackage
@@ -50110,9 +49267,8 @@ self: {
          transformers
        ];
        homepage = "https://github.com/Cognimeta/cognimeta-utils";
-       description = "Utilities for Cognimeta products (such as perdure). API may change often";
+       description = "Utilities for Cognimeta products (such as perdure). API may change often.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coinbase-exchange" = callPackage
@@ -50152,7 +49308,6 @@ self: {
        jailbreak = true;
        description = "Connector library for the coinbase exchange";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colada" = callPackage
@@ -50178,7 +49333,6 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/colada";
        description = "Colada implements incremental word class class induction using online LDA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colchis" = callPackage
@@ -50195,7 +49349,7 @@ self: {
          pipes-attoparsec pipes-network text transformers
        ];
        jailbreak = true;
-       description = "Rudimentary JSON-RPC 2.0 client over raw TCP";
+       description = "Rudimentary JSON-RPC 2.0 client over raw TCP.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -50215,7 +49369,6 @@ self: {
        jailbreak = true;
        description = "Generate animated 3d objects in COLLADA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collada-types" = callPackage
@@ -50232,7 +49385,6 @@ self: {
        jailbreak = true;
        description = "Data exchange between graphic applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collapse-util" = callPackage
@@ -50275,7 +49427,6 @@ self: {
        jailbreak = true;
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collections-api" = callPackage
@@ -50288,7 +49439,6 @@ self: {
        homepage = "http://code.haskell.org/collections/";
        description = "API for collection data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collections-base-instances" = callPackage
@@ -50305,7 +49455,6 @@ self: {
        homepage = "http://code.haskell.org/collections/";
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colock" = callPackage
@@ -50376,7 +49525,6 @@ self: {
        homepage = "https://github.com/wellecks/coltrane";
        description = "A jazzy, minimal web framework for Haskell, inspired by Sinatra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "com" = callPackage
@@ -50388,7 +49536,6 @@ self: {
        doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinat" = callPackage
@@ -50409,7 +49556,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinat-diagrams" = callPackage
@@ -50427,7 +49573,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Graphical representations for various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinator-interactive" = callPackage
@@ -50451,7 +49596,6 @@ self: {
        homepage = "https://github.com/fumieval/combinator-interactive";
        description = "SKI Combinator interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinatorial-problems" = callPackage
@@ -50468,7 +49612,6 @@ self: {
        homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellCombinatorialProblems";
        description = "A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinatorics" = callPackage
@@ -50567,7 +49710,6 @@ self: {
        jailbreak = true;
        description = "Library for working with commoditized amounts and price histories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "commsec" = callPackage
@@ -50583,7 +49725,6 @@ self: {
        ];
        description = "Provide communications security using symmetric ephemeral keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "commsec-keyexchange" = callPackage
@@ -50603,7 +49744,6 @@ self: {
        homepage = "https://github.com/TomMD/commsec-keyExchange";
        description = "Key agreement for commsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "commutative" = callPackage
@@ -50782,7 +49922,6 @@ self: {
        homepage = "http://github.com/ekmett/comonad-extras/";
        description = "Exotic comonad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comonad-random" = callPackage
@@ -50795,7 +49934,6 @@ self: {
        jailbreak = true;
        description = "Comonadic interface for random values";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comonad-transformers" = callPackage
@@ -50837,7 +49975,6 @@ self: {
        ];
        description = "Compact Data.Map implementation using Data.Binary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compact-socket" = callPackage
@@ -50868,7 +50005,6 @@ self: {
        homepage = "http://twan.home.fmf.nl/compact-string/";
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compact-string-fix" = callPackage
@@ -51087,7 +50223,6 @@ self: {
        libraryHaskellDepends = [ base MissingH ];
        description = "Haskell functionality for quickly assembling simple compilers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "complex-generic" = callPackage
@@ -51129,7 +50264,6 @@ self: {
        jailbreak = true;
        description = "Empirical algorithmic complexity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compose-ltr" = callPackage
@@ -51143,7 +50277,6 @@ self: {
        jailbreak = true;
        description = "More intuitive, left-to-right function composition";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compose-trans" = callPackage
@@ -51155,7 +50288,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Composable monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composition_1_0_1_0" = callPackage
@@ -51268,7 +50400,6 @@ self: {
        homepage = "http://urchin.earth.li/~ian/cabal/compression/";
        description = "Common compression algorithms";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compstrat" = callPackage
@@ -51285,7 +50416,6 @@ self: {
        jailbreak = true;
        description = "Strategy combinators for compositional data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comptrans" = callPackage
@@ -51304,7 +50434,6 @@ self: {
        homepage = "https://github.com/jkoppel/comptrans";
        description = "Automatically converting ASTs into compositional data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "computational-algebra" = callPackage
@@ -51324,7 +50453,6 @@ self: {
        homepage = "https://github.com/konn/computational-algebra";
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "computations" = callPackage
@@ -51399,7 +50527,6 @@ self: {
        homepage = "http://zil.ipipan.waw.pl/Concraft";
        description = "Morphological disambiguation based on constrained CRFs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concraft-hr" = callPackage
@@ -51422,7 +50549,6 @@ self: {
        homepage = "https://github.com/vjeranc/concraft-hr";
        description = "Part-of-speech tagger for Croatian";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concraft-pl" = callPackage
@@ -51445,7 +50571,6 @@ self: {
        homepage = "http://zil.ipipan.waw.pl/Concraft";
        description = "Morphological tagger for Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concrete-relaxng-parser" = callPackage
@@ -51484,7 +50609,6 @@ self: {
        jailbreak = true;
        description = "Binary and Hashable instances for TypeRep";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-barrier" = callPackage
@@ -51659,7 +50783,6 @@ self: {
        homepage = "https://github.com/joelteon/concurrent-state";
        description = "MTL-like library using TVars";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-supply_0_1_7" = callPackage
@@ -51760,7 +50883,6 @@ self: {
        homepage = "https://github.com/klangner/Condor";
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "condorcet" = callPackage
@@ -51773,7 +50895,6 @@ self: {
        homepage = "http://neugierig.org/software/darcs/condorcet";
        description = "Library for Condorcet voting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conductive-base" = callPackage
@@ -51816,7 +50937,6 @@ self: {
        homepage = "http://www.renickbell.net/doku.php?id=conductive-hsc3";
        description = "a library with examples of using Conductive with hsc3";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conductive-song" = callPackage
@@ -52068,7 +51188,6 @@ self: {
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the LAME MP3 library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mp3lame = null;};
 
   "conduit-audio-samplerate" = callPackage
@@ -52087,7 +51206,6 @@ self: {
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {samplerate = null;};
 
   "conduit-audio-sndfile" = callPackage
@@ -52297,7 +51415,7 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        homepage = "https://github.com/sdroege/conduit-connection";
-       description = "Conduit source and sink for Network.Connection";
+       description = "Conduit source and sink for Network.Connection.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -52685,7 +51803,6 @@ self: {
        ];
        description = "A base layer for network protocols using Conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-parse" = callPackage
@@ -52724,7 +51841,6 @@ self: {
        homepage = "http://github.com/A1kmm/conduit-resumablesink";
        description = "Allows conduit to resume sinks to feed multiple sources into it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-tokenize-attoparsec" = callPackage
@@ -52777,7 +51893,6 @@ self: {
        ];
        description = "A small program for swapping out dot files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "config-value" = callPackage
@@ -52971,7 +52086,6 @@ self: {
        ];
        description = "A BitTorrent client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conlogger" = callPackage
@@ -53086,7 +52200,6 @@ self: {
        testHaskellDepends = [ base lifted-async transformers ];
        description = "Eventually consistent STM transactions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "console-program" = callPackage
@@ -53117,7 +52230,6 @@ self: {
        homepage = "https://github.com/kfish/const-math-ghc-plugin";
        description = "Compiler plugin for constant math elimination";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constrained-categories" = callPackage
@@ -53251,7 +52363,6 @@ self: {
        homepage = "http://andersk.mit.edu/haskell/constructible/";
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constructive-algebra" = callPackage
@@ -53264,7 +52375,6 @@ self: {
        jailbreak = true;
        description = "A library of constructive algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "consul-haskell_0_1" = callPackage
@@ -53355,7 +52465,6 @@ self: {
        homepage = "https://github.com/scrive/consumers";
        description = "Concurrent PostgreSQL data consumers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "container" = callPackage
@@ -53501,7 +52610,6 @@ self: {
        homepage = "http://github.com/thinkpad20/context-stack";
        description = "An abstraction of a stack and stack-based monadic context";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "continue" = callPackage
@@ -53519,7 +52627,6 @@ self: {
        jailbreak = true;
        description = "Monads with suspension and arbitrary-spot reentry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "continued-fractions" = callPackage
@@ -53556,7 +52663,6 @@ self: {
        ];
        executableSystemDepends = [ hyperleveldb ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {hyperleveldb = null;};
 
   "continuum-client" = callPackage
@@ -53786,7 +52892,6 @@ self: {
        libraryHaskellDepends = [ base containers stm time ];
        description = "Event scheduling system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-attempt" = callPackage
@@ -53800,7 +52905,6 @@ self: {
        homepage = "http://github.com/snoyberg/control-monad-attempt";
        description = "Monad transformer for attempt. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-exception" = callPackage
@@ -53876,7 +52980,6 @@ self: {
        homepage = "http://github.com/pepeiborra/control-monad-failure";
        description = "A class for monads which can fail with an error. (deprecated)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-failure-mtl" = callPackage
@@ -53890,7 +52993,6 @@ self: {
        homepage = "http://github.com/pepeiborra/control-monad-failure";
        description = "A class for monads which can fail with an error for mtl 1 (deprecated)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-free_0_5_3" = callPackage
@@ -53987,7 +53089,6 @@ self: {
        libraryHaskellDepends = [ base contstuff monads-tf ];
        description = "ContStuff instances for monads-tf transformers (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "contstuff-transformers" = callPackage
@@ -54000,7 +53101,6 @@ self: {
        jailbreak = true;
        description = "Deprecated interface between contstuff 0.7.0 and the transformers package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "converge" = callPackage
@@ -54083,7 +53183,7 @@ self: {
          template-haskell text time
        ];
        homepage = "https://github.com/wdanilo/convert";
-       description = "Safe and unsafe data conversion utilities with strong type-level operation. checking";
+       description = "Safe and unsafe data conversion utilities with strong type-level operation. checking.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -54142,7 +53242,6 @@ self: {
        homepage = "https://github.com/phonohawk/convertible-ascii";
        description = "convertible instances for ascii";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "convertible-text" = callPackage
@@ -54163,7 +53262,6 @@ self: {
        homepage = "http://github.com/snoyberg/convertible/tree/text";
        description = "Typeclasses and instances for converting between types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cookbook" = callPackage
@@ -54290,7 +53388,6 @@ self: {
        homepage = "http://leepike.github.com/Copilot/";
        description = "A stream DSL for writing embedded C programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-c99" = callPackage
@@ -54329,7 +53426,6 @@ self: {
        ];
        description = "Copilot interface to a C model-checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-core" = callPackage
@@ -54394,7 +53490,6 @@ self: {
        ];
        description = "A compiler for CoPilot targeting SBV";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-theorem" = callPackage
@@ -54444,7 +53539,6 @@ self: {
        libraryHaskellDepends = [ base bytestring parsec pretty ];
        description = "External core parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "core-haskell" = callPackage
@@ -54461,7 +53555,6 @@ self: {
        homepage = "https://github.com/happlebao/Core-Haskell";
        description = "A subset of Haskell using in UCC for teaching purpose";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "corebot-bliki" = callPackage
@@ -54486,9 +53579,8 @@ self: {
          yesod
        ];
        homepage = "http://github.com/coreyoconnor/corebot-bliki";
-       description = "A bliki written using yesod. Uses pandoc to process files stored in git";
+       description = "A bliki written using yesod. Uses pandoc to process files stored in git.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coroutine-enumerator" = callPackage
@@ -54515,7 +53607,6 @@ self: {
        homepage = "http://trac.haskell.org/SCC/wiki/coroutine-iteratee";
        description = "Bridge between the monad-coroutine and iteratee packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coroutine-object" = callPackage
@@ -54546,7 +53637,6 @@ self: {
        jailbreak = true;
        description = "A CouchDB view server for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "couch-simple" = callPackage
@@ -54574,7 +53664,6 @@ self: {
        homepage = "https://github.com/mdorman/couch-simple";
        description = "A modern, lightweight, complete client for CouchDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) couchdb;};
 
   "couchdb-conduit" = callPackage
@@ -54606,7 +53695,6 @@ self: {
        homepage = "https://github.com/akaspin/couchdb-conduit";
        description = "Couch DB client library using http-conduit and aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "couchdb-enumerator" = callPackage
@@ -54636,7 +53724,6 @@ self: {
        homepage = "http://bitbucket.org/wuzzeb/couchdb-enumerator";
        description = "Couch DB client library using http-enumerator and aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "count" = callPackage
@@ -54803,7 +53890,6 @@ self: {
        homepage = "http://hub.darcs.net/thoferon/court";
        description = "Simple and flexible CI system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coverage" = callPackage
@@ -54818,7 +53904,6 @@ self: {
        homepage = "https://github.com/nicodelpiano/coverage";
        description = "Exhaustivity Checking Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cpio-conduit" = callPackage
@@ -54839,7 +53924,6 @@ self: {
        homepage = "http://github.com/da-x/cpio-conduit";
        description = "Conduit-based CPIO";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cplusplus-th" = callPackage
@@ -54858,7 +53942,6 @@ self: {
        homepage = "https://github.com/nicta/cplusplus-th";
        description = "C++ Foreign Import Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cpphs_1_18_6" = callPackage
@@ -55098,7 +54181,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/cpuperf";
        description = "Modify the cpu frequency on OpenBSD systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cpython" = callPackage
@@ -55113,7 +54195,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-python/";
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {python34 = null;};
 
   "cql_3_0_5" = callPackage
@@ -55319,7 +54400,6 @@ self: {
        jailbreak = true;
        description = "PostgreSQL backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cqrs-sqlite3" = callPackage
@@ -55341,7 +54421,6 @@ self: {
        jailbreak = true;
        description = "SQLite3 backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cqrs-test" = callPackage
@@ -55359,7 +54438,6 @@ self: {
        jailbreak = true;
        description = "Command-Query Responsibility Segregation Test Support";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cqrs-testkit" = callPackage
@@ -55387,7 +54465,7 @@ self: {
        sha256 = "68ec6f54afe655e764691f30c844778913957ad9f617e3f5587032307629276e";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
-       description = "Command-Query Responsibility Segregation. Modules for the basic types";
+       description = "Command-Query Responsibility Segregation. Modules for the basic types.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -55407,7 +54485,6 @@ self: {
        homepage = "https://github.com/scvalex/cr";
        description = "Code review tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crack" = callPackage
@@ -55420,7 +54497,6 @@ self: {
        librarySystemDepends = [ crack ];
        description = "A haskell binding to cracklib";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {crack = null;};
 
   "crackNum_1_3" = callPackage
@@ -55465,7 +54541,6 @@ self: {
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "2D graphics library with integrated TikZ output";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "craftwerk-cairo" = callPackage
@@ -55479,7 +54554,6 @@ self: {
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "Cairo backend for Craftwerk";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "craftwerk-gtk" = callPackage
@@ -55499,7 +54573,6 @@ self: {
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "Gtk UI for Craftwerk";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crc16" = callPackage
@@ -55511,7 +54584,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Calculate the crc16-ccitt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crc16-table" = callPackage
@@ -55571,7 +54643,6 @@ self: {
        homepage = "https://github.com/kawu/crf-chain1";
        description = "First-order, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crf-chain1-constrained" = callPackage
@@ -55590,7 +54661,6 @@ self: {
        homepage = "https://github.com/kawu/crf-chain1-constrained";
        description = "First-order, constrained, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crf-chain2-generic" = callPackage
@@ -55610,7 +54680,6 @@ self: {
        homepage = "https://github.com/kawu/crf-chain2-generic";
        description = "Second-order, generic, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crf-chain2-tiers" = callPackage
@@ -55629,7 +54698,6 @@ self: {
        homepage = "https://github.com/kawu/crf-chain2-tiers";
        description = "Second-order, tiered, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "critbit" = callPackage
@@ -55696,6 +54764,8 @@ self: {
        pname = "criterion";
        version = "1.1.0.0";
        sha256 = "5cedd41bb6e5a85e65b51fdb00cb32038b826b8d18af072a8319cab43a452d38";
+       revision = "1";
+       editedCabalFile = "4de7233df470abf00ce1db761e7f46db68dd7855cc491d49584de149e922f5db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55714,6 +54784,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "criterion_1_1_1_0" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring
+     , cassava, containers, deepseq, directory, filepath, Glob, hastache
+     , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck
+     , statistics, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , transformers-compat, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "criterion";
+       version = "1.1.1.0";
+       sha256 = "e71855a7a9cd946044b2137f31603e0578f6e517a2ed667a2b479990cc0949dd";
+       revision = "1";
+       editedCabalFile = "a56744ffa937e244ac18d8257f4746a1e2b31fbce69e9602033f7f4f2ebcd7c6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint base binary bytestring cassava containers
+         deepseq directory filepath Glob hastache mtl mwc-random
+         optparse-applicative parsec statistics text time transformers
+         transformers-compat vector vector-algorithms
+       ];
+       executableHaskellDepends = [ base optparse-applicative ];
+       testHaskellDepends = [
+         base bytestring HUnit QuickCheck statistics test-framework
+         test-framework-hunit test-framework-quickcheck2 vector
+       ];
+       homepage = "http://www.serpentine.com/criterion";
+       description = "Robust, reliable performance measurement and analysis";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "criterion-plus" = callPackage
     ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th
      , monad-control, mtl, optparse-applicative, placeholders
@@ -55741,7 +54844,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/criterion-plus";
        description = "Enhancement of the \"criterion\" benchmarking library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "criterion-to-html" = callPackage
@@ -55791,7 +54893,6 @@ self: {
        homepage = "https://github.com/TomHammersley/HaskellRenderer/";
        description = "An offline renderer supporting ray tracing and photon mapping";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cron_0_3_0" = callPackage
@@ -55859,7 +54960,6 @@ self: {
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cruncher-types" = callPackage
@@ -55873,7 +54973,6 @@ self: {
        homepage = "http://github.com/eval-so/cruncher-types";
        description = "Request and Response types for Eval.so's API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crunghc" = callPackage
@@ -55893,7 +54992,6 @@ self: {
        jailbreak = true;
        description = "A runghc replacement with transparent caching";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-api" = callPackage
@@ -55946,7 +55044,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Generic cryptography cipher benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-cipher-tests" = callPackage
@@ -56665,7 +55762,6 @@ self: {
        jailbreak = true;
        description = "Bindings for Cryptsy cryptocurrency exchange API";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crystalfontz" = callPackage
@@ -56677,7 +55773,6 @@ self: {
        libraryHaskellDepends = [ base crc16-table MaybeT serialport ];
        description = "Control Crystalfontz LCD displays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cse-ghc-plugin" = callPackage
@@ -56690,7 +55785,6 @@ self: {
        homepage = "http://thoughtpolice.github.com/cse-ghc-plugin";
        description = "Compiler plugin for common subexpression elimination";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-catalog" = callPackage
@@ -56707,7 +55801,6 @@ self: {
        homepage = "https://github.com/anton-k/csound-catalog";
        description = "a gallery of Csound instruments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-expression" = callPackage
@@ -56805,7 +55898,6 @@ self: {
        testHaskellDepends = [ base nondeterminism tasty tasty-hunit ];
        description = "Discrete constraint satisfaction problem (CSP) solver";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cspmchecker" = callPackage
@@ -56823,7 +55915,6 @@ self: {
        homepage = "https://github.com/tomgr/libcspm";
        description = "A command line type checker for CSPM files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "css" = callPackage
@@ -56835,7 +55926,6 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        description = "Minimal monadic CSS DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "css-syntax" = callPackage
@@ -57011,7 +56101,6 @@ self: {
        homepage = "http://darcs.imperialviolet.org/ctemplate";
        description = "Binding to the Google ctemplate library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ctemplate = null;};
 
   "ctkl" = callPackage
@@ -57024,7 +56113,6 @@ self: {
        jailbreak = true;
        description = "packaging of Manuel Chakravarty's CTK Light for Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ctpl" = callPackage
@@ -57037,7 +56125,6 @@ self: {
        jailbreak = true;
        description = "A programming language for text modification";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ctrie" = callPackage
@@ -57095,7 +56182,6 @@ self: {
        homepage = "https://github.com/simhu/cubical";
        description = "Implementation of Univalence in Cubical Sets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cubicbezier" = callPackage
@@ -57114,7 +56200,6 @@ self: {
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Efficient manipulating of 2D cubic bezier curves";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cubicspline_0_1_1" = callPackage
@@ -57174,7 +56259,6 @@ self: {
        executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "cuda" = callPackage
@@ -57210,7 +56294,6 @@ self: {
        homepage = "https://github.com/adamwalker/haskell_cudd";
        description = "Bindings to the CUDD binary decision diagrams library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cudd = null; dddmp = null; epd = null; inherit (pkgs) mtr; 
          inherit (pkgs) st; util = null;};
 
@@ -57308,7 +56391,6 @@ self: {
        homepage = "http://www.curry-language.org";
        description = "Functions for manipulating Curry programs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "curry-frontend" = callPackage
@@ -57328,7 +56410,6 @@ self: {
        homepage = "http://www.curry-language.org";
        description = "Compile the functional logic language Curry to several intermediate formats";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cursedcsv" = callPackage
@@ -57414,7 +56495,6 @@ self: {
        ];
        description = "Functional Combinators for Computer Vision";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "cyclotomic" = callPackage
@@ -57426,7 +56506,6 @@ self: {
        libraryHaskellDepends = [ arithmoi base containers ];
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "cypher" = callPackage
@@ -57447,7 +56526,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for the neo4j \"cypher\" query language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "d-bus" = callPackage
@@ -57528,7 +56606,6 @@ self: {
        homepage = "https://github.com/scvalex/daemons";
        description = "Daemons in Haskell made fun and easy";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "dag" = callPackage
@@ -57593,7 +56670,6 @@ self: {
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dapi" = callPackage
@@ -57614,7 +56690,6 @@ self: {
        homepage = "http://massysett.github.com/dapi";
        description = "Prints a series of dates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs_2_10_2" = callPackage
@@ -57731,7 +56806,6 @@ self: {
        homepage = "http://wiki.darcs.net/Development/Benchmarks";
        description = "Comparative benchmark suite for darcs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs-beta" = callPackage
@@ -57765,7 +56839,6 @@ self: {
        homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) curl;};
 
   "darcs-buildpackage" = callPackage
@@ -57784,7 +56857,6 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Darcs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs-cabalized" = callPackage
@@ -57806,7 +56878,6 @@ self: {
        homepage = "http://darcs.net/";
        description = "David's Advanced Version Control System";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) curl; inherit (pkgs) ncurses; 
          inherit (pkgs) zlib;};
 
@@ -57828,7 +56899,6 @@ self: {
        jailbreak = true;
        description = "Import/export git fast-import streams to/from darcs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs-graph" = callPackage
@@ -57848,7 +56918,6 @@ self: {
        jailbreak = true;
        description = "Generate graphs of darcs repository activity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs-monitor" = callPackage
@@ -57867,7 +56936,6 @@ self: {
        homepage = "http://wiki.darcs.net/RelatedSoftware/DarcsMonitor";
        description = "Darcs repository monitor (sends email)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs-scripts" = callPackage
@@ -57898,7 +56966,6 @@ self: {
        jailbreak = true;
        description = "Outputs dependencies of darcs patches in dot format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcsden" = callPackage
@@ -57926,9 +56993,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://hackage.haskell.org/package/darcsden";
-       description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch)";
+       description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch).";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcswatch" = callPackage
@@ -57951,7 +57017,6 @@ self: {
        homepage = "http://darcswatch.nomeata.de/";
        description = "Track application of Darcs patches";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darkplaces-demo" = callPackage
@@ -57978,7 +57043,6 @@ self: {
        homepage = "https://github.com/bacher09/darkplaces-demo";
        description = "Utility and parser for DarkPlaces demo files";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darkplaces-rcon" = callPackage
@@ -58320,7 +57384,6 @@ self: {
        ];
        description = "a cyclic doubly linked list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-default" = callPackage
@@ -58543,7 +57606,6 @@ self: {
        homepage = "http://monoid.at/code";
        description = "Space-efficient and privacy-preserving data dispersal algorithms";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-dword" = callPackage
@@ -58581,7 +57643,6 @@ self: {
        homepage = "https://github.com/jcristovao/data-easy";
        description = "Consistent set of utility functions for Maybe, Either, List and Monoids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-embed" = callPackage
@@ -58822,7 +57883,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Write-once variables with concurrency support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-json-token" = callPackage
@@ -58866,7 +57926,7 @@ self: {
        sha256 = "3c11be8dc0da7f4cb080023e2d0ae9f58ad202e193c6f1aea015b7b7873a936d";
        libraryHaskellDepends = [ base convert data-construction lens ];
        homepage = "https://github.com/wdanilo/layer";
-       description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead";
+       description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -58878,7 +57938,7 @@ self: {
        sha256 = "a5070520bcb6c3d8e7dcc969d94ac35c8bc5894abf45b65155b58571f82619f1";
        libraryHaskellDepends = [ base bytestring vector ];
        homepage = "http://github.com/jystic/data-layout";
-       description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\"";
+       description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\".";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -58924,7 +57984,6 @@ self: {
        homepage = "https://github.com/dag/data-lens-ixset";
        description = "A Lens for IxSet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-lens-light" = callPackage
@@ -58998,7 +58057,6 @@ self: {
        homepage = "https://github.com/kawu/data-named";
        description = "Data types for named entities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-nat" = callPackage
@@ -59012,7 +58070,6 @@ self: {
        homepage = "http://github.com/glehel/data-nat";
        description = "data Nat = Zero | Succ Nat";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-object" = callPackage
@@ -59044,7 +58101,6 @@ self: {
        homepage = "http://github.com/snoyberg/data-object-json/tree/master";
        description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-object-yaml" = callPackage
@@ -59065,7 +58121,6 @@ self: {
        homepage = "http://github.com/snoyberg/data-object-yaml";
        description = "Serialize data to and from Yaml files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-or" = callPackage
@@ -59123,7 +58178,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Reference cells that need two independent indices to be accessed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-r-tree" = callPackage
@@ -59199,7 +58253,7 @@ self: {
        version = "0.0.3";
        sha256 = "59186a2290a630d53fb2d796d9cca1260dbd70fa414814778e1cab0aeeba4e6e";
        libraryHaskellDepends = [ base containers data-reify ];
-       description = "Common Sub-Expression Elimination for graphs generated by Data.Reify";
+       description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -59249,7 +58303,6 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-mmap unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-rtuple" = callPackage
@@ -59260,7 +58313,7 @@ self: {
        sha256 = "4e2824b8d23d5eafce4c5f86a90fb58d97f461b45a287006f37cf8f2bd09fb05";
        libraryHaskellDepends = [ base lens typelevel ];
        homepage = "https://github.com/wdanilo/rtuple";
-       description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes";
+       description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -59286,7 +58339,7 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        jailbreak = true;
        homepage = "http://code.haskell.org/data-spacepart";
-       description = "Deprecated. Now called \"spacepart\". Space partitioning data structures";
+       description = "Deprecated. Now called \"spacepart\". Space partitioning data structures.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -59310,7 +58363,6 @@ self: {
        homepage = "https://github.com/Palmik/data-store";
        description = "Type safe, in-memory dictionary with multidimensional keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-stringmap" = callPackage
@@ -59433,7 +58485,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Basic type wrangling types and classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-util" = callPackage
@@ -59505,9 +58556,8 @@ self: {
          monad-control network old-locale text time transformers-base
        ];
        homepage = "https://github.com/iand675/datadog";
-       description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming";
+       description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "dataenc" = callPackage
@@ -59575,7 +58625,6 @@ self: {
        jailbreak = true;
        description = "An implementation of datalog in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "datapacker" = callPackage
@@ -59674,7 +58723,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 time
        ];
        homepage = "http://github.com/stackbuilders/datetime";
-       description = "Utilities to make Data.Time.* easier to use";
+       description = "Utilities to make Data.Time.* easier to use.";
        license = "GPL";
      }) {};
 
@@ -59775,7 +58824,6 @@ self: {
        homepage = "http://devel.comunidadhaskell.org/dbjava/";
        description = "Decompiler Bytecode Java";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbmigrations_1_0" = callPackage
@@ -59929,7 +58977,6 @@ self: {
        homepage = "http://john-millikin.com/software/haskell-dbus/";
        description = "Monadic and object-oriented interfaces to DBus";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus-core" = callPackage
@@ -59949,7 +58996,6 @@ self: {
        homepage = "https://john-millikin.com/software/dbus-core/";
        description = "Low-level D-Bus protocol implementation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus-qq" = callPackage
@@ -59998,9 +59044,8 @@ self: {
          test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
-       description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package";
+       description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dclabel-eci11" = callPackage
@@ -60050,7 +59095,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler build framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-code" = callPackage
@@ -60081,7 +59125,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler core language and type checker";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-eval" = callPackage
@@ -60099,7 +59142,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler semantic evaluator for the core language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-flow" = callPackage
@@ -60118,7 +59160,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler data flow compiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-llvm" = callPackage
@@ -60137,7 +59178,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler LLVM code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-salt" = callPackage
@@ -60155,7 +59195,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler C code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-simpl" = callPackage
@@ -60173,7 +59212,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler code transformations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-tetra" = callPackage
@@ -60192,7 +59230,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler intermediate language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-driver" = callPackage
@@ -60215,7 +59252,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler top-level driver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-interface" = callPackage
@@ -60247,7 +59283,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler source language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-tools" = callPackage
@@ -60273,7 +59308,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler command line tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-war" = callPackage
@@ -60313,7 +59347,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciple Core language interactive interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dead-code-detection" = callPackage
@@ -60357,7 +59390,6 @@ self: {
        homepage = "http://hub.darcs.net/scravy/dead-simple-json";
        description = "Dead simple JSON parser, with some Template Haskell sugar";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "debian_3_87_2" = callPackage
@@ -60485,7 +59517,6 @@ self: {
        jailbreak = true;
        description = "The categorical dual of transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "declarative" = callPackage
@@ -60534,7 +59565,6 @@ self: {
        homepage = "https://github.com/hansonkd/decoder-conduit";
        description = "Conduit for decoding ByteStrings using Data.Binary.Get";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dedukti" = callPackage
@@ -60558,7 +59588,6 @@ self: {
        homepage = "http://www.lix.polytechnique.fr/dedukti";
        description = "A type-checker for the λΠ-modulo calculus";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deepcontrol" = callPackage
@@ -60605,7 +59634,6 @@ self: {
        homepage = "https://github.com/ajtulloch/deeplearning-hs";
        description = "Deep Learning in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deepseq_1_3_0_1" = callPackage
@@ -60660,7 +59688,6 @@ self: {
        homepage = "http://fremissant.net/deepseq-bounded";
        description = "Bounded deepseq, including support for generic deriving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deepseq-generics_0_1_1_1" = callPackage
@@ -60742,7 +59769,6 @@ self: {
        jailbreak = true;
        description = "Template Haskell based deriver for optimised NFData instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deepzoom" = callPackage
@@ -60754,7 +59780,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsmagick ];
        description = "A DeepZoom image slicer. Only known to work on 32bit Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "defargs" = callPackage
@@ -60767,7 +59792,6 @@ self: {
        homepage = "https://github.com/Kinokkory/defargs";
        description = "default arguments in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-base" = callPackage
@@ -60786,7 +59810,6 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "The base modules of the Definitive framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-filesystem" = callPackage
@@ -60809,7 +59832,6 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A library that enable you to interact with the filesystem in a definitive way";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-graphics" = callPackage
@@ -60834,7 +59856,6 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A definitive package allowing you to open windows, read image files and render text to be displayed or saved";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-parser" = callPackage
@@ -60854,7 +59875,6 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A parser combinator library for the Definitive framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-reactive" = callPackage
@@ -60875,7 +59895,6 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A simple Reactive library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-sound" = callPackage
@@ -60897,7 +59916,6 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A definitive package to handle sound and play it back";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deiko-config" = callPackage
@@ -60946,7 +59964,6 @@ self: {
        homepage = "https://github.com/massysett/deka";
        description = "Decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mpdec = null;};
 
   "deka-tests" = callPackage
@@ -60969,7 +59986,6 @@ self: {
        homepage = "https://github.com/massysett/deka";
        description = "Tests for deka, decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "delaunay" = callPackage
@@ -61002,7 +60018,6 @@ self: {
        homepage = "https://github.com/sof/delicious";
        description = "Accessing the del.icio.us APIs from Haskell (v2)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "delimited-text" = callPackage
@@ -61055,7 +60070,6 @@ self: {
        homepage = "https://github.com/kryoxide/delta";
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "delta-h" = callPackage
@@ -61077,7 +60091,6 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/delta-h";
        description = "Online entropy-based model of lexical category acquisition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "demarcate" = callPackage
@@ -61091,7 +60104,6 @@ self: {
        homepage = "https://github.com/fizruk/demarcate";
        description = "Demarcating transformed monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "denominate" = callPackage
@@ -61108,7 +60120,6 @@ self: {
        homepage = "http://protempore.net/denominate/";
        description = "Functions supporting bulk file and directory name normalization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dependent-map_0_1_1_3" = callPackage
@@ -61145,7 +60156,7 @@ self: {
        sha256 = "093aa20845a345c1d44e3d0258eadd6f8c38e3596cd6486be64879d0b60e7467";
        libraryHaskellDepends = [ base lens mtl prologue ];
        homepage = "https://github.com/wdanilo/dependent-state";
-       description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types";
+       description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -61208,7 +60219,6 @@ self: {
        ];
        description = "A simple configuration management tool for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dephd" = callPackage
@@ -61227,7 +60237,6 @@ self: {
        homepage = "http://malde.org/~ketil/biohaskell/dephd";
        description = "Analyze quality of nucleotide sequences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dequeue" = callPackage
@@ -61242,7 +60251,6 @@ self: {
        testHaskellDepends = [ base Cabal cabal-test-quickcheck ];
        description = "A typeclass and an implementation for double-ended queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derangement" = callPackage
@@ -61254,7 +60262,6 @@ self: {
        libraryHaskellDepends = [ base fgl ];
        description = "Find derangements of lists";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derivation-trees" = callPackage
@@ -61269,7 +60276,6 @@ self: {
        jailbreak = true;
        description = "Typeset Derivation Trees via MetaPost";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive_2_5_18" = callPackage
@@ -61413,7 +60419,6 @@ self: {
        homepage = "http://github.com/konn/derive-IG";
        description = "Macro to derive instances for Instant-Generics using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-enumerable" = callPackage
@@ -61449,7 +60454,6 @@ self: {
        jailbreak = true;
        description = "Instance deriving for (a subset of) GADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-monoid" = callPackage
@@ -61482,7 +60486,6 @@ self: {
        homepage = "https://github.com/HaskellZhangSong/derive-topdown";
        description = "This library will help you generate Haskell empty Generic instances and deriving type instances from the top automatically to the bottom for composited data types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-trie" = callPackage
@@ -61496,7 +60499,6 @@ self: {
        homepage = "http://github.com/baldo/derive-trie";
        description = "Automatic derivation of Trie implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deriving-compat" = callPackage
@@ -61539,7 +60541,6 @@ self: {
        homepage = "http://darcsden.com/kyagrd/derp-lib";
        description = "combinators based on parsing with derivatives (derp) package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "descrilo" = callPackage
@@ -61689,7 +60690,6 @@ self: {
        homepage = "https://github.com/luanzhu/devil";
        description = "A small tool to make it easier to update program managed by Angel";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "dewdrop" = callPackage
@@ -61704,7 +60704,6 @@ self: {
        homepage = "https://github.com/kmcallister/dewdrop";
        description = "Find gadgets for return-oriented programming on x86";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dfrac" = callPackage
@@ -61735,7 +60734,6 @@ self: {
        ];
        description = "Build Debian From Scratch CD/DVD images";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dgim" = callPackage
@@ -61750,7 +60748,6 @@ self: {
        homepage = "https://github.com/musically-ut/haskell-dgim";
        description = "Implementation of DGIM algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dgs" = callPackage
@@ -61764,7 +60761,6 @@ self: {
        homepage = "http://www.dmwit.com/dgs";
        description = "Haskell front-end for DGS' bot interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dia-base" = callPackage
@@ -62246,7 +61242,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-contrib_1_1_2_4" = callPackage
@@ -62856,7 +61851,6 @@ self: {
        homepage = "https://github.com/marcinmrotek/diagrams-hsqml";
        description = "HsQML (Qt5) backend for Diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-html5_1_3_0_2" = callPackage
@@ -63137,7 +62131,6 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "PDF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-pgf" = callPackage
@@ -63158,7 +62151,6 @@ self: {
        homepage = "http://github.com/cchalmers/diagrams-pgf";
        description = "PGF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-postscript_1_1_0_3" = callPackage
@@ -63692,7 +62684,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "TikZ backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dialog" = callPackage
@@ -63742,7 +62733,6 @@ self: {
        homepage = "http://monoid.at/code";
        description = "Cryptographically secure n-sided dice via rejection sampling";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dicom" = callPackage
@@ -63773,7 +62763,6 @@ self: {
        homepage = "http://github.com/mwotton/dictparser";
        description = "Parsec parsers for the DICT format produced by dictfmt -t";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diet" = callPackage
@@ -63861,7 +62850,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/diffcabal";
        description = "Diff two .cabal files syntactically";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diffdump" = callPackage
@@ -64229,7 +63217,6 @@ self: {
        homepage = "http://src.seereason.com/digestive-functors-hsp";
        description = "HSP support for digestive-functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-lucid" = callPackage
@@ -64415,7 +63402,6 @@ self: {
        jailbreak = true;
        description = "Dingo is a Rich Internet Application platform based on the Warp web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dingo-example" = callPackage
@@ -64436,7 +63422,6 @@ self: {
        jailbreak = true;
        description = "Dingo Example";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dingo-widgets" = callPackage
@@ -64456,7 +63441,6 @@ self: {
        jailbreak = true;
        description = "Dingo Widgets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diophantine" = callPackage
@@ -64470,7 +63454,6 @@ self: {
        homepage = "https://github.com/llllllllll/Math.Diophantine";
        description = "A quadratic diophantine equation solving library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diplomacy" = callPackage
@@ -64513,7 +63496,6 @@ self: {
        homepage = "https://github.com/avieth/diplomacy-server";
        description = "Play Diplomacy over HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-binary-files" = callPackage
@@ -64526,7 +63508,6 @@ self: {
        homepage = "http://ireneknapp.com/software/";
        description = "Serialization and deserialization monads for streams and ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-daemonize" = callPackage
@@ -64556,7 +63537,6 @@ self: {
        homepage = "http://dankna.com/software/";
        description = "Native implementation of the FastCGI protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-http" = callPackage
@@ -64577,7 +63557,6 @@ self: {
        homepage = "http://ireneknapp.com/software/";
        description = "Native webserver that acts as a library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-murmur-hash" = callPackage
@@ -64602,7 +63581,6 @@ self: {
        homepage = "http://dankna.com/software/";
        description = "Lightweight replacement for Plugins, specific to GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-sqlite_2_3_14" = callPackage
@@ -64618,7 +63596,7 @@ self: {
          base base16-bytestring bytestring directory HUnit text
        ];
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -64636,7 +63614,7 @@ self: {
          base base16-bytestring bytestring directory HUnit text
        ];
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -64655,7 +63633,7 @@ self: {
        ];
        doCheck = false;
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -64674,7 +63652,7 @@ self: {
        ];
        doCheck = false;
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -64693,7 +63671,6 @@ self: {
        jailbreak = true;
        description = "Finite directed cubical complexes and associated algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "directory_1_2_5_1" = callPackage
@@ -64774,7 +63751,6 @@ self: {
          unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dirstream" = callPackage
@@ -64828,7 +63804,6 @@ self: {
        homepage = "http://github.com/lightquake/discount";
        description = "Haskell bindings to the discount Markdown library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {markdown = null;};
 
   "discrete-space-map" = callPackage
@@ -64881,9 +63856,8 @@ self: {
          base containers HUnit mtl QuickCheck transformers
        ];
        homepage = "https://github.com/maxwellsayles/disjoint-set";
-       description = "Persistent disjoint-sets, a.k.a union-find";
+       description = "Persistent disjoint-sets, a.k.a union-find.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "disjoint-sets-st" = callPackage
@@ -64941,7 +63915,6 @@ self: {
        homepage = "https://github.com/tweag/distributed-closure";
        description = "Serializable closures for distributed programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process_0_5_2" = callPackage
@@ -65144,7 +64117,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process";
        description = "Microsoft Azure backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-client-server_0_1_2" = callPackage
@@ -65209,7 +64181,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-client-server";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-ekg" = callPackage
@@ -65296,7 +64267,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-execution";
        description = "Execution Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-extras_0_2_0" = callPackage
@@ -65459,7 +64429,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-platform";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-registry" = callPackage
@@ -65493,7 +64462,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-registry";
        description = "Cloud Haskell Extended Process Registry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-simplelocalnet_0_2_2_0" = callPackage
@@ -65627,7 +64595,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-supervisor";
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-task_0_1_1" = callPackage
@@ -65701,7 +64668,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-task";
        description = "Task Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-tests" = callPackage
@@ -65712,8 +64678,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-tests";
-       version = "0.4.4";
-       sha256 = "e53f39304100179bbd4e6944348578fe252940170f5ae20ab2ae1c63f8a69169";
+       version = "0.4.5";
+       sha256 = "16a4cb883f487b83837eb50600f504a57c5f89362bba895256d2e260107e76aa";
        libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
          distributed-static HUnit network network-transport random rematch
@@ -65723,7 +64689,7 @@ self: {
          base network network-transport network-transport-inmemory
          test-framework
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process-tests";
+       homepage = "http://github.com/haskell-distributed/distributed-process/tree/master/distributed-process-tests";
        description = "Tests and test support tools for distributed-process";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65755,7 +64721,6 @@ self: {
        homepage = "https://github.com/jeremyjh/distributed-process-zookeeper";
        description = "A Zookeeper back-end for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-static_0_3_1_0" = callPackage
@@ -65838,7 +64803,6 @@ self: {
        homepage = "https://github.com/redelmann/haskell-distribution";
        description = "Finite discrete probability distributions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distribution-plot" = callPackage
@@ -65855,9 +64819,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/redelmann/haskell-distribution-plot";
-       description = "Easily plot distributions from the distribution package.";
+       description = "Easily plot distributions from the distribution package..";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributive_0_4_4" = callPackage
@@ -66095,7 +65058,7 @@ self: {
        libraryHaskellDepends = [
          async base containers djinn-lib ghc mtl transformers
        ];
-       description = "Generate Haskell code from a type. Bridge from Djinn to GHC API";
+       description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -66111,7 +65074,7 @@ self: {
        libraryHaskellDepends = [
          async base containers djinn-lib ghc mtl transformers
        ];
-       description = "Generate Haskell code from a type. Bridge from Djinn to GHC API";
+       description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -66123,7 +65086,7 @@ self: {
        sha256 = "c0fe10b7aa5cb39f828e933925fc5bbf86c290bb7661021e4d9250ae8ed01011";
        libraryHaskellDepends = [ base containers mtl pretty ];
        homepage = "http://www.augustsson.net/Darcs/Djinn/";
-       description = "Generate Haskell code from a type. Library extracted from djinn package";
+       description = "Generate Haskell code from a type. Library extracted from djinn package.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -66140,7 +65103,6 @@ self: {
        homepage = "http://gitorious.org/djinn-th";
        description = "Generate executable Haskell code from a type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dlist_0_7_1" = callPackage
@@ -66263,7 +65225,6 @@ self: {
        jailbreak = true;
        description = "Caching DNS resolver library and mass DNS resolver utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dnsrbl" = callPackage
@@ -66290,7 +65251,6 @@ self: {
        homepage = "https://github.com/maxpow4h/dnssd";
        description = "DNS service discovery bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {dns_sd = null;};
 
   "doc-review" = callPackage
@@ -66317,7 +65277,6 @@ self: {
        homepage = "https://github.com/j3h/doc-review";
        description = "Document review Web application, like http://book.realworldhaskell.org/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doccheck" = callPackage
@@ -66337,7 +65296,6 @@ self: {
        homepage = "https://github.com/Fuuzetsu/doccheck";
        description = "Checks Haddock comments for pitfalls and version changes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docidx" = callPackage
@@ -66357,7 +65315,6 @@ self: {
        homepage = "http://github.com/gimbo/docidx.hs";
        description = "Generate an HTML index of installed Haskell packages and their documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docker" = callPackage
@@ -66385,7 +65342,6 @@ self: {
        homepage = "https://github.com/denibertovic/docker-hs";
        description = "Haskell wrapper for Docker Remote API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dockercook" = callPackage
@@ -66419,7 +65375,6 @@ self: {
        homepage = "https://github.com/factisresearch/dockercook";
        description = "A build tool for multiple docker image layers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dockerfile" = callPackage
@@ -66586,7 +65541,6 @@ self: {
        homepage = "http://github.com/karun012/doctest-discover";
        description = "Easy way to run doctests via cabal";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-discover-configurator" = callPackage
@@ -66613,7 +65567,6 @@ self: {
        homepage = "http://github.com/relrod/doctest-discover-noaeson";
        description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-prop" = callPackage
@@ -66806,7 +65759,6 @@ self: {
        homepage = "http://github.com/toothbrush/dotfs";
        description = "Filesystem to manage and parse dotfiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "dotgen" = callPackage
@@ -66820,7 +65772,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/ku-fpg/dotgen";
-       description = "A simple interface for building .dot graph files";
+       description = "A simple interface for building .dot graph files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -66883,7 +65835,6 @@ self: {
        ];
        description = "Dungeons of Wor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "download" = callPackage
@@ -66896,7 +65847,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/download";
        description = "High-level file download based on URLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "download-curl" = callPackage
@@ -66930,7 +65880,6 @@ self: {
        homepage = "http://github.com/jaspervdj/download-media-content";
        description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dozenal" = callPackage
@@ -67000,7 +65949,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell example programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-lifted-base" = callPackage
@@ -67019,7 +65967,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell common definitions used by other dph-lifted packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-lifted-copy" = callPackage
@@ -67037,7 +65984,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell lifted array combinators. (deprecated version)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-lifted-vseg" = callPackage
@@ -67056,7 +66002,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell lifted array combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-par" = callPackage
@@ -67100,7 +66045,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell segmented arrays. (production version)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-prim-seq" = callPackage
@@ -67118,7 +66062,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell segmented arrays. (sequential implementation)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-seq" = callPackage
@@ -67150,7 +66093,6 @@ self: {
        testPkgconfigDepends = [ libdpkg ];
        description = "libdpkg bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) dpkg; libdpkg = null;};
 
   "drClickOn" = callPackage
@@ -67163,7 +66105,6 @@ self: {
        homepage = "https://github.com/cwi-swat/monadic-frp";
        description = "Monadic FRP";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "draw-poker" = callPackage
@@ -67256,7 +66197,6 @@ self: {
        doCheck = false;
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dropbox-sdk" = callPackage
@@ -67280,7 +66220,6 @@ self: {
        homepage = "http://github.com/cakoose/dropbox-sdk-haskell";
        description = "A library to access the Dropbox HTTP API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dropsolve" = callPackage
@@ -67298,9 +66237,8 @@ self: {
          time
        ];
        jailbreak = true;
-       description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve";
+       description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ds-kanren" = callPackage
@@ -67315,7 +66253,6 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A subset of the miniKanren language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dsh-sql" = callPackage
@@ -67343,7 +66280,6 @@ self: {
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dsmc" = callPackage
@@ -67362,7 +66298,6 @@ self: {
        jailbreak = true;
        description = "DSMC library for rarefied gas dynamics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dsmc-tools" = callPackage
@@ -67382,7 +66317,6 @@ self: {
        jailbreak = true;
        description = "DSMC toolkit for rarefied gas dynamics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dson" = callPackage
@@ -67437,7 +66371,6 @@ self: {
        homepage = "https://github.com/basvandijk/dstring";
        description = "Difference strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtab" = callPackage
@@ -67479,7 +66412,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Parse and render DTD files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtd-text" = callPackage
@@ -67496,7 +66428,6 @@ self: {
        homepage = "http://github.com/m15k/hs-dtd-text";
        description = "Parse and render XML DTDs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtd-types" = callPackage
@@ -67509,7 +66440,6 @@ self: {
        homepage = "http://projects.haskell.org/dtd/";
        description = "Basic types for representing XML DTDs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtrace" = callPackage
@@ -67661,7 +66591,6 @@ self: {
        jailbreak = true;
        description = "Frontend development build tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dvda" = callPackage
@@ -67684,7 +66613,6 @@ self: {
        ];
        description = "Efficient automatic differentiation and code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dvdread" = callPackage
@@ -67698,7 +66626,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A monadic interface to libdvdread";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {dvdread = null;};
 
   "dvi-processing" = callPackage
@@ -67830,7 +66757,6 @@ self: {
        homepage = "http://github.com/bennofs/dynamic-cabal/";
        description = "Access the functions from the Cabal library without depending on it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-graph" = callPackage
@@ -67849,7 +66775,6 @@ self: {
        homepage = "https://github.com/adamwalker/dynamic-graph";
        description = "Draw and update graphs in real time with OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-linker-template" = callPackage
@@ -67908,7 +66833,6 @@ self: {
        ];
        description = "Object-oriented programming with duck typing and singleton classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-plot" = callPackage
@@ -67932,7 +66856,6 @@ self: {
        homepage = "https://github.com/leftaroundabout/dynamic-plot";
        description = "Interactive diagram windows";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-pp" = callPackage
@@ -67954,7 +66877,6 @@ self: {
        homepage = "https://github.com/emc2/dynamic-pp";
        description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-state_0_2_0_0" = callPackage
@@ -68027,7 +66949,6 @@ self: {
        ];
        description = "your dynamic optimization buddy";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dyre" = callPackage
@@ -68098,7 +67019,6 @@ self: {
        homepage = "http://github.com/sanetracker/easy-api";
        description = "Utility code for building HTTP API bindings more quickly";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easy-bitcoin" = callPackage
@@ -68159,7 +67079,6 @@ self: {
        homepage = "https://github.com/thinkpad20/easyjson";
        description = "Haskell JSON library with an emphasis on simplicity, minimal dependencies, and ease of use";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easyplot" = callPackage
@@ -68172,7 +67091,6 @@ self: {
        homepage = "http://hub.darcs.net/scravy/easyplot";
        description = "A tiny plotting library, utilizes gnuplot for plotting";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easyrender" = callPackage
@@ -68188,7 +67106,6 @@ self: {
        homepage = "http://www.mathstat.dal.ca/~selinger/easyrender/";
        description = "User-friendly creation of EPS, PostScript, and PDF files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ebeats" = callPackage
@@ -68220,7 +67137,6 @@ self: {
        jailbreak = true;
        description = "Parser combinators & EBNF, BFFs!";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ec2-signature" = callPackage
@@ -68257,7 +67173,6 @@ self: {
        homepage = "https://github.com/singpolyma/ecdsa-haskell";
        description = "Basic ECDSA signing implementation";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ecma262" = callPackage
@@ -68278,7 +67193,6 @@ self: {
        homepage = "https://github.com/fabianbergmark/ECMA-262";
        description = "A ECMA-262 interpreter library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ecu" = callPackage
@@ -68298,7 +67212,6 @@ self: {
        jailbreak = true;
        description = "Tools for automotive ECU development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {canlib = null;};
 
   "ed25519" = callPackage
@@ -68318,7 +67231,6 @@ self: {
        homepage = "http://thoughtpolice.github.com/hs-ed25519";
        description = "Ed25519 cryptographic signatures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ed25519-donna" = callPackage
@@ -68461,7 +67373,6 @@ self: {
        homepage = "http://www.mathematik.uni-marburg.de/~eden";
        description = "Semi-explicit parallel programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edenskel" = callPackage
@@ -68473,7 +67384,6 @@ self: {
        libraryHaskellDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edentv" = callPackage
@@ -68494,7 +67404,6 @@ self: {
        homepage = "http://www.mathematik.uni-marburg.de/~eden";
        description = "A Tool to Visualize Parallel Functional Program Executions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edge" = callPackage
@@ -68514,7 +67423,6 @@ self: {
        homepage = "http://frigidcode.com/code/edge";
        description = "Top view space combat arcade game";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edis" = callPackage
@@ -68621,7 +67529,6 @@ self: {
        ];
        description = "Symmetric, stateful edit lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edit-lenses-demo" = callPackage
@@ -68661,7 +67568,6 @@ self: {
        homepage = "http://code.haskell.org/editline";
        description = "Bindings to the editline library (libedit)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "editor-open" = callPackage
@@ -68699,7 +67605,7 @@ self: {
          base hspec hspec-discover HUnit QuickCheck
        ];
        homepage = "https://github.com/edofic/effect-handlers";
-       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers";
+       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -68717,7 +67623,7 @@ self: {
          base hspec hspec-discover HUnit QuickCheck
        ];
        homepage = "https://github.com/edofic/effect-handlers";
-       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers";
+       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -68733,7 +67639,6 @@ self: {
        jailbreak = true;
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effective-aspects" = callPackage
@@ -68756,7 +67661,6 @@ self: {
        homepage = "http://pleiad.cl/EffectiveAspects";
        description = "A monadic embedding of aspect oriented programming";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effective-aspects-mzv" = callPackage
@@ -68779,7 +67683,6 @@ self: {
        homepage = "http://pleiad.cl/EffectiveAspects";
        description = "A monadic embedding of aspect oriented programming, using \"Monads, Zippers and Views\" instead of mtl";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effects" = callPackage
@@ -68860,7 +67763,6 @@ self: {
        homepage = "https://github.com/xenophobia/Egison-Quote";
        description = "A quasi quotes for using Egison expression in Haskell code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "egison-tutorial" = callPackage
@@ -68901,7 +67803,6 @@ self: {
        homepage = "http://homepage3.nifty.com/salamander/second/projects/ehaskell/index.xhtml";
        description = "like eruby, ehaskell is embedded haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ehs" = callPackage
@@ -68924,7 +67825,6 @@ self: {
        homepage = "http://github.com/minpou/ehs/";
        description = "Embedded haskell template using quasiquotes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eibd-client-simple" = callPackage
@@ -68944,7 +67844,6 @@ self: {
        jailbreak = true;
        description = "EIBd Client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {eibclient = null;};
 
   "eigen" = callPackage
@@ -68964,7 +67863,6 @@ self: {
        homepage = "https://github.com/osidorkin/haskell-eigen";
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "either_4_3_2" = callPackage
@@ -69306,7 +68204,6 @@ self: {
        homepage = "https://bitbucket.org/davecturner/ekg-rrd";
        description = "Passes ekg statistics to rrdtool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "ekg-statsd" = callPackage
@@ -69335,7 +68232,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "easy to remember mnemonic for a high-entropy value";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "elerea" = callPackage
@@ -69363,7 +68259,6 @@ self: {
        executableHaskellDepends = [ base elerea GLFW OpenGL ];
        description = "Example applications for Elerea";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "elerea-sdl" = callPackage
@@ -69376,7 +68271,6 @@ self: {
        homepage = "http://github.com/singpolyma/elerea-sdl";
        description = "Elerea FRP wrapper for SDL";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "elevator" = callPackage
@@ -69522,7 +68416,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://elm-lang.org";
-       description = "Values to help with elm-package, elm-make, and elm-lang.org";
+       description = "Values to help with elm-package, elm-make, and elm-lang.org.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -69562,7 +68456,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://elm-lang.org";
-       description = "Values to help with elm-package, elm-make, and elm-lang.org";
+       description = "Values to help with elm-package, elm-make, and elm-lang.org.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -69603,7 +68497,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://elm-lang.org";
-       description = "Values to help with elm-package, elm-make, and elm-lang.org";
+       description = "Values to help with elm-package, elm-make, and elm-lang.org.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -69667,7 +68561,6 @@ self: {
        ];
        description = "Set up basic structure for an elm project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-make" = callPackage
@@ -69894,7 +68787,6 @@ self: {
        homepage = "https://github.com/cocreature/emacs-keys";
        description = "library to parse emacs style keybinding into the modifiers and the chars";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email" = callPackage
@@ -69912,7 +68804,6 @@ self: {
        jailbreak = true;
        description = "Sending eMail in Haskell made easy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-header" = callPackage
@@ -69935,7 +68826,6 @@ self: {
        homepage = "http://github.com/knrafto/email-header";
        description = "Parsing and rendering of email and MIME headers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-postmark" = callPackage
@@ -69952,7 +68842,6 @@ self: {
        jailbreak = true;
        description = "A simple wrapper to send emails via the api of the service postmark (http://postmarkapp.com/)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-validate_2_0_1" = callPackage
@@ -70055,7 +68944,6 @@ self: {
        homepage = "https://github.com/nushio3/embeddock";
        description = "Embed the values in scope in the haddock documentation of the module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "embeddock-example" = callPackage
@@ -70068,7 +68956,6 @@ self: {
        homepage = "https://github.com/nushio3/embeddock-example";
        description = "Example of using embeddock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "embroidery" = callPackage
@@ -70088,7 +68975,6 @@ self: {
        homepage = "https://ludflu@github.com/ludflu/embroidery.git";
        description = "support for embroidery formats in haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emgm" = callPackage
@@ -70103,7 +68989,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/EMGM";
        description = "Extensible and Modular Generics for the Masses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "empty" = callPackage
@@ -70179,14 +69064,16 @@ self: {
      }) {};
 
   "endo" = callPackage
-    ({ mkDerivation, base, between, transformers }:
+    ({ mkDerivation, base, between, data-default-class, mtl
+     , transformers
+     }:
      mkDerivation {
        pname = "endo";
-       version = "0.2.0.1";
-       sha256 = "312ea501116bddc01dd523948b80693ec6348a8f6beb5a1b9bcbeaa709d9eb6b";
-       revision = "1";
-       editedCabalFile = "4c0b97bc6e43d18ae5dc423824ab4406e6b2188b887094b6eff3e49103e456b3";
-       libraryHaskellDepends = [ base between transformers ];
+       version = "0.3.0.1";
+       sha256 = "34048da71000312081715a95e35108e5526647232c857b3c8e13dbb69e364f6a";
+       libraryHaskellDepends = [
+         base between data-default-class mtl transformers
+       ];
        homepage = "https://github.com/trskop/endo";
        description = "Endomorphism utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -70457,7 +69344,6 @@ self: {
        homepage = "https://github.com/sboosali/enumerate";
        description = "enumerate all the values in a finite type (automatically)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enumeration" = callPackage
@@ -70477,7 +69363,6 @@ self: {
        homepage = "https://github.com/emc2/enumeration";
        description = "A practical API for building recursive enumeration procedures and enumerating datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enumerator" = callPackage
@@ -70530,7 +69415,6 @@ self: {
        homepage = "https://github.com/liyang/enumfun";
        description = "Finitely represented /total/ EnumMaps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enummapmap" = callPackage
@@ -70553,7 +69437,6 @@ self: {
        jailbreak = true;
        description = "Map of maps using Enum types as keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enummapset" = callPackage
@@ -70613,7 +69496,6 @@ self: {
        homepage = "http://github.com/tel/env-parser";
        description = "Pull configuration information from the ENV";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "envparse" = callPackage
@@ -70661,7 +69543,6 @@ self: {
        homepage = "http://epanet.de/developer/haskell.html";
        description = "Haskell binding for EPANET";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "epass" = callPackage
@@ -70692,7 +69573,6 @@ self: {
        homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
        description = "Compiler for a simple functional language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "epoll" = callPackage
@@ -70707,7 +69587,6 @@ self: {
        homepage = "https://gitlab.com/twittner/epoll";
        description = "epoll bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eprocess" = callPackage
@@ -70796,7 +69675,6 @@ self: {
        homepage = "http://ui3.info/d/proj/epubname.html";
        description = "Rename epub ebook files based on meta information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eq_4_0_3" = callPackage
@@ -70925,8 +69803,8 @@ self: {
      }:
      mkDerivation {
        pname = "erlang";
-       version = "0.2.1";
-       sha256 = "7322f24dcc10cfde8a2f9afa6835893b93b7b4c3e20f7514a24ca6d169b7f334";
+       version = "0.2.2";
+       sha256 = "892080e131621fb0ea585ed9e2497a3c367607319d3daa3ae03edaafd5f38b71";
        libraryHaskellDepends = [
          base binary bytestring directory filepath MissingH network random
        ];
@@ -70963,7 +69841,6 @@ self: {
        jailbreak = true;
        description = "DEPRECATED in favor of eros-http";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eros-http" = callPackage
@@ -71073,7 +69950,6 @@ self: {
        homepage = "http://github.com/gcross/error-message";
        description = "Composable error messages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "error-util" = callPackage
@@ -71276,7 +70152,6 @@ self: {
        homepage = "http://github.com/ekmett/ersatz";
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ersatz-toysat" = callPackage
@@ -71297,7 +70172,6 @@ self: {
        homepage = "https://github.com/msakai/ersatz-toysat";
        description = "toysat driver as backend for ersatz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ert" = callPackage
@@ -71347,7 +70221,6 @@ self: {
        homepage = "http://www.killersmurf.com/projects/esotericbot";
        description = "Esotericbot is a sophisticated, lightweight IRC bot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "esqueleto_2_1_2_1" = callPackage
@@ -71572,7 +70445,6 @@ self: {
        jailbreak = true;
        description = "Tool for managing probability estimation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "estreps" = callPackage
@@ -71590,7 +70462,6 @@ self: {
        homepage = "http://blog.malde.org/";
        description = "Repeats from ESTs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "etcd" = callPackage
@@ -71625,7 +70496,6 @@ self: {
        ];
        description = "everything breaking the Fairbairn threshold";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ether_0_3_0_0" = callPackage
@@ -71719,7 +70589,6 @@ self: {
        ];
        description = "A Haskell version of an Ethereum client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-merkle-patricia-db" = callPackage
@@ -71744,7 +70613,6 @@ self: {
        ];
        description = "A modified Merkle Patricia DB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-rlp" = callPackage
@@ -71825,7 +70693,6 @@ self: {
        homepage = "http://github.com/tsurucapital/euphoria";
        description = "Dynamic network FRP with events and continuous values";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eurofxref" = callPackage
@@ -71843,7 +70710,6 @@ self: {
        jailbreak = true;
        description = "Free foreign exchange/currency feed from the European Central Bank";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "event_0_1_1" = callPackage
@@ -71912,7 +70778,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf yjtools ];
        description = "library for event driven programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "event-handlers" = callPackage
@@ -71961,7 +70826,6 @@ self: {
        homepage = "http://code.haskell.org/~mokus/event-monad";
        description = "Event-graph simulation monad transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventloop" = callPackage
@@ -71978,9 +70842,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "-";
-       description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together";
+       description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventstore_0_10_0_1" = callPackage
@@ -72040,7 +70903,6 @@ self: {
        homepage = "http://research.microsoft.com/en-us/people/dimitris/pearl.pdf";
        description = "A functional pearl on encoding and decoding using question-and-answer strategies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ewe" = callPackage
@@ -72060,7 +70922,6 @@ self: {
        homepage = "http://github.com/jfcmacro/ewe";
        description = "A language for teaching simple programming languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ex-pool" = callPackage
@@ -72500,7 +71361,6 @@ self: {
        librarySystemDepends = [ exif ];
        description = "A Haskell binding to a subset of libexif";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) exif;};
 
   "exinst" = callPackage
@@ -72600,7 +71460,6 @@ self: {
        homepage = "http://github.com/glehel/exists";
        description = "Existential datatypes holding evidence of constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exit-codes" = callPackage
@@ -72646,7 +71505,6 @@ self: {
        homepage = "https://github.com/Bodigrim/exp-pairs";
        description = "Linear programming over exponent pairs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expand" = callPackage
@@ -72661,7 +71519,6 @@ self: {
        jailbreak = true;
        description = "Extensible Pandoc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expat-enumerator" = callPackage
@@ -72679,7 +71536,6 @@ self: {
        homepage = "http://john-millikin.com/software/expat-enumerator/";
        description = "Enumerator-based API for Expat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expiring-cache-map" = callPackage
@@ -72727,7 +71583,6 @@ self: {
        homepage = "https://github.com/joelteon/explain";
        description = "Show how expressions are parsed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "explicit-determinant" = callPackage
@@ -72824,7 +71679,6 @@ self: {
        homepage = "http://sebfisch.github.com/explicit-sharing";
        description = "Explicit Sharing of Monadic Effects";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "explore" = callPackage
@@ -72839,7 +71693,6 @@ self: {
        homepage = "http://corsis.sourceforge.net/haskell/explore";
        description = "Experimental Plot data Reconstructor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exposed-containers" = callPackage
@@ -72861,7 +71714,6 @@ self: {
        jailbreak = true;
        description = "A distribution of the 'containers' package, with all modules exposed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expression-parser" = callPackage
@@ -72889,7 +71741,6 @@ self: {
        ];
        description = "Libraries for processing GHC Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extemp" = callPackage
@@ -72913,7 +71764,6 @@ self: {
        homepage = "http://patch-tag.com/r/salazar/extemp";
        description = "automated printing for extemp speakers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extended-categories" = callPackage
@@ -72927,7 +71777,6 @@ self: {
        homepage = "github.com/ian-mi/extended-categories";
        description = "Extended Categories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extended-reals" = callPackage
@@ -73025,7 +71874,7 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring EdisonAPI EdisonCore
        ];
-       description = "Sort large arrays on your hard drive. Kind of like the unix util sort";
+       description = "Sort large arrays on your hard drive. Kind of like the unix util sort.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -73218,7 +72067,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/ez-couch";
        description = "A high level static library for working with CouchDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "faceted" = callPackage
@@ -73232,7 +72080,6 @@ self: {
        homepage = "http://github.com/haskell-faceted/haskell-faceted";
        description = "Faceted computation for dynamic information flow security";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "factory" = callPackage
@@ -73257,7 +72104,6 @@ self: {
        homepage = "http://functionalley.eu/Factory/factory.html";
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-darwin" ];
      }) {};
 
   "factual-api" = callPackage
@@ -73276,7 +72122,6 @@ self: {
        homepage = "https://github.com/rudyl313/factual-haskell-driver";
        description = "A driver for the Factual API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fad" = callPackage
@@ -73381,7 +72226,6 @@ self: {
        homepage = "http://github.com/tranma/falling-turnip";
        description = "Falling sand game/cellular automata simulation using regular parallel arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fallingblocks" = callPackage
@@ -73401,7 +72245,6 @@ self: {
        homepage = "http://bencode.blogspot.com/2009/03/falling-blocks-tetris-clone-in-haskell.html";
        description = "A fun falling blocks game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "family-tree" = callPackage
@@ -73420,7 +72263,6 @@ self: {
        homepage = "https://github.com/Taneb/family-tree";
        description = "A family tree library for the Haskell programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "farmhash" = callPackage
@@ -73434,7 +72276,6 @@ self: {
        homepage = "https://github.com/abhinav/farmhash";
        description = "Fast hash functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fast-builder" = callPackage
@@ -73450,7 +72291,6 @@ self: {
        homepage = "http://github.com/takano-akio/fast-builder";
        description = "Fast ByteString Builder";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fast-digits" = callPackage
@@ -73587,7 +72427,6 @@ self: {
        homepage = "https://github.com/elaforge/fast-tags";
        description = "Fast incremental vi and emacs tags";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-tagsoup" = callPackage
@@ -73662,7 +72501,6 @@ self: {
        homepage = "https://github.com/cscherrer/fastbayes";
        description = "Bayesian modeling algorithms accelerated for particular model structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fastcgi" = callPackage
@@ -73715,7 +72553,6 @@ self: {
        ];
        description = "Fast Internet Relay Chat (IRC) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fault-tree" = callPackage
@@ -73728,7 +72565,6 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "A fault tree analysis library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay_0_21_2_1" = callPackage
@@ -74154,7 +72990,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Clientside HTML generation for fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-jquery_0_6_0_2" = callPackage
@@ -74577,7 +73412,6 @@ self: {
        homepage = "https://github.com/Neki/fcd";
        description = "A faster way to navigate directories using the command line";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fckeditor" = callPackage
@@ -74591,7 +73425,6 @@ self: {
        homepage = "http://peteg.org/";
        description = "Server-Side Integration for FCKeditor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fclabels_2_0_2" = callPackage
@@ -74719,7 +73552,6 @@ self: {
        homepage = "https://github.com/jkarlson/fdo-trash";
        description = "Utilities related to freedesktop Trash standard";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feature-flags" = callPackage
@@ -74787,7 +73619,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74809,7 +73641,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74830,7 +73662,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74851,7 +73683,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74872,7 +73704,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74893,7 +73725,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74914,7 +73746,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -74935,7 +73767,6 @@ self: {
        homepage = "http://www.syntaxpolice.org/darcs_repos/feed-cli";
        description = "A simple command line interface for creating and updating feeds like RSS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed-collect" = callPackage
@@ -74954,7 +73785,6 @@ self: {
        homepage = "http://rel4tion.org/projects/feed-collect/";
        description = "Watch RSS/Atom feeds (and do with them whatever you like)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed-crawl" = callPackage
@@ -74996,7 +73826,6 @@ self: {
        homepage = "https://github.com/dahlia/feed-translator";
        description = "Translate syndication feeds";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed2lj" = callPackage
@@ -75015,7 +73844,6 @@ self: {
        ];
        description = "(unsupported)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed2twitter" = callPackage
@@ -75033,7 +73861,6 @@ self: {
        homepage = "http://github.com/tomlokhorst/feed2twitter";
        description = "Send posts from a feed to Twitter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feldspar-compiler" = callPackage
@@ -75061,7 +73888,6 @@ self: {
        homepage = "http://feldspar.github.com";
        description = "Compiler for the Feldspar language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gcc_s = null;};
 
   "feldspar-language" = callPackage
@@ -75087,7 +73913,6 @@ self: {
        homepage = "http://feldspar.github.com";
        description = "A functional embedded language for DSP and parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feldspar-signal" = callPackage
@@ -75161,7 +73986,6 @@ self: {
        homepage = "http://fenfire.org/";
        description = "Graph-based notetaking system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {raptor = null;};
 
   "fez-conf" = callPackage
@@ -75188,7 +74012,6 @@ self: {
        executableHaskellDepends = [ base pretty ];
        description = "Haskell binding to the FriendFeed API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fficxx" = callPackage
@@ -75244,7 +74067,6 @@ self: {
        ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; 
          libavformat = null; libswscale = null;};
 
@@ -75264,7 +74086,6 @@ self: {
        homepage = "http://patch-tag.com/r/VasylPasternak/ffmpeg-tutorials";
        description = "Tutorials on ffmpeg usage to play video/audio";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fft_0_1_8_2" = callPackage
@@ -75435,7 +74256,6 @@ self: {
        homepage = "http://github.com/dmpots/fibon/wiki";
        description = "Tools for running and analyzing Haskell benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fibonacci" = callPackage
@@ -75464,7 +74284,6 @@ self: {
        homepage = "http://github.com/AstraFIN/fields";
        description = "First-class record field combinators with infix record field syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fields-json" = callPackage
@@ -75493,7 +74312,6 @@ self: {
        jailbreak = true;
        description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fig" = callPackage
@@ -75740,7 +74558,6 @@ self: {
        homepage = "https://github.com/gregwebs/FileLocation.hs";
        description = "common functions that show file location information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "file-modules" = callPackage
@@ -75762,7 +74579,6 @@ self: {
        homepage = "https://github.com/yamadapc/stack-run-auto";
        description = "Takes a Haskell source-code file and outputs its modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filecache" = callPackage
@@ -75939,7 +74755,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Use system-filepath data types with conduits. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filesystem-enumerator" = callPackage
@@ -75956,7 +74771,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-filesystem/";
        description = "Enumerator-based API for manipulating the filesystem";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filesystem-trees" = callPackage
@@ -76056,7 +74870,6 @@ self: {
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fingertree_0_1_0_0" = callPackage
@@ -76227,7 +75040,6 @@ self: {
        homepage = "http://www-users.cs.york.ac.uk/~ndm/firstify/";
        description = "Defunctionalisation for Yhc Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fishfood" = callPackage
@@ -76250,7 +75062,6 @@ self: {
        homepage = "http://functionalley.eu";
        description = "Calculates file-size frequency-distribution";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-darwin" ];
      }) {};
 
   "fit" = callPackage
@@ -76270,7 +75081,6 @@ self: {
        ];
        description = "FIT file decoder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fitsio" = callPackage
@@ -76284,7 +75094,6 @@ self: {
        homepage = "http://github.com/esessoms/fitsio";
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cfitsio;};
 
   "fix-imports" = callPackage
@@ -76315,7 +75124,6 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "Simple fix-expression parser";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fix-symbols-gitit" = callPackage
@@ -76327,7 +75135,6 @@ self: {
        libraryHaskellDepends = [ base containers gitit ];
        description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed_0_2_1" = callPackage
@@ -76404,7 +75211,6 @@ self: {
        jailbreak = true;
        description = "Binary fixed-point arithmetic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-point-vector" = callPackage
@@ -76417,7 +75223,6 @@ self: {
        jailbreak = true;
        description = "Unbox instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-point-vector-space" = callPackage
@@ -76430,7 +75235,6 @@ self: {
        jailbreak = true;
        description = "vector-space instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-precision" = callPackage
@@ -76448,7 +75252,6 @@ self: {
        homepage = "http://github.com/ekmett/fixed-precision";
        description = "Fixed Precision Arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-storable-array" = callPackage
@@ -76459,9 +75262,8 @@ self: {
        sha256 = "f00a020ce3792737089cd7d544e0b35728c8c4d6f3b815fb6929742cb680656d";
        libraryHaskellDepends = [ array base tagged ];
        jailbreak = true;
-       description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead";
+       description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-vector_0_7_0_3" = callPackage
@@ -76792,7 +75594,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix-time ];
        jailbreak = true;
        homepage = "https://github.com/tattsun/flexible-time";
-       description = "simple extension of Data.UnixTime";
+       description = "simple extension of Data.UnixTime.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -76820,7 +75622,6 @@ self: {
        jailbreak = true;
        description = "Flexible wrappers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flexiwrap-smallcheck" = callPackage
@@ -76835,7 +75636,6 @@ self: {
        jailbreak = true;
        description = "SmallCheck (Serial) instances for flexiwrap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flickr" = callPackage
@@ -76854,7 +75654,6 @@ self: {
        executableHaskellDepends = [ xhtml ];
        description = "Haskell binding to the Flickr API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flippers" = callPackage
@@ -76886,7 +75685,6 @@ self: {
        homepage = "http://www.cs.york.ac.uk/fp/reduceron/";
        description = "f-lite compiler, interpreter and libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flo" = callPackage
@@ -76936,7 +75734,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Conversions between floating and integral values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "floatshow" = callPackage
@@ -77012,7 +75809,6 @@ self: {
        homepage = "http://adept.linux.kiev.ua:8080/repos/flow2dot";
        description = "Library and binary to generate sequence/flow diagrams from plain text source";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowdock" = callPackage
@@ -77033,7 +75829,6 @@ self: {
        homepage = "https://github.com/brewtown/hs-flowdock";
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowdock-api" = callPackage
@@ -77071,7 +75866,6 @@ self: {
        homepage = "https://github.com/gabemc/flowdock-api";
        description = "API integration with Flowdock";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowdock-rest" = callPackage
@@ -77101,7 +75895,6 @@ self: {
        homepage = "https://github.com/futurice/haskell-flowdock-rest#readme";
        description = "Flowdock REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flower" = callPackage
@@ -77121,7 +75914,6 @@ self: {
        homepage = "http://biohaskell.org/Applications/Flower";
        description = "Analyze 454 flowgrams (.SFF files)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowlocks-framework" = callPackage
@@ -77134,7 +75926,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Generalized Flow Locks Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowsim" = callPackage
@@ -77154,7 +75945,6 @@ self: {
        homepage = "http://biohaskell.org/Applications/FlowSim";
        description = "Simulate 454 pyrosequencing";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fltkhs" = callPackage
@@ -77163,8 +75953,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.4.0.5";
-       sha256 = "ba70bc386ff0393e762e29b183fd12d1fcf3c8329343cd81adcab3f1d30aab75";
+       version = "0.4.0.6";
+       sha256 = "f449467e3094b719da3209b14330e7e57da5ced3c8bca8dd02c1cbac6f635684";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -77188,7 +75978,7 @@ self: {
          base bytestring directory fltkhs process stm
        ];
        homepage = "http://github.com/deech/fltkhs-demos";
-       description = "FLTKHS demos. Please scroll to the bottom for more information";
+       description = "FLTKHS demos. Please scroll to the bottom for more information.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -77232,7 +76022,6 @@ self: {
        homepage = "http://github.com/deech/fltkhs-hello-world";
        description = "Fltkhs template project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fluent-logger" = callPackage
@@ -77287,7 +76076,6 @@ self: {
        homepage = "https://github.com/MostAwesomeDude/hsfluidsynth";
        description = "Haskell bindings to FluidSynth";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) fluidsynth;};
 
   "fmark" = callPackage
@@ -77365,6 +76153,29 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "fn_0_3_0_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, directory
+     , filepath, hspec, http-types, text, unordered-containers, wai
+     , wai-extra
+     }:
+     mkDerivation {
+       pname = "fn";
+       version = "0.3.0.0";
+       sha256 = "f617f7dbd3ee30bdfdce1bcdd7637bfcaa276616c3958f15c84c58dc63b21ee5";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring directory filepath http-types text
+         unordered-containers wai wai-extra
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec http-types text unordered-containers
+         wai wai-extra
+       ];
+       homepage = "http://github.com/dbp/fn#readme";
+       description = "A functional web framework";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fn-extra_0_2_0_0" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, either, fn, heist
      , http-types, lens, mtl, text, wai, wai-util, xmlhtml
@@ -77400,6 +76211,26 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "fn-extra_0_3_0_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring
+     , digestive-functors, directory, either, fn, heist, http-types
+     , lens, mtl, resourcet, text, wai, wai-extra, wai-util, xmlhtml
+     }:
+     mkDerivation {
+       pname = "fn-extra";
+       version = "0.3.0.0";
+       sha256 = "fbbc710d612c5fe0780e87a88a9aa70ad60208d4b2b8bdd42f7ecb8f0bfabb6b";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring digestive-functors directory either
+         fn heist http-types lens mtl resourcet text wai wai-extra wai-util
+         xmlhtml
+       ];
+       homepage = "http://github.com/dbp/fn#readme";
+       description = "Extras for Fn, a functional web framework";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "focus_0_1_3" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -77441,7 +76272,6 @@ self: {
        homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fold-debounce-conduit" = callPackage
@@ -77463,7 +76293,6 @@ self: {
        homepage = "https://github.com/debug-ito/fold-debounce-conduit";
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "foldl_1_0_7" = callPackage
@@ -77657,7 +76486,6 @@ self: {
        homepage = "https://github.com/tonyday567/foldl-incremental";
        description = "incremental folds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-transduce" = callPackage
@@ -77681,7 +76509,6 @@ self: {
        ];
        description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-transduce-attoparsec" = callPackage
@@ -77703,7 +76530,6 @@ self: {
        ];
        description = "Attoparsec and foldl-transduce integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "folds" = callPackage
@@ -77729,7 +76555,6 @@ self: {
        homepage = "http://github.com/ekmett/folds";
        description = "Beautiful Folding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "folds-common" = callPackage
@@ -77743,7 +76568,6 @@ self: {
        testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        description = "A playground of common folds for folds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "follower" = callPackage
@@ -77763,7 +76587,6 @@ self: {
        homepage = "http://rebworks.net/projects/follower/";
        description = "Follow Tweets anonymously";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foma" = callPackage
@@ -77777,7 +76600,6 @@ self: {
        homepage = "http://github.com/joom/foma.hs";
        description = "Simple Haskell bindings for Foma";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {foma = null;};
 
   "font-opengl-basic4x6" = callPackage
@@ -77793,7 +76615,6 @@ self: {
        jailbreak = true;
        description = "Basic4x6 font for OpenGL";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foo" = callPackage
@@ -77810,7 +76631,6 @@ self: {
        homepage = "http://sourceforge.net/projects/fooengine/?abmode=1";
        description = "Paper soccer, an OpenGL game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "for-free" = callPackage
@@ -77828,7 +76648,6 @@ self: {
        jailbreak = true;
        description = "Functor, Monad, MonadPlus, etc for free";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "forbidden-fruit" = callPackage
@@ -77851,7 +76670,6 @@ self: {
        homepage = "http://github.com/minpou/forbidden-fruit";
        description = "A library accelerates imperative style programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "force-layout_0_3_0_8" = callPackage
@@ -77967,7 +76785,6 @@ self: {
        executableHaskellDepends = [ base process transformers ];
        description = "Run a command on files with magic substituion support (sequencing and regexp)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "forecast-io" = callPackage
@@ -77978,7 +76795,7 @@ self: {
        sha256 = "7ed54091d063fdf9ffca57c05a24769345b88a9e5bbb6c1f4037e01f70c69a9f";
        libraryHaskellDepends = [ aeson base text ];
        homepage = "https://github.com/stormont/forecast-io";
-       description = "A Haskell library for working with forecast.io data";
+       description = "A Haskell library for working with forecast.io data.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -78001,7 +76818,7 @@ self: {
        sha256 = "afd0ea51c6f8b012259411858c966d34dbcbd7c128b044313fc6843743d6f0dc";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/chrisdone/foreign-store";
-       description = "Store a stable pointer in a foreign context to be retrieved later. Persists through GHCi reloads";
+       description = "Store a stable pointer in a foreign context to be retrieved later. Persists through GHCi reloads.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -78096,7 +76913,6 @@ self: {
        jailbreak = true;
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "format" = callPackage
@@ -78111,7 +76927,6 @@ self: {
        homepage = "https://github.com/bytbox/hs-format";
        description = "Rendering from and scanning to format strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "format-status" = callPackage
@@ -78130,7 +76945,6 @@ self: {
        jailbreak = true;
        description = "A utility for writing the date to dzen2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "formattable" = callPackage
@@ -78249,7 +77063,6 @@ self: {
        homepage = "http://texodus.github.com/forml";
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "formlets" = callPackage
@@ -78268,7 +77081,6 @@ self: {
        homepage = "http://github.com/chriseidhof/formlets/tree/master";
        description = "Formlets implemented in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "formlets-hsp" = callPackage
@@ -78285,7 +77097,6 @@ self: {
        libraryToolDepends = [ trhsx ];
        description = "HSP support for Formlets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "formura" = callPackage
@@ -78320,7 +77131,6 @@ self: {
        jailbreak = true;
        description = "A simple eDSL for generating arrayForth code";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foscam-directory" = callPackage
@@ -78388,7 +77198,6 @@ self: {
        homepage = "https://github.com/tonymorris/foscam-sort";
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fountain" = callPackage
@@ -78476,7 +77285,6 @@ self: {
        homepage = "https://www.fpcomplete.com/page/api";
        description = "Simple interface to the FP Complete IDE API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fpipe" = callPackage
@@ -78523,7 +77331,6 @@ self: {
        ];
        description = "Example implementations for FPNLA library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fptest" = callPackage
@@ -78619,7 +77426,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Frag";
        description = "A 3-D First Person Shooter Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frame" = callPackage
@@ -78668,7 +77474,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A package for configuring and building Haskell software";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free_4_9" = callPackage
@@ -78800,7 +77605,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/free-functors";
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-game" = callPackage
@@ -78824,7 +77628,6 @@ self: {
        homepage = "https://github.com/fumieval/free-game";
        description = "Create games for free";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-http" = callPackage
@@ -78858,7 +77661,6 @@ self: {
        jailbreak = true;
        description = "Operational Applicative, Alternative, Monad and MonadPlus from free types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-theorems" = callPackage
@@ -78874,7 +77676,6 @@ self: {
        ];
        description = "Automatic generation of free theorems";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-theorems-counterexamples" = callPackage
@@ -78893,7 +77694,6 @@ self: {
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Automatically Generating Counterexamples to Naive Free Theorems";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-theorems-seq" = callPackage
@@ -78912,7 +77712,6 @@ self: {
        jailbreak = true;
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-theorems-seq-webui" = callPackage
@@ -78931,7 +77730,6 @@ self: {
        ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-theorems-webui" = callPackage
@@ -78950,7 +77748,6 @@ self: {
        ];
        description = "CGI-based web interface for the free-theorems package";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-vl" = callPackage
@@ -78990,7 +77787,6 @@ self: {
        homepage = "http://github.com/anttisalonen/freekick2";
        description = "A soccer game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freenect_1_2" = callPackage
@@ -79024,7 +77820,6 @@ self: {
        homepage = "https://github.com/chrisdone/freenect";
        description = "Interface to the Kinect device";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freenect; freenect_sync = null; 
          libfreenect = null;};
 
@@ -79046,7 +77841,6 @@ self: {
        homepage = "https://gitlab.com/cpp.cabrera/freer";
        description = "Implementation of the Freer Monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "freesect" = callPackage
@@ -79066,7 +77860,6 @@ self: {
        homepage = "http://fremissant.net/freesect";
        description = "A Haskell syntax extension for generalised sections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freesound" = callPackage
@@ -79089,7 +77882,6 @@ self: {
        homepage = "https://github.com/kaoskorobase/freesound";
        description = "Access the Freesound Project database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freetype-simple" = callPackage
@@ -79185,7 +77977,6 @@ self: {
        homepage = "https://github.com/TomMD/friday-juicypixels";
        description = "Converts between the Friday and JuicyPixels image types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "friday-scale-dct" = callPackage
@@ -79269,7 +78060,6 @@ self: {
        homepage = "http://github.com/frp-arduino/frp-arduino";
        description = "Arduino programming without the hassle of C";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frpnow" = callPackage
@@ -79297,7 +78087,6 @@ self: {
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Program awesome stuff with Gloss and frpnow!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "frpnow-gtk" = callPackage
@@ -79340,7 +78129,6 @@ self: {
        homepage = "http://github.com/nkpart/fs-events";
        description = "A haskell binding to the FSEvents API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fsharp" = callPackage
@@ -79368,7 +78156,6 @@ self: {
        homepage = "http://projects.haskell.org/fsmActions/";
        description = "Finite state machines and FSM actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fsnotify_0_1_0_3" = callPackage
@@ -79468,7 +78255,6 @@ self: {
        homepage = "http://www.github.com/ehamberg/fswatcher/";
        description = "Watch a file/directory and run a command when it's modified";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftdi" = callPackage
@@ -79487,7 +78273,6 @@ self: {
        jailbreak = true;
        description = "A thin layer over USB to communicate with FTDI chips";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftp-conduit" = callPackage
@@ -79506,7 +78291,6 @@ self: {
        homepage = "https://github.com/litherum/ftp-conduit";
        description = "FTP client package with conduit interface based off http-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftphs" = callPackage
@@ -79555,7 +78339,6 @@ self: {
        jailbreak = true;
        description = "Shell interface to the FreeTheorems library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fugue" = callPackage
@@ -79579,7 +78362,6 @@ self: {
        homepage = "http://www.agusa.i.is.nagoya-u.ac.jp/person/sydney/full-sessions.html";
        description = "a monad for protocol-typed network programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "full-text-search" = callPackage
@@ -79600,7 +78382,6 @@ self: {
        jailbreak = true;
        description = "In-memory full text search engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fullstop" = callPackage
@@ -79622,7 +78403,6 @@ self: {
        homepage = "http://hub.darcs.net/kowey/fullstop";
        description = "Simple sentence segmenter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "funbot" = callPackage
@@ -79652,7 +78432,6 @@ self: {
        homepage = "https://notabug.org/fr33domlover/funbot";
        description = "IRC bot for fun, learning, creativity and collaboration";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "funbot-client" = callPackage
@@ -79751,7 +78530,6 @@ self: {
        libraryHaskellDepends = [ base data-type ];
        description = "Combining functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "function-instances-algebra" = callPackage
@@ -79777,7 +78555,6 @@ self: {
        jailbreak = true;
        description = "Combinators that allow for a more functional/monadic style of Arrow programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "functional-kmp" = callPackage
@@ -79828,7 +78605,7 @@ self: {
        sha256 = "fe01131dcef76a6a1e66424f12757e66724f24bed4c353d4beadf3890a0ef3c2";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/fmap/functor-infix";
-       description = "Infix operators for mapping over compositions of functors. Lots of them";
+       description = "Infix operators for mapping over compositions of functors. Lots of them.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -79852,7 +78629,7 @@ self: {
        sha256 = "a054cbd84686777774b9e2c36c1b5ceaf8ca415a9755e922ff52137eb9ac36ba";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/wdanilo/functor-utils";
-       description = "Collection of functor utilities, providing handy operators, like generalization of (.)";
+       description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -79865,7 +78642,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data.FunctorM (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "functors" = callPackage
@@ -79876,7 +78652,7 @@ self: {
        sha256 = "e6b96554d59b924f9960677137f2d4bc2417bac29b87083390d0020b6397d659";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/aristidb/functors";
-       description = "(.:) and friends, syntax for Functor and Applicative";
+       description = "(.:) and friends, syntax for Functor and Applicative.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -79897,7 +78673,6 @@ self: {
        homepage = "http://github.com/nathanwiegand/funion";
        description = "A unioning file-system using HFuse";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "funpat" = callPackage
@@ -79933,7 +78708,6 @@ self: {
        homepage = "http://github.com/dbueno/funsat";
        description = "A modern DPLL-style SAT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fusion" = callPackage
@@ -79975,7 +78749,6 @@ self: {
        homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/future";
        description = "Supposed to mimics and enhance proposed C++ \"future\" features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "future-resource" = callPackage
@@ -80019,7 +78792,6 @@ self: {
        homepage = "http://github.com/joom/fuzzy";
        description = "Filters a list based on a fuzzy string search";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzy-timings" = callPackage
@@ -80040,7 +78812,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/tlaitinen/fuzzy-timings";
-       description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs";
+       description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -80058,7 +78830,6 @@ self: {
        ];
        description = "A 'ten past six' style clock";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fwgl" = callPackage
@@ -80093,7 +78864,6 @@ self: {
        homepage = "https://github.com/ziocroc/FWGL";
        description = "FWGL GLFW backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fwgl-javascript" = callPackage
@@ -80125,7 +78895,6 @@ self: {
        executableHaskellDepends = [ base HTTP json ];
        description = "Generate Gentoo ebuilds from NodeJS/npm packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gact" = callPackage
@@ -80143,7 +78912,6 @@ self: {
        ];
        description = "General Alignment Clustering Tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "game-of-life" = callPackage
@@ -80195,7 +78963,6 @@ self: {
        executableHaskellDepends = [ base cairo containers glib gtk time ];
        description = "Game clock that shows two analog clock faces";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gamma" = callPackage
@@ -80266,7 +79033,6 @@ self: {
        homepage = "http://www.daneel0yaitskov.000space.com";
        description = "planar graph embedding into a plane";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gc" = callPackage
@@ -80301,7 +79067,6 @@ self: {
        homepage = "https://github.com/yihuang/gc-monitoring-wai";
        description = "a wai application to show GHC.GCStats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gconf" = callPackage
@@ -80363,7 +79128,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
        description = "Generic diff for the instant-generics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gdiff-th" = callPackage
@@ -80384,7 +79148,6 @@ self: {
        homepage = "https://github.com/jfischoff/gdiff-th";
        description = "Generate gdiff GADTs and Instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gdo" = callPackage
@@ -80418,7 +79181,6 @@ self: {
        homepage = "http://code.mathr.co.uk/gearbox";
        description = "zooming rotating fractal gears graphics demo";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geek" = callPackage
@@ -80440,7 +79202,6 @@ self: {
        homepage = "http://github.com/nfjinjing/geek";
        description = "Geek blog engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geek-server" = callPackage
@@ -80464,7 +79225,6 @@ self: {
        homepage = "http://github.com/nfjinjing/geek";
        description = "Geek blog engine server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gelatin" = callPackage
@@ -80488,7 +79248,6 @@ self: {
        ];
        description = "An experimental real time renderer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gemstone" = callPackage
@@ -80508,7 +79267,6 @@ self: {
        homepage = "http://corbinsimpson.com/";
        description = "A simple library of helpers for SDL+GL games";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gencheck" = callPackage
@@ -80526,7 +79284,6 @@ self: {
        homepage = "http://github.com/JacquesCarette/GenCheck";
        description = "A testing framework inspired by QuickCheck and SmallCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gender" = callPackage
@@ -80543,7 +79300,6 @@ self: {
        homepage = "https://github.com/womfoo/gender";
        description = "Identify a persons gender by their first name";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genders" = callPackage
@@ -80559,7 +79315,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec network vector ];
        description = "Bindings to libgenders";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {genders = null;};
 
   "general-prelude" = callPackage
@@ -80574,7 +79329,6 @@ self: {
        ];
        description = "Prelude replacement using generalized type classes where possible";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generator" = callPackage
@@ -80600,7 +79354,6 @@ self: {
        homepage = "http://liamoc.net/pdf/Generator.pdf";
        description = "Actually useful monadic random value generators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-accessors" = callPackage
@@ -80719,7 +79472,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "generic-aeson" = callPackage
+  "generic-aeson_0_2_0_7" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl
      , tagged, text, unordered-containers, vector
      }:
@@ -80735,6 +79488,23 @@ self: {
        ];
        description = "Derivation of Aeson instances using GHC generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "generic-aeson" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl
+     , tagged, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "generic-aeson";
+       version = "0.2.0.8";
+       sha256 = "de29fa648b9eb6c9e678b0715a530efaf70aac8f1ad8becc22d7ef1411ded5cb";
+       libraryHaskellDepends = [
+         aeson attoparsec base generic-deriving mtl tagged text
+         unordered-containers vector
+       ];
+       description = "Derivation of Aeson instances using GHC generics";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "generic-binary" = callPackage
@@ -80745,7 +79515,7 @@ self: {
        sha256 = "49c00e6cbe0d54fe72db40fedd92978833e78f5a0d0e26eb192194c14cd1ddc0";
        libraryHaskellDepends = [ base binary bytestring ghc-prim ];
        jailbreak = true;
-       description = "Generic Data.Binary derivation using GHC generics";
+       description = "Generic Data.Binary derivation using GHC generics.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -80762,7 +79532,6 @@ self: {
        ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-deepseq" = callPackage
@@ -80823,8 +79592,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generic-deriving";
-       version = "1.10.3";
-       sha256 = "fc1aed27f229434aaf2cd3d83c201a12108cd9a23023ff6edcb037c0775c0024";
+       version = "1.10.4";
+       sha256 = "42581dce497a8f7867f07465659098b8a3ef75e50bc7e5c6ce16341ca40fdbb0";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -80907,7 +79676,6 @@ self: {
        jailbreak = true;
        description = "Generic implementation of Storable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-tree" = callPackage
@@ -80945,7 +79713,6 @@ self: {
        ];
        description = "Marshalling Haskell values to/from XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-xmlpickler_0_1_0_0" = callPackage
@@ -81004,7 +79771,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "generic-xmlpickler" = callPackage
+  "generic-xmlpickler_0_1_0_4" = callPackage
     ({ mkDerivation, base, generic-deriving, hxt, hxt-pickle-utils
      , tasty, tasty-hunit, tasty-th, text
      }:
@@ -81021,6 +79788,24 @@ self: {
        homepage = "http://github.com/silkapp/generic-xmlpickler";
        description = "Generic generation of HXT XmlPickler instances using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "generic-xmlpickler" = callPackage
+    ({ mkDerivation, base, generic-deriving, hxt, hxt-pickle-utils
+     , tasty, tasty-hunit, tasty-th, text
+     }:
+     mkDerivation {
+       pname = "generic-xmlpickler";
+       version = "0.1.0.5";
+       sha256 = "d51760f5650051eebe561f2b18670657e8398014fa2a623c0e0169bfeca336af";
+       libraryHaskellDepends = [ base generic-deriving hxt text ];
+       testHaskellDepends = [
+         base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
+       ];
+       homepage = "http://github.com/silkapp/generic-xmlpickler";
+       description = "Generic generation of HXT XmlPickler instances using GHC Generics";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "generics-eot" = callPackage
@@ -81139,7 +79924,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genetics" = callPackage
@@ -81153,7 +79937,6 @@ self: {
        executableHaskellDepends = [ base random-fu ];
        description = "A Genetic Algorithm library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geni-gui" = callPackage
@@ -81176,7 +79959,6 @@ self: {
        homepage = "http://projects.haskell.org/GenI";
        description = "GenI graphical user interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geni-util" = callPackage
@@ -81201,7 +79983,6 @@ self: {
        homepage = "http://kowey.github.io/GenI";
        description = "Companion tools for use with the GenI surface realiser";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geniconvert" = callPackage
@@ -81222,7 +80003,6 @@ self: {
        homepage = "http://wiki.loria.fr/wiki/GenI";
        description = "Conversion utility for the GenI generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genifunctors" = callPackage
@@ -81295,7 +80075,6 @@ self: {
        jailbreak = true;
        description = "Simple HTTP server for GenI results";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genprog" = callPackage
@@ -81346,7 +80125,6 @@ self: {
        homepage = "https://github.com/markenwerk/haskell-geo-resolver/";
        description = "Performs geo location lookups and parses the results";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geo-uk" = callPackage
@@ -81452,7 +80230,6 @@ self: {
        ];
        description = "Pure haskell interface to MaxMind GeoIP database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "geojson" = callPackage
@@ -81488,7 +80265,6 @@ self: {
        jailbreak = true;
        description = "package for geometry in euklidean 2d space";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "getemx" = callPackage
@@ -81508,7 +80284,6 @@ self: {
        homepage = "http://bitbucket.org/kenko/getemx";
        description = "Fetch from emusic using .emx files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "getflag" = callPackage
@@ -81520,7 +80295,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Command-line parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "getopt-generics_0_10_0_1" = callPackage
@@ -81575,7 +80349,7 @@ self: {
        sha256 = "f79efd9bef4e4f0ce678fdaaf99ca3f1f70f2dc815c16439d9f97e399805c4dd";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://bitbucket.org/dpwiz/getopt-simple";
-       description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy";
+       description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -81624,9 +80398,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers parsec ];
        homepage = "http://a319-101.ipm.edu.mo/~wke/ggts/impl/";
-       description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS)";
+       description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-core" = callPackage
@@ -81710,7 +80483,6 @@ self: {
        jailbreak = true;
        description = "Explicitly prevent sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-events" = callPackage
@@ -81778,7 +80550,6 @@ self: {
        ];
        description = "Library and tool for parsing .eventlog files from parallel GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-exactprint" = callPackage
@@ -81800,7 +80571,6 @@ self: {
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -82130,7 +80900,6 @@ self: {
        homepage = "https://github.com/23Skidoo/ghc-parmake";
        description = "A parallel wrapper for 'ghc --make'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-parser_0_1_7_0" = callPackage
@@ -82187,7 +80956,6 @@ self: {
        jailbreak = true;
        description = "Simple utility to fix BROKEN package dependencies for cabal-install";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-pkg-lib" = callPackage
@@ -82227,7 +80995,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       description = "Generates data to be used with flamegraph.pl from .prof files";
+       description = "Generates data to be used with flamegraph.pl from .prof files.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -82322,7 +81090,6 @@ self: {
        homepage = "http://github.com/nominolo/ghc-syb";
        description = "Data and Typeable instances for the GHC API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-syb-utils_0_2_2" = callPackage
@@ -82512,7 +81279,6 @@ self: {
        jailbreak = true;
        description = "Display simple diagrams from ghci";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghci-haskeline" = callPackage
@@ -82533,7 +81299,6 @@ self: {
        homepage = "http://code.haskell.org/~judah/ghci-haskeline";
        description = "An implementation of ghci using the Haskeline line-input library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghci-lib" = callPackage
@@ -82705,6 +81470,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghcid_0_5_1" = callPackage
+    ({ mkDerivation, ansi-terminal, base, cmdargs, containers
+     , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
+     , terminal-size, time
+     }:
+     mkDerivation {
+       pname = "ghcid";
+       version = "0.5.1";
+       sha256 = "7fb7bfa501f121418ab8fda46ded58703173b5e1b5aae5dc3433322d19636353";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cmdargs directory extra filepath process terminal-size time
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base cmdargs containers directory extra filepath
+         fsnotify process terminal-size time
+       ];
+       testHaskellDepends = [
+         ansi-terminal base cmdargs containers directory extra filepath
+         fsnotify process tasty tasty-hunit terminal-size time
+       ];
+       homepage = "https://github.com/ndmitchell/ghcid#readme";
+       description = "GHCi based bare bones IDE";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghcjs-codemirror" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -82786,7 +81579,6 @@ self: {
        homepage = "http://github.com/shapr/ghclive/";
        description = "Interactive Haskell interpreter in a browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghczdecode" = callPackage
@@ -82824,7 +81616,6 @@ self: {
        ];
        description = "Trivial routines for inspecting git repositories";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gi-atk" = callPackage
@@ -82860,7 +81651,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cairo-gobject = null;};
 
   "gi-gdk" = callPackage
@@ -82880,7 +81670,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gdk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk3 = null;};
 
   "gi-gdkpixbuf" = callPackage
@@ -82991,7 +81780,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome2.gtk;};
 
   "gi-javascriptcore" = callPackage
@@ -83009,7 +81797,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "JavaScriptCore bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {javascriptcoregtk = null;};
 
   "gi-notify" = callPackage
@@ -83083,7 +81870,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Soup bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) libsoup;};
 
   "gi-vte" = callPackage
@@ -83103,7 +81889,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Vte bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) vte;};
 
   "gi-webkit" = callPackage
@@ -83126,7 +81911,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) webkit;};
 
   "gi-webkit2" = callPackage
@@ -83147,7 +81931,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit2 bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit2gtk = null;};
 
   "gi-webkit2webextension" = callPackage
@@ -83188,8 +81971,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.1.3.0";
-       sha256 = "445dc1d5e65d36a7e7d0cef19c2787da93910dfeb4db7496e9268af9ef176e9c";
+       version = "0.1.5.0";
+       sha256 = "3bce9121a6a351288878839c4dc189dca3e178e89ebe2c9b717bdb54808c361a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83432,7 +82215,6 @@ self: {
        homepage = "http://github.com/simonmichael/gist";
        description = "A reliable command-line client for gist.github.com";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-all" = callPackage
@@ -83452,7 +82234,6 @@ self: {
        homepage = "https://github.com/jwiegley/git-all";
        description = "Determine which Git repositories need actions to be taken";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-annex_5_20150727" = callPackage
@@ -83677,8 +82458,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20160211";
-       sha256 = "0a7d2dab17df27c06a935c469ced47a68d3c018cbb9254c9a735b584d413fb42";
+       version = "6.20160229";
+       sha256 = "1eac609eeedbf01cf088461577b478a3aa99f7ecefa668214308e3b5509c1506";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -83737,7 +82518,6 @@ self: {
        homepage = "https://github.com/dougalstanton/git-checklist";
        description = "Maintain per-branch checklists in Git";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-date" = callPackage
@@ -83756,7 +82536,6 @@ self: {
        homepage = "https://github.com/singpolyma/git-date-haskell";
        description = "Bindings to the date parsing from Git";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-embed" = callPackage
@@ -83838,7 +82617,6 @@ self: {
        homepage = "http://github.com/jwiegley/gitlib";
        description = "More intelligent push-to-GitHub utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-jump" = callPackage
@@ -83916,7 +82694,6 @@ self: {
        homepage = "http://git-repair.branchable.com/";
        description = "repairs a damanged git repisitory";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-sanity" = callPackage
@@ -84026,7 +82803,6 @@ self: {
        homepage = "https://github.com/mattyhall/gitdo";
        description = "Create Github issues out of TODO comments in code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github_0_14_0" = callPackage
@@ -84213,7 +82989,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/relrod/gitignore";
-       description = "Apply GitHub .gitignore templates to already existing repositories";
+       description = "Apply GitHub .gitignore templates to already existing repositories.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -84359,7 +83135,6 @@ self: {
        ];
        description = "Run tests between repositories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-libgit2_3_1_0_3" = callPackage
@@ -84503,7 +83278,6 @@ self: {
        ];
        description = "Gitlib repository backend for storing Git objects in Amazon S3";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-sample" = callPackage
@@ -84572,7 +83346,6 @@ self: {
        ];
        description = "Generic utility functions for working with Git repositories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitrev_1_0_0" = callPackage
@@ -84823,7 +83596,6 @@ self: {
        libraryHaskellDepends = [ base bytestring OpenGL ];
        description = "simple image capture from OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "glade" = callPackage
@@ -84839,7 +83611,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) libglade;};
 
   "gladexml-accessor" = callPackage
@@ -84851,7 +83622,6 @@ self: {
        libraryHaskellDepends = [ base glade HaXml template-haskell ];
        description = "Automagically declares getters for widget handles in specified interface file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glambda" = callPackage
@@ -84895,7 +83665,6 @@ self: {
        homepage = "zyghost.com";
        description = "An OpenGL micro framework";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "glasso" = callPackage
@@ -85044,7 +83813,6 @@ self: {
        testHaskellDepends = [ base data-default hspec lens QuickCheck ];
        description = "Glicko-2 implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glider-nlp" = callPackage
@@ -85059,7 +83827,6 @@ self: {
        homepage = "https://github.com/klangner/glider-nlp";
        description = "Natural Language Processing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glintcollider" = callPackage
@@ -85105,7 +83872,6 @@ self: {
        homepage = "https://github.com/bairyn/global";
        description = "Library enabling unique top-level declarations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "global-config" = callPackage
@@ -85175,7 +83941,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Glome";
        description = "ray tracer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss_1_9_2_1" = callPackage
@@ -85211,7 +83976,6 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-accelerate" = callPackage
@@ -85225,7 +83989,6 @@ self: {
        libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-algorithms" = callPackage
@@ -85238,7 +84001,6 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-banana" = callPackage
@@ -85254,7 +84016,6 @@ self: {
        homepage = "https://github.com/Twey/gloss-banana";
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-devil" = callPackage
@@ -85266,7 +84027,6 @@ self: {
        libraryHaskellDepends = [ base bytestring gloss repa repa-devil ];
        description = "Display images in Gloss using libdevil for decoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-examples" = callPackage
@@ -85289,7 +84049,6 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-game" = callPackage
@@ -85302,7 +84061,6 @@ self: {
        homepage = "https://github.com/mchakravarty/gloss-game";
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-juicy" = callPackage
@@ -85323,7 +84081,6 @@ self: {
        homepage = "http://github.com/alpmestan/gloss-juicy";
        description = "Load any image supported by Juicy.Pixels in your gloss application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-raster" = callPackage
@@ -85340,7 +84097,6 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-raster-accelerate" = callPackage
@@ -85371,7 +84127,6 @@ self: {
        jailbreak = true;
        description = "Gloss picture data types and rendering functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-sodium" = callPackage
@@ -85385,7 +84140,6 @@ self: {
        homepage = "https://github.com/Twey/gloss-sodium";
        description = "A Sodium interface to the Gloss drawing package";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "glpk-hs" = callPackage
@@ -85528,7 +84282,6 @@ self: {
        ];
        description = "turtle like LOGO with glut";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gmap" = callPackage
@@ -85544,7 +84297,6 @@ self: {
        ];
        description = "Composable maps and generic tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gmndl" = callPackage
@@ -85564,7 +84316,6 @@ self: {
        jailbreak = true;
        description = "Mandelbrot Set explorer using GTK";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gnome-desktop" = callPackage
@@ -85580,7 +84331,6 @@ self: {
        ];
        description = "Randomly set a picture as the GNOME desktop background";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gnome-keyring" = callPackage
@@ -85597,7 +84347,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-gnome-keyring/";
        description = "Bindings for libgnome-keyring";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) gnome_keyring;};
 
   "gnomevfs" = callPackage
@@ -85617,7 +84366,6 @@ self: {
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the GNOME Virtual File System library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) gnome_vfs; gnome_vfs_module = null;};
 
   "gnss-converters" = callPackage
@@ -85641,7 +84389,6 @@ self: {
        homepage = "http://github.com/swift-nav/gnss-converters";
        description = "GNSS Converters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gnuidn_0_2_1" = callPackage
@@ -85729,7 +84476,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        description = "GHCi bindings to lambdabot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "goal-core" = callPackage
@@ -85747,6 +84493,7 @@ self: {
          data-default-class gtk lens
        ];
        executableHaskellDepends = [ base ];
+       jailbreak = true;
        description = "Core imports for Geometric Optimization Libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85805,7 +84552,6 @@ self: {
        ];
        description = "Mealy based simulation tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "goatee" = callPackage
@@ -85859,7 +84605,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/gofer-prelude";
        description = "The Gofer 2.30 standard prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol" = callPackage
@@ -87032,7 +85777,6 @@ self: {
        jailbreak = true;
        description = "Google HTML5 Slide generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-mail-filters" = callPackage
@@ -87050,7 +85794,6 @@ self: {
        homepage = "https://github.com/liyang/google-mail-filters";
        description = "Write GMail filters and output to importable XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-oauth2" = callPackage
@@ -87082,7 +85825,6 @@ self: {
        homepage = "https://github.com/liyang/google-search";
        description = "EDSL for Google and GMail search expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-translate" = callPackage
@@ -87117,7 +85859,6 @@ self: {
        homepage = "http://github.com/michaelxavier/GooglePlus";
        description = "Haskell implementation of the Google+ API v1";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "googlepolyline" = callPackage
@@ -87155,7 +85896,6 @@ self: {
        ];
        description = "Spidering robot to download files from Gopherspace";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gore-and-ash" = callPackage
@@ -87360,7 +86100,6 @@ self: {
        ];
        description = "Generic Programming Use in Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gpcsets" = callPackage
@@ -87404,7 +86143,6 @@ self: {
        ];
        description = "For manipulating GPS coordinates and trails";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gps2htmlReport" = callPackage
@@ -87427,7 +86165,6 @@ self: {
        homepage = "https://github.com/robstewart57/Gps2HtmlReport";
        description = "GPS to HTML Summary Report";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gpx-conduit" = callPackage
@@ -87445,7 +86182,6 @@ self: {
        jailbreak = true;
        description = "Read GPX files using conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graceful" = callPackage
@@ -87480,7 +86216,6 @@ self: {
        homepage = "http://projects.haskell.org/grammar-combinators/";
        description = "A parsing library of context-free grammar combinators";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-examples" = callPackage
@@ -87498,7 +86233,6 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "Examples using the Grapefruit library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-frp" = callPackage
@@ -87516,7 +86250,6 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "Functional Reactive Programming core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-records" = callPackage
@@ -87529,7 +86262,6 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-ui" = callPackage
@@ -87547,7 +86279,6 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "Declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-ui-gtk" = callPackage
@@ -87566,7 +86297,6 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-core_0_2_1_0" = callPackage
@@ -87688,7 +86418,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-cl" = callPackage
@@ -87709,7 +86438,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Interactive graph rewriting system implementing various well-known combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-gl" = callPackage
@@ -87727,7 +86455,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "OpenGL interface for interactive port graph rewriting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-lambdascope" = callPackage
@@ -87749,7 +86476,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-layout" = callPackage
@@ -87766,7 +86492,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Force-directed node placement intended for incremental graph drawing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-ski" = callPackage
@@ -87786,7 +86511,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-strategies" = callPackage
@@ -87803,7 +86527,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluation strategies for port-graph rewriting systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-trs" = callPackage
@@ -87825,7 +86548,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-ww" = callPackage
@@ -87846,7 +86568,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-serialize" = callPackage
@@ -87876,7 +86597,6 @@ self: {
        homepage = "http://github.com/konn/graph-utils/";
        description = "A simple wrapper & quasi quoter for fgl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-visit" = callPackage
@@ -87929,7 +86649,6 @@ self: {
        homepage = "https://github.com/tel/graphbuilder";
        description = "A declarative, monadic graph construction language for small graphs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphene" = callPackage
@@ -87967,7 +86686,6 @@ self: {
        homepage = "http://github.com/luqui/graphics-drawingcombinators";
        description = "A functional interface to 2D drawing in OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "graphics-formats-collada" = callPackage
@@ -87985,7 +86703,6 @@ self: {
        homepage = "http://github.com/luqui/collada";
        description = "Load 3D geometry in the COLLADA format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphicsFormats" = callPackage
@@ -87997,7 +86714,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ];
        description = "Classes for renderable objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphicstools" = callPackage
@@ -88017,7 +86733,6 @@ self: {
        homepage = "https://yousource.it.jyu.fi/cvlab/pages/GraphicsTools";
        description = "Tools for creating graphical UIs, based on wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphmod" = callPackage
@@ -88114,7 +86829,6 @@ self: {
        homepage = "http://github.com/explicitcall/graphtype";
        description = "A simple tool to illustrate dependencies between Haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphviz_2999_17_0_1" = callPackage
@@ -88292,6 +87006,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graylog" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, bytestring, file-embed
+     , network, random, scientific, tasty, tasty-hunit, text, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "graylog";
+       version = "0.1.0.1";
+       sha256 = "2d8173e61da8d02c39cb95e6ccea8a167c792f682a496aed5fe4edfd0e6a0082";
+       libraryHaskellDepends = [
+         aeson aeson-casing base bytestring network random scientific text
+         time vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-casing base bytestring file-embed network scientific
+         tasty tasty-hunit text time vector
+       ];
+       homepage = "https://github.com/AndrewRademacher/haskell-graylog";
+       description = "Support for graylog output";
+       license = "unknown";
+     }) {};
+
   "greencard" = callPackage
     ({ mkDerivation, array, base, containers, pretty }:
      mkDerivation {
@@ -88305,7 +87041,6 @@ self: {
        homepage = "https://github.com/sof/greencard";
        description = "GreenCard, a foreign function pre-processor for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greencard-lib" = callPackage
@@ -88318,7 +87053,6 @@ self: {
        homepage = "http://www.haskell.org/greencard/";
        description = "A foreign function interface pre-processor library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greg-client" = callPackage
@@ -88335,7 +87069,6 @@ self: {
        homepage = "http://code.google.com/p/greg/";
        description = "A scalable distributed logger with a high-precision global time axis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gremlin-haskell" = callPackage
@@ -88360,7 +87093,6 @@ self: {
        homepage = "http://github.com/nakaji-dayo/gremlin-haskell";
        description = "Graph database client for TinkerPop3 Gremlin Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greplicate" = callPackage
@@ -88432,7 +87164,6 @@ self: {
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "grm" = callPackage
@@ -88454,7 +87185,6 @@ self: {
        executableToolDepends = [ happy ];
        description = "grm grammar converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groom" = callPackage
@@ -88780,7 +87510,7 @@ self: {
        libraryHaskellDepends = [ base containers deepseq pointed ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
-       description = "Grouped lists. Equal consecutive elements are grouped";
+       description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -88796,7 +87526,7 @@ self: {
        libraryHaskellDepends = [ base containers deepseq pointed ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
-       description = "Grouped lists. Equal consecutive elements are grouped";
+       description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -88879,7 +87609,6 @@ self: {
        jailbreak = true;
        description = "fractal explorer GUI using the ruff library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gruff-examples" = callPackage
@@ -88899,7 +87628,6 @@ self: {
        jailbreak = true;
        description = "Mandelbrot Set examples using ruff and gruff";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gsasl" = callPackage
@@ -88937,7 +87665,6 @@ self: {
        homepage = "http://github.com/patperry/hs-gsl-random";
        description = "Bindings the the GSL random number generation facilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gsl-random-fu" = callPackage
@@ -88950,7 +87677,6 @@ self: {
        homepage = "http://code.haskell.org/~mokus/gsl-random-fu";
        description = "Instances for using gsl-random with random-fu";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gsmenu" = callPackage
@@ -88970,7 +87696,6 @@ self: {
        homepage = "http://sigkill.dk/programs/gsmenu";
        description = "A visual generic menu";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gstreamer" = callPackage
@@ -88990,7 +87715,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gst_plugins_base; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
@@ -89024,7 +87748,6 @@ self: {
        ];
        description = "The General Transit Feed Specification format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk_0_13_3" = callPackage
@@ -89226,7 +87949,6 @@ self: {
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk-mac-integration-gtk2 = null;};
 
   "gtk-serialized-event" = callPackage
@@ -89245,7 +87967,6 @@ self: {
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "GTK+ Serialized event";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk2 = null;};
 
   "gtk-simple-list-view" = callPackage
@@ -89282,7 +88003,6 @@ self: {
        jailbreak = true;
        description = "Convenient Gtk canvas with mouse and keyboard input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk-traymanager" = callPackage
@@ -89373,7 +88093,6 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: glade package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-glib" = callPackage
@@ -89400,7 +88119,6 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gnomevfs package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gtk" = callPackage
@@ -89416,7 +88134,6 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gtk package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gtkglext" = callPackage
@@ -89432,7 +88149,6 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gtkglext package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gtksourceview2" = callPackage
@@ -89487,7 +88203,6 @@ self: {
        jailbreak = true;
        description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk3_0_13_4" = callPackage
@@ -89713,7 +88428,6 @@ self: {
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk-mac-integration-gtk3 = null;};
 
   "gtkglext" = callPackage
@@ -89731,7 +88445,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) gtkglext;};
 
   "gtkimageview" = callPackage
@@ -89751,7 +88464,6 @@ self: {
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the GtkImageView library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gtkimageview;};
 
   "gtkrsync" = callPackage
@@ -89770,7 +88482,6 @@ self: {
        homepage = "http://hg.complete.org/gtkrsync";
        description = "Gnome rsync progress display";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtksourceview2" = callPackage
@@ -89832,7 +88543,6 @@ self: {
        homepage = "http://code.atnnn.com/project/guess";
        description = "Generate simple combinators given their type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gulcii" = callPackage
@@ -89897,7 +88607,6 @@ self: {
        homepage = "https://github.com/Fuuzetsu/h-booru";
        description = "Haskell library for retrieving data from various booru image sites";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "h-gpgme" = callPackage
@@ -89919,7 +88628,6 @@ self: {
        jailbreak = true;
        homepage = "https://github.com/rethab/h-gpgme";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "h2048" = callPackage
@@ -89984,7 +88692,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to CMU/Long's BDD library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {bdd = null; mem = null;};
 
   "hBDD-CUDD" = callPackage
@@ -90000,7 +88707,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to the CUDD library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cudd = null; epd = null; inherit (pkgs) mtr; 
          inherit (pkgs) st; util = null;};
 
@@ -90018,7 +88724,6 @@ self: {
        jailbreak = true;
        description = "interface to CSound API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {csound64 = null; inherit (pkgs) libsndfile;};
 
   "hDFA" = callPackage
@@ -90030,7 +88735,6 @@ self: {
        libraryHaskellDepends = [ base containers directory process ];
        description = "A simple library for representing and minimising DFAs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hF2" = callPackage
@@ -90042,7 +88746,6 @@ self: {
        libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hGelf" = callPackage
@@ -90102,7 +88805,6 @@ self: {
        homepage = "http://github.com/itkovian/hMollom";
        description = "Library to interact with the @Mollom anti-spam service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hOpenPGP_1_11" = callPackage
@@ -90307,7 +89009,6 @@ self: {
        homepage = "http://floss.scru.org/hOpenPGP/";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPDB_1_2_0" = callPackage
@@ -90484,7 +89185,6 @@ self: {
        homepage = "https://github.com/BioHaskell/hPDB-examples";
        description = "Examples for hPDB library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPushover" = callPackage
@@ -90513,7 +89213,6 @@ self: {
        libraryHaskellDepends = [ array base containers unix ];
        description = "R bindings and interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hRESP" = callPackage
@@ -90579,7 +89278,6 @@ self: {
        jailbreak = true;
        description = "Interface to Amazon's SimpleDB service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hTalos" = callPackage
@@ -90594,7 +89292,6 @@ self: {
        homepage = "https://github.com/mgajda/hTalos";
        description = "Parser, print and manipulate structures in PDB file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hTensor" = callPackage
@@ -90622,7 +89319,6 @@ self: {
        homepage = "http://dslsrv4.cs.missouri.edu/~qqbm9";
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "hXmixer" = callPackage
@@ -90658,7 +89354,6 @@ self: {
        homepage = "https://github.com/mhwombat/haar";
        description = "Haar wavelet transforms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hacanon-light" = callPackage
@@ -90701,7 +89396,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hack-contrib";
        description = "Hack contrib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-contrib-press" = callPackage
@@ -90719,7 +89413,6 @@ self: {
        homepage = "http://github.com/bickfordb/hack-contrib-press";
        description = "Hack helper that renders Press templates";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-frontend-happstack" = callPackage
@@ -90737,7 +89430,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "hack-frontend-happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-frontend-monadcgi" = callPackage
@@ -90781,7 +89473,6 @@ self: {
        homepage = "https://gitlab.com/twittner/hack-handler-epoll";
        description = "hack handler implementation using epoll";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-handler-evhttp" = callPackage
@@ -90800,7 +89491,6 @@ self: {
        homepage = "http://github.com/bickfordb/hack-handler-evhttp";
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {event = null;};
 
   "hack-handler-fastcgi" = callPackage
@@ -90815,7 +89505,6 @@ self: {
        homepage = "http://github.com/snoyberg/hack-handler-fastcgi/tree/master";
        description = "Hack handler direct to fastcgi (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fcgi;};
 
   "hack-handler-happstack" = callPackage
@@ -90833,7 +89522,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hack-handler-happstack";
        description = "Hack Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-handler-hyena" = callPackage
@@ -90850,7 +89538,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hack-handler-hyena";
        description = "Hyena hack handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-handler-kibro" = callPackage
@@ -90865,7 +89552,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "Hack Kibro handler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-handler-simpleserver" = callPackage
@@ -90883,7 +89569,6 @@ self: {
        homepage = "http://github.com/snoyberg/hack-handler-simpleserver/tree/master";
        description = "A simplistic HTTP server handler for Hack. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-middleware-cleanpath" = callPackage
@@ -90898,7 +89583,6 @@ self: {
        homepage = "http://github.com/snoyberg/hack-middleware-cleanpath/tree/master";
        description = "Applies some basic redirect rules to get cleaner paths. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-middleware-clientsession" = callPackage
@@ -90915,7 +89599,6 @@ self: {
        homepage = "http://github.com/snoyberg/hack-middleware-clientsession/tree/master";
        description = "Middleware for easily keeping session data in client cookies. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-middleware-gzip" = callPackage
@@ -90944,7 +89627,6 @@ self: {
        homepage = "http://github.com/snoyberg/hack-middleware-jsonp/tree/master";
        description = "Automatic wrapping of JSON responses to convert into JSONP. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack2" = callPackage
@@ -91010,7 +89692,6 @@ self: {
        homepage = "https://github.com/nfjinjing/hack2-handler-happstack-server";
        description = "Hack2 Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack2-handler-mongrel2-http" = callPackage
@@ -91031,7 +89712,6 @@ self: {
        homepage = "https://github.com/nfjinjing/hack2-handler-mongrel2-http";
        description = "Hack2 Mongrel2 HTTP handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack2-handler-snap-server" = callPackage
@@ -91067,7 +89747,6 @@ self: {
        homepage = "https://github.com/nfjinjing/hack2-handler-warp";
        description = "Hack2 warp handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack2-interface-wai" = callPackage
@@ -91086,7 +89765,6 @@ self: {
        homepage = "https://github.com/nfjinjing/hack2-interface-wai";
        description = "Hack2 interface of WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-db" = callPackage
@@ -91233,7 +89911,6 @@ self: {
        homepage = "http://github.com/snoyberg/hackage-proxy";
        description = "Provide a proxy for Hackage which modifies responses in some way. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-repo-tool" = callPackage
@@ -91256,7 +89933,6 @@ self: {
        homepage = "https://github.com/well-typed/hackage-security";
        description = "Utility to manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-security" = callPackage
@@ -91283,7 +89959,6 @@ self: {
        homepage = "https://github.com/well-typed/hackage-security";
        description = "Hackage security library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-security-HTTP" = callPackage
@@ -91301,7 +89976,6 @@ self: {
        homepage = "https://github.com/well-typed/hackage-security";
        description = "Hackage security bindings against the HTTP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-server" = callPackage
@@ -91340,7 +90014,6 @@ self: {
        jailbreak = true;
        description = "The Hackage web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-sparks" = callPackage
@@ -91360,7 +90033,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/hackage-sparks";
        description = "Generate sparkline graphs of hackage statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-whatsnew" = callPackage
@@ -91393,7 +90065,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/hackage2hwn";
        description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage2twitter" = callPackage
@@ -91408,7 +90079,6 @@ self: {
        homepage = "http://github.com/tomlokhorst/hackage2twitter";
        description = "Send new Hackage releases to Twitter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackager" = callPackage
@@ -91445,7 +90115,6 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "API for Hacker News";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackertyper" = callPackage
@@ -91508,7 +90177,6 @@ self: {
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hactor" = callPackage
@@ -91527,7 +90195,6 @@ self: {
        homepage = "https://github.com/Forkk/hactor";
        description = "Lightweight Erlang-style actors for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hactors" = callPackage
@@ -91656,7 +90323,6 @@ self: {
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haddock-library_1_1_1" = callPackage
@@ -91831,7 +90497,6 @@ self: {
        homepage = "http://github.com/tych0/haggis";
        description = "A static site generator with blogging/comments support";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haha" = callPackage
@@ -91885,7 +90550,6 @@ self: {
        ];
        description = "A typed template engine, subset of jinja2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hailgun" = callPackage
@@ -92010,7 +90674,6 @@ self: {
        homepage = "https://github.com/tfausak/hairy";
        description = "A JSON REST API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakaru" = callPackage
@@ -92041,7 +90704,6 @@ self: {
        homepage = "http://indiana.edu/~ppaml/";
        description = "A probabilistic programming embedded DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hake" = callPackage
@@ -92072,7 +90734,6 @@ self: {
        homepage = "https://code.reaktor42.de/projects/hakismet";
        description = "Akismet spam protection library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hako" = callPackage
@@ -92523,7 +91184,6 @@ self: {
        jailbreak = true;
        description = "A package allowing to write Hakyll blog posts in Rmd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-agda" = callPackage
@@ -92554,7 +91214,6 @@ self: {
        jailbreak = true;
        description = "Blaze templates for Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-contrib" = callPackage
@@ -92571,7 +91230,6 @@ self: {
        homepage = "http://jaspervdj.be/hakyll";
        description = "Extra modules for the hakyll website compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-contrib-hyphenation" = callPackage
@@ -92605,7 +91263,6 @@ self: {
        jailbreak = true;
        description = "A hakyll library that helps maintain a separate links database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-convert" = callPackage
@@ -92627,7 +91284,6 @@ self: {
        homepage = "http://github.com/kowey/hakyll-convert";
        description = "Convert from other blog engines to Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-elm" = callPackage
@@ -92706,7 +91362,6 @@ self: {
        homepage = "http://github.com/haskell-suite/halberd/";
        description = "A tool to generate missing import statements for Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "half_0_2_0_1" = callPackage
@@ -92784,7 +91439,6 @@ self: {
        jailbreak = true;
        description = "The HAskelL File System (\"halfs\" -- intended for use on the HaLVM)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halipeto" = callPackage
@@ -92798,7 +91452,6 @@ self: {
        homepage = "http://github.com/peti/halipeto";
        description = "Haskell Static Web Page Generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halive" = callPackage
@@ -92906,7 +91559,6 @@ self: {
        jailbreak = true;
        description = "Haskell macro preprocessor";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hamtmap" = callPackage
@@ -92919,7 +91571,6 @@ self: {
        homepage = "https://github.com/exclipy/pdata";
        description = "A purely functional and persistent hash map";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hamusic" = callPackage
@@ -92941,7 +91592,6 @@ self: {
        homepage = "https://troglodita.di.uminho.pt/svn/musica/work/HaMusic";
        description = "Library to handle abstract music";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "handa-gdata" = callPackage
@@ -93042,7 +91692,6 @@ self: {
        homepage = "https://github.com/utdemir/handsy";
        description = "A DSL to describe common shell operations and interpeters for running them locally and remotely";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hangman" = callPackage
@@ -93077,7 +91726,6 @@ self: {
        jailbreak = true;
        description = "Simple Continuous Integration/Deployment System";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hans" = callPackage
@@ -93144,7 +91792,6 @@ self: {
        ];
        description = "Graphviz code generation with Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hapistrano" = callPackage
@@ -93187,7 +91834,6 @@ self: {
        jailbreak = true;
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {appindicator = null;};
 
   "happindicator3" = callPackage
@@ -93205,7 +91851,6 @@ self: {
        homepage = "https://github.com/mlacorte/happindicator3";
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {appindicator = null;};
 
   "happraise" = callPackage
@@ -93219,7 +91864,6 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "A small program for counting the comments in haskell source";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happs-hsp" = callPackage
@@ -93233,7 +91877,6 @@ self: {
          base bytestring HAppS-Server hsp mtl plugins
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happs-hsp-template" = callPackage
@@ -93250,7 +91893,6 @@ self: {
        ];
        description = "Utilities for using HSP templates in HAppS applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happs-tutorial" = callPackage
@@ -93274,9 +91916,8 @@ self: {
          syb
        ];
        jailbreak = true;
-       description = "A Happstack Tutorial that is its own web 2.0-type demo";
+       description = "A Happstack Tutorial that is its own web 2.0-type demo.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack" = callPackage
@@ -93313,7 +91954,6 @@ self: {
        homepage = "http://n-sch.de/happstack-auth";
        description = "A Happstack Authentication Suite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-authenticate_2_3_2" = callPackage
@@ -93444,7 +92084,6 @@ self: {
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-data" = callPackage
@@ -93468,7 +92107,6 @@ self: {
        homepage = "http://happstack.com";
        description = "Happstack data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-dlg" = callPackage
@@ -93487,7 +92125,6 @@ self: {
        homepage = "http://patch-tag.com/r/cdsmith/happstack-dlg";
        description = "Cross-request user interactions for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-facebook" = callPackage
@@ -93515,7 +92152,6 @@ self: {
        homepage = "http://src.seereason.com/happstack-facebook/";
        description = "A package for building Facebook applications using Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-fastcgi" = callPackage
@@ -93549,7 +92185,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-fay-ajax" = callPackage
@@ -93614,7 +92249,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Support for using Heist templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-helpers" = callPackage
@@ -93640,7 +92274,6 @@ self: {
        homepage = "http://patch-tag.com/r/tphyahoo/HAppSHelpers/home";
        description = "Convenience functions for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-hsp" = callPackage
@@ -93695,7 +92328,6 @@ self: {
        homepage = "http://happstack.com";
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-jmacro" = callPackage
@@ -93743,7 +92375,6 @@ self: {
        ];
        description = "monad-peel instances for Happstack types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-plugins" = callPackage
@@ -93761,7 +92392,6 @@ self: {
        homepage = "http://happstack.com";
        description = "The haskell application server stack + reload";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-server_7_3_9" = callPackage
@@ -94007,7 +92637,6 @@ self: {
        homepage = "http://happstack.com";
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-static-routing" = callPackage
@@ -94047,7 +92676,6 @@ self: {
        homepage = "http://happstack.com";
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-yui" = callPackage
@@ -94070,7 +92698,6 @@ self: {
        homepage = "http://hub.darcs.net/dag/yui/browse/happstack-yui";
        description = "Utilities for using YUI3 with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happy_1_19_4" = callPackage
@@ -94142,7 +92769,6 @@ self: {
        homepage = "https://github.com/cstrahan/happybara";
        description = "Acceptance test framework for web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happybara-webkit" = callPackage
@@ -94164,7 +92790,6 @@ self: {
        homepage = "https://github.com/cstrahan/happybara/happybara-webkit";
        description = "WebKit Happybara driver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happybara-webkit-server" = callPackage
@@ -94178,7 +92803,6 @@ self: {
        homepage = "https://github.com/cstrahan/happybara/happybara-webkit-server";
        description = "WebKit Server binary for Happybara (taken from capybara-webkit)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "har" = callPackage
@@ -94214,7 +92838,6 @@ self: {
        homepage = "http://www.davidb.org/darcs/harchive/";
        description = "Networked content addressed backup and restore software";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;};
 
   "hardware-edsl" = callPackage
@@ -94232,7 +92855,6 @@ self: {
        homepage = "https://github.com/markus-git/hardware-edsl";
        description = "Deep embedding of hardware descriptions with code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hark" = callPackage
@@ -94252,7 +92874,6 @@ self: {
        homepage = "http://code.google.com/p/hark/";
        description = "A Gentoo package query tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "harmony" = callPackage
@@ -94277,7 +92898,6 @@ self: {
        ];
        description = "A web service specification compiler that generates implementation and tests";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haroonga" = callPackage
@@ -94294,7 +92914,6 @@ self: {
        libraryPkgconfigDepends = [ groonga ];
        description = "Low level bindings for Groonga";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {groonga = null;};
 
   "haroonga-httpd" = callPackage
@@ -94314,7 +92933,6 @@ self: {
        jailbreak = true;
        description = "Yet another Groonga http server";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "harp" = callPackage
@@ -94358,7 +92976,6 @@ self: {
        homepage = "http://github.com/nonowarn/has";
        description = "Entity based records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "has-th" = callPackage
@@ -94371,7 +92988,6 @@ self: {
        homepage = "http://github.com/chrisdone/has-th";
        description = "Template Haskell function for Has records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascal" = callPackage
@@ -94389,7 +93005,6 @@ self: {
        homepage = "http://darcsden.com/mekeor/hascal";
        description = "A minimalistic but extensible and precise calculator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascat" = callPackage
@@ -94409,7 +93024,6 @@ self: {
        jailbreak = true;
        description = "Hascat Web Server";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascat-lib" = callPackage
@@ -94428,7 +93042,6 @@ self: {
        jailbreak = true;
        description = "Hascat Package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascat-setup" = callPackage
@@ -94450,7 +93063,6 @@ self: {
        doHaddock = false;
        description = "Hascat Installation helper";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascat-system" = callPackage
@@ -94468,7 +93080,6 @@ self: {
        jailbreak = true;
        description = "Hascat System Package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hash" = callPackage
@@ -94489,7 +93100,6 @@ self: {
        homepage = "http://github.com/analytics/hash/";
        description = "Hashing tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable_1_2_3_0" = callPackage
@@ -94704,9 +93314,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/wowus/hashable-generics";
-       description = "Automatically generates Hashable instances with GHC.Generics";
+       description = "Automatically generates Hashable instances with GHC.Generics.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable-time" = callPackage
@@ -94755,7 +93364,6 @@ self: {
        ];
        description = "Hashed file storage support code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashids" = callPackage
@@ -94769,7 +93377,6 @@ self: {
        homepage = "http://hashids.org/";
        description = "Hashids generates short, unique, non-sequential ids from numbers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashmap" = callPackage
@@ -94887,7 +93494,6 @@ self: {
        homepage = "http://huygens.functor.nl/hasim/";
        description = "Process-Based Discrete Event Simulation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hask" = callPackage
@@ -94906,7 +93512,6 @@ self: {
        homepage = "http://github.com/ekmett/hask";
        description = "Categories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hask-home" = callPackage
@@ -94926,7 +93531,6 @@ self: {
        homepage = "http://gregheartsfield.com/hask-home";
        description = "Generate homepages for cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskades" = callPackage
@@ -94966,7 +93570,6 @@ self: {
        homepage = "http://github.com/cosbynator/haskakafka";
        description = "Kafka bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rdkafka;};
 
   "haskanoid" = callPackage
@@ -94986,7 +93589,6 @@ self: {
        homepage = "http://github.com/ivanperez-keera/haskanoid";
        description = "A breakout game written in Yampa using SDL";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "haskarrow" = callPackage
@@ -95004,7 +93606,6 @@ self: {
        ];
        description = "A dialect of haskell with order of execution based on dependency resolution";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskbot-core" = callPackage
@@ -95091,7 +93692,6 @@ self: {
        homepage = "http://www.korgwal.com/haskeem/";
        description = "A small scheme interpreter";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskeline_0_7_2_1" = callPackage
@@ -95143,7 +93743,6 @@ self: {
        homepage = "http://community.haskell.org/~aslatter/code/haskeline-class";
        description = "Class interface for working with Haskeline";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-aliyun" = callPackage
@@ -95167,7 +93766,6 @@ self: {
        homepage = "https://github.com/yihuang/haskell-aliyun/";
        description = "haskell client of aliyun service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-awk" = callPackage
@@ -95198,7 +93796,6 @@ self: {
        ];
        description = "Transform text from the command-line using Haskell expressions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-bcrypt" = callPackage
@@ -95212,7 +93809,6 @@ self: {
        homepage = "http://www.github.com/zbskii/haskell-bcrypt";
        description = "A bcrypt implementation for haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-brainfuck" = callPackage
@@ -95233,7 +93829,6 @@ self: {
        jailbreak = true;
        description = "BrainFuck interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-cnc" = callPackage
@@ -95255,7 +93850,6 @@ self: {
        homepage = "http://software.intel.com/en-us/articles/intel-concurrent-collections-for-cc/";
        description = "Library for parallel programming in the Intel Concurrent Collections paradigm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-coffee" = callPackage
@@ -95298,7 +93892,6 @@ self: {
        jailbreak = true;
        description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-docs" = callPackage
@@ -95365,7 +93958,6 @@ self: {
        homepage = "https://github.com/evolutics/haskell-formatter";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-ftp" = callPackage
@@ -95394,7 +93986,6 @@ self: {
        homepage = "https://github.com/yihuang/haskell-ftp";
        description = "A Haskell ftp server with configurable backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-generate" = callPackage
@@ -95412,7 +94003,6 @@ self: {
        homepage = "http://github.com/bennofs/haskell-generate/";
        description = "Typesafe generation of haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-gi" = callPackage
@@ -95487,7 +94077,6 @@ self: {
        homepage = "http://www.informatik.uni-bremen.de/~cxl/lehre/pi3.ws01/asteroids/";
        description = "'Asteroids' arcade games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-kubernetes" = callPackage
@@ -95687,7 +94276,6 @@ self: {
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-neo4j-client_0_3_1_4" = callPackage
@@ -95800,7 +94388,6 @@ self: {
        homepage = "https://github.com/brooksbp/haskell-openflow";
        description = "OpenFlow protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-packages_0_2_4_3" = callPackage
@@ -95887,7 +94474,6 @@ self: {
        homepage = "http://michaeldadams.org/projects/haskell-pdf-presenter/";
        description = "Tool for presenting PDF-based presentations";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-platform-test" = callPackage
@@ -95918,7 +94504,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/haskell-platform-test";
        description = "A test system for the Haskell Platform environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-plot" = callPackage
@@ -95936,7 +94521,6 @@ self: {
        homepage = "https://github.com/kaizhang/haskell-plot";
        description = "A library for generating 2D plots painlessly";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-qrencode" = callPackage
@@ -95979,7 +94563,6 @@ self: {
        ];
        description = "Reflect Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-rules" = callPackage
@@ -95991,7 +94574,6 @@ self: {
        libraryHaskellDepends = [ base syb ];
        description = "A DSL for expressing natural deduction rules in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-spacegoo" = callPackage
@@ -96234,7 +94816,6 @@ self: {
        jailbreak = true;
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-token-utils" = callPackage
@@ -96260,7 +94841,6 @@ self: {
        homepage = "https://github.com/alanz/haskell-token-utils";
        description = "Utilities to tie up tokens to an AST";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tor" = callPackage
@@ -96296,7 +94876,6 @@ self: {
        homepage = "http://github.com/GaloisInc/haskell-tor";
        description = "A Haskell Tor Node";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-type-exts" = callPackage
@@ -96311,7 +94890,6 @@ self: {
        homepage = "http://code.haskell.org/haskell-type-exts";
        description = "A type checker for Haskell/haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-typescript" = callPackage
@@ -96336,7 +94914,6 @@ self: {
        homepage = "https://github.com/PeterScott/haskell-tyrant";
        description = "Haskell implementation of the Tokyo Tyrant binary protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-updater" = callPackage
@@ -96374,7 +94951,6 @@ self: {
        homepage = "http://patch-tag.com/r/adept/haskell-xmpp/home";
        description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell2010" = callPackage
@@ -96388,7 +94964,6 @@ self: {
        homepage = "http://www.haskell.org/onlinereport/haskell2010/";
        description = "Compatibility with Haskell 2010";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell98" = callPackage
@@ -96406,7 +94981,6 @@ self: {
        homepage = "http://www.haskell.org/definition/";
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell98libraries" = callPackage
@@ -96452,7 +95026,6 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HDBC session for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-mtl" = callPackage
@@ -96469,7 +95042,6 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-tf" = callPackage
@@ -96487,7 +95059,6 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-transformers" = callPackage
@@ -96505,7 +95076,6 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-connect-hdbc-lifted" = callPackage
@@ -96523,7 +95093,6 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using lifted-base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-dynamic" = callPackage
@@ -96540,7 +95109,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the dynamically loaded drivers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-flat" = callPackage
@@ -96594,7 +95162,6 @@ self: {
        jailbreak = true;
        description = "HaskellDB support for the HDBC MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hdbc-odbc" = callPackage
@@ -96663,7 +95230,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for HSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hsql-mysql" = callPackage
@@ -96683,7 +95249,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hsql-odbc" = callPackage
@@ -96703,7 +95268,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL ODBC driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hsql-oracle" = callPackage
@@ -96743,7 +95307,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hsql-sqlite" = callPackage
@@ -96783,7 +95346,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL SQLite3 driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-th" = callPackage
@@ -96808,7 +95370,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for WXHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskellscrabble" = callPackage
@@ -96819,8 +95380,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskellscrabble";
-       version = "2.0.1";
-       sha256 = "514e4af38a6e889532437fcfad09479c247e0097c01f5f01295b01beda4596e4";
+       version = "2.2.1";
+       sha256 = "2a3ce64f81105d0ff7d728bce181665edddbec3432eefbebd4bc4b58f2412361";
        libraryHaskellDepends = [
          array arrows base containers errors listsafe mtl parsec QuickCheck
          random safe semigroups split transformers unordered-containers
@@ -96834,7 +95395,6 @@ self: {
        homepage = "http://www.github.com/happy0/haskellscrabble";
        description = "A scrabble library capturing the core game logic of scrabble";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskellscript" = callPackage
@@ -96898,7 +95458,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/HaskGame";
        description = "Haskell game library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskheap" = callPackage
@@ -96917,7 +95476,6 @@ self: {
        homepage = "https://github.com/Raynes/haskheap";
        description = "Haskell bindings to refheap";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskhol-core" = callPackage
@@ -96938,7 +95496,6 @@ self: {
        homepage = "http://haskhol.org";
        description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskintex_0_5_0_2" = callPackage
@@ -97069,7 +95626,6 @@ self: {
        homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of the Bitcoin protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-core" = callPackage
@@ -97099,7 +95655,6 @@ self: {
        homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of the core Bitcoin protocol features";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-crypto" = callPackage
@@ -97124,7 +95679,6 @@ self: {
        homepage = "http://github.com/plaprade/haskoin-crypto";
        description = "Implementation of Bitcoin cryptographic primitives";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-node" = callPackage
@@ -97155,7 +95709,6 @@ self: {
        homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of a Bitoin node";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-protocol" = callPackage
@@ -97178,7 +95731,6 @@ self: {
        homepage = "http://github.com/plaprade/haskoin-protocol";
        description = "Implementation of the Bitcoin network protocol messages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-script" = callPackage
@@ -97203,7 +95755,6 @@ self: {
        homepage = "http://github.com/plaprade/haskoin-script";
        description = "Implementation of Bitcoin script parsing and evaluation";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-util" = callPackage
@@ -97226,7 +95777,6 @@ self: {
        homepage = "http://github.com/plaprade/haskoin-util";
        description = "Utility functions for the Network.Haskoin project";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-wallet" = callPackage
@@ -97267,7 +95817,6 @@ self: {
        homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoon" = callPackage
@@ -97285,7 +95834,6 @@ self: {
        ];
        description = "Web Application Abstraction";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoon-httpspec" = callPackage
@@ -97301,7 +95849,6 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoon-salvia" = callPackage
@@ -97319,7 +95866,6 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskore" = callPackage
@@ -97345,7 +95891,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Haskore";
        description = "The Haskore Computer Music System";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskore-realtime" = callPackage
@@ -97364,7 +95909,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Haskore/";
        description = "Routines for realtime playback of Haskore songs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskore-supercollider" = callPackage
@@ -97388,7 +95932,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/SuperCollider";
        description = "Haskore back-end for SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskore-synthesizer" = callPackage
@@ -97410,7 +95953,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Music rendering coded in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskore-vintage" = callPackage
@@ -97456,7 +95998,6 @@ self: {
        executableHaskellDepends = [ mtl old-time QuickCheck time wtk ];
        description = "Loan calculator engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasloGUI" = callPackage
@@ -97473,9 +96014,8 @@ self: {
          base convertible gtk haslo lenses mtl old-time QuickCheck time wtk
          wtk-gtk
        ];
-       description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library";
+       description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasparql-client" = callPackage
@@ -97488,7 +96028,6 @@ self: {
        homepage = "https://github.com/lhpaladin/HaSparql-Client";
        description = "This package enables to write SPARQL queries to remote endpoints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haspell" = callPackage
@@ -98031,7 +96570,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-pool";
        description = "A pool of connections for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-postgres_0_7_3" = callPackage
@@ -98353,7 +96891,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-postgres";
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-postgres-options" = callPackage
@@ -98370,7 +96907,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-postgres-options";
        description = "An \"optparse-applicative\" parser for \"hasql-postgres\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-th" = callPackage
@@ -98387,7 +96923,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-th";
        description = "Template Haskell utilities for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-transaction" = callPackage
@@ -98408,7 +96943,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-transaction";
        description = "A composable abstraction over the retryable transactions for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hastache_0_6_0" = callPackage
@@ -98507,8 +97041,8 @@ self: {
      }:
      mkDerivation {
        pname = "haste-compiler";
-       version = "0.5.4";
-       sha256 = "4018bf4abf3ece8ee577ae5983cac0b016ae96098c704aeecd9698365c3a021e";
+       version = "0.5.4.1";
+       sha256 = "e10aa93a2a0507301d984f2e446ac12250a769a7142ad3a68a65108824ae1bf8";
        configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
@@ -98555,7 +97089,6 @@ self: {
        homepage = "https://github.com/agocorona/haste-perch";
        description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hastily" = callPackage
@@ -98622,7 +97155,6 @@ self: {
        homepage = "http://projects.haskell.org/hat/";
        description = "The Haskell tracer, generating and viewing Haskell execution traces";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hatex-guide" = callPackage
@@ -98639,7 +97171,6 @@ self: {
        ];
        description = "HaTeX User's Guide";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hath" = callPackage
@@ -98710,7 +97241,6 @@ self: {
        jailbreak = true;
        description = "Implementation of the rules of Love Letter";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hawitter" = callPackage
@@ -98730,9 +97260,8 @@ self: {
          regex-tdfa SHA time utf8-string
        ];
        homepage = "http://d.hatena.ne.jp/xanxys/20100321/1269137834";
-       description = "A twitter client for GTK+. Beta version";
+       description = "A twitter client for GTK+. Beta version.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxl" = callPackage
@@ -98828,7 +97357,6 @@ self: {
        homepage = "https://github.com/joelteon/haxparse";
        description = "Readable HaxBall replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxr_3000_10_3_1" = callPackage
@@ -98990,7 +97518,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mesa; inherit (pkgs) wayland;};
 
   "hayoo-cli" = callPackage
@@ -99011,7 +97538,6 @@ self: {
        homepage = "https://github.com/Gonzih/hayoo-cli";
        description = "Hayoo CLI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hback" = callPackage
@@ -99030,7 +97556,6 @@ self: {
        homepage = "http://hback.googlecode.com/";
        description = "N-back memory game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbayes" = callPackage
@@ -99052,7 +97577,6 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "Bayesian Networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbb" = callPackage
@@ -99071,7 +97595,6 @@ self: {
        homepage = "https://bitbucket.org/bhris/hbb";
        description = "Haskell Busy Bee, a backend for text editors";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbcd" = callPackage
@@ -99118,7 +97641,6 @@ self: {
        homepage = "http://www.dockerz.net/software/hbeat.html";
        description = "A simple step sequencer GUI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL_mixer;};
 
   "hblas" = callPackage
@@ -99138,7 +97660,6 @@ self: {
        homepage = "http://github.com/wellposed/hblas/";
        description = "Human friendly BLAS and Lapack bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "hblock" = callPackage
@@ -99159,7 +97680,6 @@ self: {
        jailbreak = true;
        description = "A mutable vector that provides indexation on the datatype fields it stores";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbro" = callPackage
@@ -99189,7 +97709,6 @@ self: {
        homepage = "https://github.com/k0ral/hbro";
        description = "Minimal extensible web-browser";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbro-contrib" = callPackage
@@ -99228,7 +97747,6 @@ self: {
        homepage = "http://www.bytelabs.org/hburg.html";
        description = "Haskell Bottom Up Rewrite Generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcc" = callPackage
@@ -99284,7 +97802,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hcheat/";
        description = "A collection of code cheatsheet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hchesslib" = callPackage
@@ -99302,7 +97819,6 @@ self: {
        homepage = "https://github.com/nablaa/hchesslib";
        description = "Chess library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcltest" = callPackage
@@ -99366,7 +97882,6 @@ self: {
        homepage = "http://github.com/tbh/hcron";
        description = "A simple job scheduler, which just runs some IO action at a given time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcube" = callPackage
@@ -99386,7 +97901,6 @@ self: {
        ];
        description = "Virtual Rubik's cube of arbitrary size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcwiid" = callPackage
@@ -99400,7 +97914,6 @@ self: {
        homepage = "https://github.com/ivanperez-keera/hcwiid";
        description = "Library to interface with the wiimote";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {bluetooth = null; inherit (pkgs) cwiid;};
 
   "hdaemonize_0_5_0_0" = callPackage
@@ -99450,7 +97963,6 @@ self: {
        homepage = "http://github.com/madhadron/hdaemonize";
        description = "Library to handle the details of writing daemons for UNIX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbc-aeson" = callPackage
@@ -99522,7 +98034,6 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi";
        description = "Haskell Database Independent interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbi-conduit" = callPackage
@@ -99544,7 +98055,6 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi-conduit";
        description = "Conduit glue for HDBI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbi-postgresql" = callPackage
@@ -99574,7 +98084,6 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi-postgresql";
        description = "PostgreSQL driver for hdbi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbi-sqlite" = callPackage
@@ -99595,7 +98104,6 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi-sqlite";
        description = "SQlite driver for HDBI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbi-tests" = callPackage
@@ -99617,7 +98125,6 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi-tests";
        description = "test suite for testing HDBI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdevtools_0_1_0_6" = callPackage
@@ -99720,7 +98227,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hdevtools" = callPackage
+  "hdevtools_0_1_2_2" = callPackage
     ({ mkDerivation, base, bin-package-db, Cabal, cmdargs, directory
      , filepath, ghc, ghc-paths, network, process, syb, time
      , transformers, unix
@@ -99738,6 +98245,27 @@ self: {
        homepage = "https://github.com/hdevtools/hdevtools/";
        description = "Persistent GHC powered background server for FAST haskell development tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hdevtools" = callPackage
+    ({ mkDerivation, base, bin-package-db, Cabal, cmdargs, directory
+     , filepath, ghc, ghc-paths, network, process, syb, time
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "hdevtools";
+       version = "0.1.3.0";
+       sha256 = "e0b0e78664d5f40e5111f02c5abd38493713bd32a08a0795533be132cd983774";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bin-package-db Cabal cmdargs directory filepath ghc ghc-paths
+         network process syb time transformers unix
+       ];
+       homepage = "https://github.com/hdevtools/hdevtools/";
+       description = "Persistent GHC powered background server for FAST haskell development tools";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "hdf" = callPackage
@@ -99769,7 +98297,6 @@ self: {
        ];
        description = "Server-side HTTP Digest (RFC2617) in the CGI monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdirect" = callPackage
@@ -99787,7 +98314,6 @@ self: {
        homepage = "http://www.haskell.org/hdirect/";
        description = "An IDL compiler for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdis86" = callPackage
@@ -99800,7 +98326,6 @@ self: {
        homepage = "https://github.com/kmcallister/hdis86";
        description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdiscount" = callPackage
@@ -99815,7 +98340,6 @@ self: {
        homepage = "https://github.com/jamwt/hdiscount";
        description = "Haskell bindings to the Discount markdown library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {markdown = null;};
 
   "hdm" = callPackage
@@ -99829,7 +98353,6 @@ self: {
        executableHaskellDepends = [ base directory process unix vty ];
        description = "a small display manager";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdocs_0_4_1_3" = callPackage
@@ -99912,7 +98435,6 @@ self: {
        homepage = "https://github.com/PatrickMaier/HdpH";
        description = "Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdph-closure" = callPackage
@@ -99930,7 +98452,6 @@ self: {
        homepage = "https://github.com/PatrickMaier/HdpH";
        description = "Explicit closures in Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdr-histogram" = callPackage
@@ -99971,7 +98492,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "heap" = callPackage
+  "heap_1_0_2" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "heap";
@@ -99983,6 +98504,19 @@ self: {
        executableHaskellDepends = [ base QuickCheck ];
        description = "Heaps in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "heap" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "heap";
+       version = "1.0.3";
+       sha256 = "9bd57e9ca3480d4322ccc5ec094767ee2a64425b2d4022065a8f36b44aabf402";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
+       description = "Heaps in Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "heaps_0_3_1" = callPackage
@@ -100089,7 +98623,6 @@ self: {
        libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis_0_6_9" = callPackage
@@ -100272,7 +98805,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/hedn";
        description = "EDN parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hein" = callPackage
@@ -100357,8 +98889,8 @@ self: {
        pname = "heist";
        version = "0.14.1.1";
        sha256 = "2934ece5e58b4a180a6975c0404a2a48e46b85693822aa6ab18f700a44438e43";
-       revision = "2";
-       editedCabalFile = "d7030f50fb41e4a8c32cd06493df540268d2c53d6f26f3151b3acd0a7839a85f";
+       revision = "3";
+       editedCabalFile = "928290fd32c744fce295f86b09b46e7142b7b669f96759fbc7ea134bbbe4551f";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist either filepath hashable
@@ -100384,7 +98916,6 @@ self: {
        ];
        description = "Use JSON directly from Heist templates";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heist-async" = callPackage
@@ -100423,7 +98954,6 @@ self: {
        homepage = "https://github.com/philopon/helics";
        description = "New Relic® agent SDK wrapper for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {newrelic-collector-client = null; newrelic-common = null; 
          newrelic-transaction = null;};
 
@@ -100444,7 +98974,6 @@ self: {
        homepage = "https://github.com/philopon/helics";
        description = "New Relic® agent SDK wrapper for wai";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "helisp" = callPackage
@@ -100482,7 +99011,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "The Helium Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "helix" = callPackage
@@ -100532,7 +99060,6 @@ self: {
        executableHaskellDepends = [ base transformers utf8-string ];
        description = "A Haskell shell based on shell-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hellage" = callPackage
@@ -100553,7 +99080,6 @@ self: {
        homepage = "http://bitcheese.net/wiki/hellnet/hellage";
        description = "Distributed hackage mirror";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hellnet" = callPackage
@@ -100579,7 +99105,6 @@ self: {
        homepage = "http://bitcheese.net/wiki/hellnet/hspawn";
        description = "Simple, distributed, anonymous data sharing network";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hello" = callPackage
@@ -100618,7 +99143,6 @@ self: {
        homepage = "http://github.com/switchface/helm";
        description = "A functionally reactive game engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "help-esb" = callPackage
@@ -100634,7 +99158,7 @@ self: {
          uuid
        ];
        homepage = "https://github.com/helpdotcom/help-esb.hs";
-       description = "A Haskell client for the Help.com team's ESB";
+       description = "A Haskell client for the Help.com team's ESB.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -100653,7 +99177,6 @@ self: {
        ];
        description = "A module music mixer and player";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hemkay-core" = callPackage
@@ -100716,7 +99239,6 @@ self: {
        homepage = "https://github.com/selectel/hen";
        description = "Haskell bindings to Xen hypervisor interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {xenctrl = null;};
 
   "henet" = callPackage
@@ -100731,7 +99253,6 @@ self: {
        ];
        description = "Bindings and high level interface for to ENet v1.3.9";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hepevt" = callPackage
@@ -100743,7 +99264,6 @@ self: {
        libraryHaskellDepends = [ bytestring haskell2010 lha ];
        description = "HEPEVT parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "her-lexer" = callPackage
@@ -100756,7 +99276,6 @@ self: {
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she";
        description = "A lexer for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "her-lexer-parsec" = callPackage
@@ -100768,7 +99287,6 @@ self: {
        libraryHaskellDepends = [ base her-lexer parsec transformers ];
        description = "Parsec frontend to \"her-lexer\" for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "herbalizer" = callPackage
@@ -100787,7 +99305,6 @@ self: {
        homepage = "https://github.com/danchoi/herbalizer";
        description = "HAML to ERB translator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "here_1_2_6" = callPackage
@@ -100875,7 +99392,6 @@ self: {
        ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hermit-syb" = callPackage
@@ -100891,7 +99407,6 @@ self: {
        ];
        description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hero-club-five-tenets" = callPackage
@@ -100955,7 +99470,6 @@ self: {
        ];
        description = "A library for compiling and serving static web assets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "herringbone-embed" = callPackage
@@ -100972,7 +99486,6 @@ self: {
        ];
        description = "Embed preprocessed web assets in your executable with Template Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "herringbone-wai" = callPackage
@@ -100989,7 +99502,6 @@ self: {
        ];
        description = "Wai adapter for the Herringbone web asset preprocessor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hesh" = callPackage
@@ -101034,7 +99546,6 @@ self: {
        jailbreak = true;
        description = "Haskell's embedded SQL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hetero-map" = callPackage
@@ -101063,7 +99574,6 @@ self: {
        homepage = "http://web.comlab.ox.ac.uk/oucl/work/ian.lynagh/Hetris/";
        description = "Text Tetris";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "heukarya" = callPackage
@@ -101079,7 +99589,6 @@ self: {
        homepage = "https://github.com/t3476/heukarya";
        description = "A genetic programming based on tree structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hevolisa" = callPackage
@@ -101095,7 +99604,6 @@ self: {
        ];
        description = "Genetic Mona Lisa problem in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hevolisa-dph" = callPackage
@@ -101113,7 +99621,6 @@ self: {
        ];
        description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hex" = callPackage
@@ -101185,7 +99692,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Hexpat/";
        description = "Chunked XML parsing using iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpat-lens" = callPackage
@@ -101236,7 +99742,6 @@ self: {
        ];
        description = "Picklers for de/serialising Generic data types to and from XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpat-tagsoup" = callPackage
@@ -101279,7 +99784,6 @@ self: {
        ];
        description = "Hexadecimal ByteString literals, with placeholders that bind variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexstring" = callPackage
@@ -101346,7 +99850,6 @@ self: {
        executableSystemDepends = [ doublefann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {doublefann = null; fann = null;};
 
   "hfd" = callPackage
@@ -101366,7 +99869,6 @@ self: {
        jailbreak = true;
        description = "Flash debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfiar" = callPackage
@@ -101383,7 +99885,6 @@ self: {
        homepage = "http://github.com/elbrujohalcon/hfiar";
        description = "Four in a Row in Haskell!!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hflags" = callPackage
@@ -101423,7 +99924,6 @@ self: {
        homepage = "http://github.com/danstiner/hfmt";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfoil" = callPackage
@@ -101443,7 +99943,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Hess-Smith panel code for inviscid 2-d airfoil analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hformat" = callPackage
@@ -101489,7 +99988,6 @@ self: {
        homepage = "http://github.com/cmh/Hfractal";
        description = "OpenGL fractal renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfsevents_0_1_5" = callPackage
@@ -101532,7 +100030,6 @@ self: {
        homepage = "http://www.fing.edu.uy/inco/proyectos/fusion";
        description = "A library for fusing a subset of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hg-buildpackage" = callPackage
@@ -101551,7 +100048,6 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Mercurial";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgal" = callPackage
@@ -101574,7 +100070,6 @@ self: {
        libraryHaskellDepends = [ array base haskell98 mtl ];
        description = "Haskell Genetic Algorithm Library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgdbmi" = callPackage
@@ -101629,7 +100124,6 @@ self: {
        homepage = "http://www.glyc.dc.uba.ar/intohylo/hgen.php";
        description = "Random generation of modal and hybrid logic formulas";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgeometric" = callPackage
@@ -101642,7 +100136,6 @@ self: {
        homepage = "ftp://ftp.cs.man.ac.uk/pub/toby/gpc/";
        description = "A geometric library with bindings to GPC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgeometry" = callPackage
@@ -101665,7 +100158,6 @@ self: {
        homepage = "http://fstaals.net/software/hgeometry";
        description = "Data types for geometric objects, geometric algorithms, and data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgettext" = callPackage
@@ -101707,7 +100199,6 @@ self: {
        homepage = "https://github.com/noteed/hgithub";
        description = "Haskell bindings to the GitHub API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgl-example" = callPackage
@@ -101744,7 +100235,6 @@ self: {
        homepage = "http://github.com/polux/hgom";
        description = "An haskell port of the java version of gom";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgopher" = callPackage
@@ -101794,7 +100284,6 @@ self: {
        homepage = "https://github.com/mjakob/hgrib";
        description = "Unofficial bindings for GRIB API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {grib_api = null;};
 
   "hharp" = callPackage
@@ -101809,7 +100298,6 @@ self: {
        homepage = "http://www.harphttp.org";
        description = "Binding to libharp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {harp = null;};
 
   "hi" = callPackage
@@ -101881,7 +100369,6 @@ self: {
        homepage = "http://hiccup.googlecode.com/";
        description = "Relatively efficient Tcl interpreter with support for basic operations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hichi" = callPackage
@@ -101895,7 +100382,6 @@ self: {
        executableHaskellDepends = [ array base bytestring mtl network ];
        description = "haskell robot for IChat protocol";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hid_0_2_1" = callPackage
@@ -101924,7 +100410,6 @@ self: {
        homepage = "https://github.com/phaazon/hid";
        description = "Interface to hidapi library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) hidapi;};
 
   "hidapi" = callPackage
@@ -101938,7 +100423,6 @@ self: {
        homepage = "https://github.com/vahokif/haskell-hidapi";
        description = "Haskell bindings to HIDAPI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) systemd;};
 
   "hieraclus" = callPackage
@@ -101950,7 +100434,6 @@ self: {
        libraryHaskellDepends = [ base containers HUnit mtl multiset ];
        description = "Automated clustering of arbitrary elements in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hierarchical-clustering" = callPackage
@@ -101984,7 +100467,6 @@ self: {
        jailbreak = true;
        description = "Draw diagrams of dendrograms made by hierarchical-clustering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hierarchical-exceptions" = callPackage
@@ -102036,7 +100518,6 @@ self: {
        homepage = "http://github.com/paolino/hiernotify";
        description = "Notification library for a filesystem hierarchy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "highWaterMark" = callPackage
@@ -102051,7 +100532,6 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Memory usage statistics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "higher-leveldb" = callPackage
@@ -102075,7 +100555,6 @@ self: {
        homepage = "https://github.com/jeremyjh/higher-leveldb";
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "higherorder" = callPackage
@@ -102089,7 +100568,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some higher order functions for Bool and []";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "highjson" = callPackage
@@ -102109,7 +100587,6 @@ self: {
        homepage = "https://github.com/agrafix/highjson";
        description = "Very fast JSON serialisation and parsing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "highlight-versions" = callPackage
@@ -102358,9 +100835,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/Fuuzetsu/himg";
-       description = "Simple gtk2hs image viewer. Point it at an image and fire away";
+       description = "Simple gtk2hs image viewer. Point it at an image and fire away.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "himpy" = callPackage
@@ -102384,7 +100860,6 @@ self: {
        homepage = "https://github.com/pyr/himpy";
        description = "multithreaded snmp poller for riemann";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hindent_4_4_1" = callPackage
@@ -102560,7 +101035,6 @@ self: {
        libraryHaskellDepends = [ base hinduce-missingh layout ];
        description = "Interface and utilities for classifiers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinduce-classifier-decisiontree" = callPackage
@@ -102576,7 +101050,6 @@ self: {
        ];
        description = "Decision Tree Classifiers for hInduce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinduce-examples" = callPackage
@@ -102595,7 +101068,6 @@ self: {
        ];
        description = "Example data for hInduce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinduce-missingh" = callPackage
@@ -102769,7 +101241,6 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Space Invaders";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinze-streams" = callPackage
@@ -102782,7 +101253,25 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/hinze-streams";
        description = "Streams and Unique Fixed Points";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hip" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, filepath, JuicyPixels
+     , netpbm, primitive, process, repa, temporary, vector
+     , vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "hip";
+       version = "1.0.0.0";
+       sha256 = "5da5f20c32dc907b1d5b918dcfe49662c43dbf004cead970571f912d91fba39a";
+       libraryHaskellDepends = [
+         base bytestring deepseq filepath JuicyPixels netpbm primitive
+         process repa temporary vector vector-th-unbox
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/lehins/hip";
+       description = "Haskell Image Processing (HIP) Library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hipbot" = callPackage
@@ -102809,7 +101298,22 @@ self: {
        homepage = "https://github.com/purefn/hipbot";
        description = "A library for building HipChat Bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hipchat-hs" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, either, lens
+     , servant, servant-client, split, string-conversions, text, time
+     }:
+     mkDerivation {
+       pname = "hipchat-hs";
+       version = "0.0.2";
+       sha256 = "42c61fccfe9e652ad8ed4d2d7c05e8c7acefe75d8ed1a577937fe132e55e23af";
+       libraryHaskellDepends = [
+         aeson async base bytestring either lens servant servant-client
+         split string-conversions text time
+       ];
+       description = "Hipchat API bindings in Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hipe" = callPackage
@@ -102826,7 +101330,6 @@ self: {
        homepage = "http://fstaals.net/software/hipe";
        description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hips" = callPackage
@@ -102861,7 +101364,6 @@ self: {
        ];
        description = "IRC client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hirt" = callPackage
@@ -102884,7 +101386,6 @@ self: {
        homepage = "https://people.ksp.sk/~ivan/hirt";
        description = "Calculates IRT 2PL and 3PL models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hissmetrics" = callPackage
@@ -102902,7 +101403,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/hissmetrics";
        description = "Unofficial API bindings to KISSmetrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hist-pl" = callPackage
@@ -102928,7 +101428,6 @@ self: {
        homepage = "https://github.com/kawu/hist-pl/tree/master/umbrella";
        description = "Umbrella package for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hist-pl-dawg" = callPackage
@@ -102961,7 +101460,6 @@ self: {
        homepage = "https://github.com/kawu/hist-pl/tree/master/fusion";
        description = "Merging historical dictionary with PoliMorf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hist-pl-lexicon" = callPackage
@@ -102993,7 +101491,6 @@ self: {
        homepage = "https://github.com/kawu/hist-pl/tree/master/lmf";
        description = "LMF parsing for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hist-pl-transliter" = callPackage
@@ -103093,7 +101590,6 @@ self: {
        jailbreak = true;
        description = "Extract the interesting bits from shell history";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hit_0_6_2" = callPackage
@@ -103195,7 +101691,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Libraries_and_tools/HJS";
        description = "JavaScript Parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hjsmin_0_1_4_7" = callPackage
@@ -103449,30 +101944,30 @@ self: {
 
   "hjsonschema" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , directory, file-embed, filepath, hashable, hjsonpointer
-     , http-client, http-types, HUnit, mtl, regexpr, scientific
-     , test-framework, test-framework-hunit, text, transformers
-     , unordered-containers, vector, wai-app-static, warp
+     , directory, file-embed, filepath, hjsonpointer, http-client
+     , http-types, HUnit, QuickCheck, regexpr, scientific, semigroups
+     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
+     , vector, wai-app-static, warp
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "0.8.0.1";
-       sha256 = "aeada3426b294cfc43a7cfac053aae0ee1fd06a5c551ecd0d3a6d725e47c89dc";
+       version = "0.9.0.0";
+       sha256 = "08367763571d49f3e0ec67b04143bf3196dcc217ffb4811af887b114b04b035a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers file-embed hashable hjsonpointer
-         http-client http-types mtl regexpr scientific text transformers
-         unordered-containers vector
+         aeson base bytestring containers file-embed hjsonpointer
+         http-client http-types QuickCheck regexpr scientific semigroups
+         text unordered-containers vector
        ];
        executableHaskellDepends = [
-         aeson base text unordered-containers vector
+         aeson base hjsonpointer text unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson async base bytestring directory filepath HUnit test-framework
-         test-framework-hunit text vector wai-app-static warp
+         aeson async base bytestring directory filepath hjsonpointer HUnit
+         QuickCheck tasty tasty-hunit tasty-quickcheck text
+         unordered-containers vector wai-app-static warp
        ];
-       jailbreak = true;
        homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
@@ -103530,7 +102025,6 @@ self: {
        homepage = "http://people.ksp.sk/~ivan/hlbfgsb";
        description = "Haskell binding to L-BFGS-B version 3.0";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gfortran;};
 
   "hlcm" = callPackage
@@ -103553,7 +102047,6 @@ self: {
        homepage = "http://membres-liglab.imag.fr/termier/HLCM/hlcm.html";
        description = "Fast algorithm for mining closed frequent itemsets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hleap" = callPackage
@@ -103794,7 +102287,6 @@ self: {
        homepage = "http://hledger.org";
        description = "A pie chart image generator for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-diff" = callPackage
@@ -104024,7 +102516,6 @@ self: {
        homepage = "http://hledger.org";
        description = "A curses-style console interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-web_0_24_1" = callPackage
@@ -104163,7 +102654,6 @@ self: {
        homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF";
        description = "Haskell binding to libBladeRF SDR library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libbladeRF;};
 
   "hlibev" = callPackage
@@ -104177,7 +102667,6 @@ self: {
        homepage = "http://github.com/aycanirican/hlibev";
        description = "FFI interface to libev";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ev = null;};
 
   "hlibfam" = callPackage
@@ -104190,7 +102679,6 @@ self: {
        librarySystemDepends = [ fam ];
        description = "FFI interface to libFAM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fam;};
 
   "hlibgit2_0_18_0_13" = callPackage
@@ -104476,7 +102964,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hlint" = callPackage
+  "hlint_1_9_30" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
      , directory, extra, filepath, haskell-src-exts, hscolour, process
      , refact, transformers, uniplate
@@ -104496,6 +102984,29 @@ self: {
        homepage = "https://github.com/ndmitchell/hlint#readme";
        description = "Source code suggestions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hlint" = callPackage
+    ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
+     , directory, extra, filepath, haskell-src-exts, hscolour, process
+     , refact, transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "hlint";
+       version = "1.9.31";
+       sha256 = "da353b827a418edffe5658172cc251133270186521ef1a4c6d1936b4f825faf8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base cmdargs containers cpphs directory extra
+         filepath haskell-src-exts hscolour process refact transformers
+         uniplate
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/ndmitchell/hlint#readme";
+       description = "Source code suggestions";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hlogger" = callPackage
@@ -104508,7 +103019,6 @@ self: {
        homepage = "http://www.pontarius.org/sub-projects/hlogger/";
        description = "Simple, concurrent, extendable and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hlongurl" = callPackage
@@ -104572,7 +103082,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hly";
        description = "Haskell LilyPond";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmark" = callPackage
@@ -104592,7 +103101,6 @@ self: {
        homepage = "http://bitcheese.net/wiki/code/hmark";
        description = "A tool and library for Markov chains based text generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmarkup" = callPackage
@@ -104606,7 +103114,6 @@ self: {
        ];
        description = "Simple wikitext-like markup format implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix_0_16_1_0" = callPackage
@@ -104767,7 +103274,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/hmatrix-banded/";
        description = "HMatrix interface to LAPACK functions for banded matrices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) liblapack;};
 
   "hmatrix-csv" = callPackage
@@ -104916,7 +103422,6 @@ self: {
        homepage = "http://github.com/alanfalloon/hmatrix-mmap";
        description = "Memory map Vector from disk into memory efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-nipals" = callPackage
@@ -104931,7 +103436,6 @@ self: {
        homepage = "http://github.com/alanfalloon/hmatrix-nipals";
        description = "NIPALS method for Principal Components Analysis on large data-sets";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-quadprogpp" = callPackage
@@ -104944,7 +103448,6 @@ self: {
        librarySystemDepends = [ QuadProgpp ];
        description = "Bindings to the QuadProg++ quadratic programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {QuadProgpp = null;};
 
   "hmatrix-repa" = callPackage
@@ -104957,7 +103460,6 @@ self: {
        homepage = "http://code.haskell.org/hmatrix-repa";
        description = "Adaptors for interoperability between hmatrix and repa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-special" = callPackage
@@ -104970,7 +103472,6 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Interface to GSL special functions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-static" = callPackage
@@ -104988,7 +103489,6 @@ self: {
        homepage = "http://code.haskell.org/hmatrix-static/";
        description = "hmatrix with vector and matrix sizes encoded in types";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-svdlibc" = callPackage
@@ -105005,7 +103505,6 @@ self: {
        homepage = "http://github.com/bgamari/hmatrix-svdlibc";
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-syntax" = callPackage
@@ -105023,7 +103522,6 @@ self: {
        homepage = "http://github.com/reinerp/hmatrix-syntax";
        description = "MATLAB-like syntax for hmatrix vectors and matrices";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-tests" = callPackage
@@ -105057,7 +103555,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hmeap";
        description = "Haskell Meapsoft Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmeap-utils" = callPackage
@@ -105078,7 +103575,6 @@ self: {
        homepage = "http://slavepianos.org/rd/?t=hmeap-utils";
        description = "Haskell Meapsoft Parser Utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmemdb" = callPackage
@@ -105108,7 +103604,6 @@ self: {
        jailbreak = true;
        description = "CLI fuzzy finder and launcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmidi" = callPackage
@@ -105141,7 +103636,6 @@ self: {
        homepage = "http://www.github.com/mboes/hmk";
        description = "A make alternative based on Plan9's mk";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmm" = callPackage
@@ -105158,7 +103652,6 @@ self: {
        homepage = "https://github.com/mikeizbicki/hmm";
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmm-hmatrix" = callPackage
@@ -105178,7 +103671,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/hmm-hmatrix";
        description = "Hidden Markov Models using HMatrix primitives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmp3" = callPackage
@@ -105200,7 +103692,6 @@ self: {
        homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "hmpfr" = callPackage
@@ -105214,7 +103705,6 @@ self: {
        homepage = "http://code.google.com/p/hmpfr/";
        description = "Haskell binding to the MPFR library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mpfr;};
 
   "hmt" = callPackage
@@ -105271,7 +103761,6 @@ self: {
        jailbreak = true;
        description = "Interpreter for the MUMPS langugae";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hnetcdf" = callPackage
@@ -105303,7 +103792,6 @@ self: {
        homepage = "https://github.com/ian-ross/hnetcdf";
        description = "Haskell NetCDF library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
@@ -105347,7 +103835,6 @@ self: {
        homepage = "http://github.com/alpmestan/hnn";
        description = "A reasonably fast and simple neural network library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hnop" = callPackage
@@ -105393,9 +103880,8 @@ self: {
          base binary bytestring crypto-pubkey-types curl dataenc entropy mtl
          old-locale random RSA SHA time utf8-string
        ];
-       description = "A Haskell implementation of OAuth 1.0a protocol";
+       description = "A Haskell implementation of OAuth 1.0a protocol.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoauth2_0_4_3" = callPackage
@@ -105611,7 +104097,6 @@ self: {
        homepage = "http://svalaskevicius.github.io/hob/";
        description = "A source code editor aiming for the convenience of use";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hobbes" = callPackage
@@ -105631,7 +104116,6 @@ self: {
        homepage = "http://github.com/jhickner/hobbes";
        description = "A small file watcher for OSX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hobbits" = callPackage
@@ -105650,7 +104134,6 @@ self: {
        jailbreak = true;
        description = "A library for canonically representing terms with binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoe" = callPackage
@@ -105682,7 +104165,6 @@ self: {
        jailbreak = true;
        description = "defining @mtl@-ready monads as * -> * fixed-points";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hog" = callPackage
@@ -105701,7 +104183,6 @@ self: {
        jailbreak = true;
        description = "Simple IRC logger bot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hogg" = callPackage
@@ -105720,7 +104201,6 @@ self: {
        homepage = "http://www.kfish.org/software/hogg/";
        description = "Library and tools to manipulate the Ogg container format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hogre" = callPackage
@@ -105737,7 +104217,6 @@ self: {
        homepage = "http://anttisalonen.github.com/hogre";
        description = "Haskell binding to a subset of OGRE";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;};
 
   "hogre-examples" = callPackage
@@ -105753,7 +104232,6 @@ self: {
        homepage = "http://github.com/anttisalonen/hogre-examples";
        description = "Examples for using Hogre";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OgreMain = null;};
 
   "hois" = callPackage
@@ -105770,7 +104248,6 @@ self: {
        jailbreak = true;
        description = "OIS bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OIS = null;};
 
   "hoist-error" = callPackage
@@ -105807,7 +104284,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Higher kinded type removal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "holey-format" = callPackage
@@ -105935,7 +104411,6 @@ self: {
        homepage = "http://www-users.cs.york.ac.uk/~ndm/homeomorphic/";
        description = "Homeomorphic Embedding Test";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hommage" = callPackage
@@ -105949,7 +104424,6 @@ self: {
        ];
        description = "Haskell Offline Music Manipulation And Generation EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hommage-ds" = callPackage
@@ -105975,8 +104449,8 @@ self: {
      }:
      mkDerivation {
        pname = "homplexity";
-       version = "0.4.3.0";
-       sha256 = "556d2ac1f9b9468419686f7adec903838961d44b4621917589588ef5d7748377";
+       version = "0.4.3.1";
+       sha256 = "03c4e31049b81cb2d4a531d76b520f2c8e84a24ebcea7a07da296f0f6e8f117a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105989,7 +104463,6 @@ self: {
        homepage = "https://github.com/mgajda/homplexity";
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "honi" = callPackage
@@ -106006,7 +104479,6 @@ self: {
        testSystemDepends = [ freenect OpenNI2 ];
        description = "OpenNI 2 binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OpenNI2 = null; inherit (pkgs) freenect;};
 
   "honk" = callPackage
@@ -106019,7 +104491,6 @@ self: {
        homepage = "https://lambda.xyz/honk/";
        description = "Cross-platform interface to the PC speaker";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hoobuddy" = callPackage
@@ -106065,7 +104536,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dummy package to disable Hood without having to remove all the calls to observe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hood2" = callPackage
@@ -106096,7 +104566,6 @@ self: {
        jailbreak = true;
        description = "A small, toy roguelike";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle" = callPackage
@@ -106117,7 +104586,6 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Executable for hoodle";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-builder" = callPackage
@@ -106134,7 +104602,6 @@ self: {
        ];
        description = "text builder for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-core" = callPackage
@@ -106168,7 +104635,6 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Core library for hoodle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;};
 
   "hoodle-extra" = callPackage
@@ -106195,7 +104661,6 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "extra hoodle tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-parser" = callPackage
@@ -106214,7 +104679,6 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Hoodle file parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-publish" = callPackage
@@ -106242,7 +104706,6 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "publish hoodle files as a static web site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-render" = callPackage
@@ -106263,7 +104726,6 @@ self: {
        ];
        description = "Hoodle file renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-types" = callPackage
@@ -106279,7 +104741,6 @@ self: {
        ];
        description = "Data types for programs for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoogle_4_2_36" = callPackage
@@ -106640,7 +105101,6 @@ self: {
        homepage = "https://bitbucket.org/pvdbrand/hoovie";
        description = "Haskell Media Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hopencc" = callPackage
@@ -106659,7 +105119,6 @@ self: {
        homepage = "https://github.com/MnO2/hopencc";
        description = "Haskell binding to libopencc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {opencc = null;};
 
   "hopencl" = callPackage
@@ -106680,7 +105139,6 @@ self: {
        homepage = "https://github.com/merijn/hopencl";
        description = "Haskell bindings for OpenCL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OpenCL = null;};
 
   "hopenpgp-tools_0_13" = callPackage
@@ -106800,7 +105258,6 @@ self: {
        homepage = "http://floss.scru.org/hopenpgp-tools";
        description = "hOpenPGP-based command-line tools";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hopenssl" = callPackage
@@ -106847,7 +105304,6 @@ self: {
        homepage = "https://github.com/imperialhopfield/hopfield";
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {MagickCore = null; inherit (pkgs) imagemagick;};
 
   "hopfield-networks" = callPackage
@@ -106954,7 +105410,6 @@ self: {
        homepage = "http://akc.is/hops";
        description = "Handy Operations on Power Series";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoq" = callPackage
@@ -106974,7 +105429,6 @@ self: {
        homepage = "http://github.com/valis/hoq";
        description = "A language based on homotopy type theory with an interval type";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "horizon" = callPackage
@@ -107069,7 +105523,7 @@ self: {
        version = "1.0.0";
        sha256 = "7fafb1e0cfe19d453030754962e74cdb8f3e791ec5b974623cbf26872779c857";
        libraryHaskellDepends = [ attoparsec base bytestring ];
-       description = "Validate hostnames e.g. localhost or foo.co.uk";
+       description = "Validate hostnames e.g. localhost or foo.co.uk.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -107090,7 +105544,6 @@ self: {
        homepage = "https://github.com/yihuang/hosts-server";
        description = "An dns server which is extremely easy to config";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hothasktags" = callPackage
@@ -107110,7 +105563,6 @@ self: {
        homepage = "http://github.com/luqui/hothasktags";
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hotswap" = callPackage
@@ -107228,7 +105680,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "Heap profiling helper library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hp2any-graph" = callPackage
@@ -107251,7 +105702,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "hp2any-manager" = callPackage
@@ -107272,7 +105722,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "A utility to visualise and compare heap profiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hp2html" = callPackage
@@ -107313,8 +105762,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.9.1";
-       sha256 = "77ebb1ce3b6ab88582a22dcdcb3fd08bd7278e5024042ce909993f2fb033c6ee";
+       version = "0.10.0";
+       sha256 = "1c35a222ab76c418115e9fca2b88eea0ac63fd75149155440ff54d9ae7278f7a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107393,7 +105842,6 @@ self: {
        homepage = "http://haskell.hpage.com";
        description = "A scrapbook for Haskell developers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpapi" = callPackage
@@ -107406,7 +105854,6 @@ self: {
        librarySystemDepends = [ papi ];
        description = "Binding for the PAPI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {papi = null;};
 
   "hpaste" = callPackage
@@ -107436,7 +105883,6 @@ self: {
        homepage = "http://hpaste.org/";
        description = "Haskell paste web site";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpasteit" = callPackage
@@ -107458,7 +105904,6 @@ self: {
        homepage = "http://github.com/parcs/hpasteit";
        description = "A command-line client for hpaste.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpc_0_6_0_2" = callPackage
@@ -107499,7 +105944,7 @@ self: {
        testHaskellDepends = [ base HUnit ];
        jailbreak = true;
        homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
-       description = "Coveralls.io support for Haskell";
+       description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -107526,7 +105971,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
-       description = "Coveralls.io support for Haskell";
+       description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -107557,19 +106002,19 @@ self: {
        ];
        description = "Tracer with AJAX interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpdft" = callPackage
-    ({ mkDerivation, base, bytestring, directory, parsec, text
-     , utf8-string, zlib
+    ({ mkDerivation, base, binary, bytestring, containers, directory
+     , file-embed, parsec, text, utf8-string, zlib
      }:
      mkDerivation {
        pname = "hpdft";
-       version = "0.1.0.2";
-       sha256 = "fd302bfbb8e8632bb01d20b3232ca87006cda8c2e3ed3c33f9d0874b2f9662b7";
+       version = "0.1.0.3";
+       sha256 = "e8ea8a57e82685a3b178df4a2048fe229a6c3794d9613836cd5b7d0f028b64b6";
        libraryHaskellDepends = [
-         base bytestring directory parsec text utf8-string zlib
+         base binary bytestring containers directory file-embed parsec text
+         utf8-string zlib
        ];
        homepage = "https://github.com/k16shikano/hpdft";
        description = "A tool for looking through PDF file using Haskell";
@@ -107591,7 +106036,6 @@ self: {
        homepage = "https://github.com/agocorona/hplayground";
        description = "monadic, reactive Formlets running in the Web browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hplaylist" = callPackage
@@ -107605,7 +106049,6 @@ self: {
        executableHaskellDepends = [ base directory filepath process ];
        description = "Application for managing playlist files on a music player";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpodder" = callPackage
@@ -107627,7 +106070,6 @@ self: {
        homepage = "http://software.complete.org/hpodder";
        description = "Podcast Aggregator (downloader)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpp" = callPackage
@@ -107677,7 +106119,6 @@ self: {
        homepage = "https://github.com/scrive/hpqtypes";
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) postgresql;};
 
   "hprotoc_2_1_4" = callPackage
@@ -107916,7 +106357,6 @@ self: {
        homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hps" = callPackage
@@ -107950,7 +106390,6 @@ self: {
        homepage = "http://slavepianos.org/rd/?t=hps-cairo";
        description = "Cairo rendering for the haskell postscript library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hps-kmeans" = callPackage
@@ -107993,7 +106432,6 @@ self: {
        homepage = "https://github.com/davidlazar/hpygments";
        description = "Highlight source code using Pygments";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpylos" = callPackage
@@ -108010,7 +106448,6 @@ self: {
        homepage = "http://sourceforge.net/projects/hpylos/";
        description = "AI of Pylos game with GLUT interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpyrg" = callPackage
@@ -108050,7 +106487,6 @@ self: {
        homepage = "http://github.com/paulrzcz/hquantlib.git";
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hquery" = callPackage
@@ -108081,7 +106517,6 @@ self: {
        executableHaskellDepends = [ base HCL NonEmpty ];
        description = "Basic utility for ranking a list of items";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hreader" = callPackage
@@ -108135,7 +106570,6 @@ self: {
        ];
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
@@ -108149,7 +106583,6 @@ self: {
        homepage = "http://github.com/ozataman/hs-GeoIP";
        description = "Haskell bindings to the MaxMind GeoIPCity database via the C library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {GeoIP = null;};
 
   "hs-bibutils_5_0" = callPackage
@@ -108196,7 +106629,6 @@ self: {
        homepage = "https://github.com/tsuraan/hs-blake2";
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) b2;};
 
   "hs-captcha" = callPackage
@@ -108238,7 +106670,6 @@ self: {
        ];
        description = "Example Monte Carlo simulations implemented with Carbon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-cdb" = callPackage
@@ -108255,7 +106686,6 @@ self: {
        homepage = "http://github.com/adamsmasher/hs-cdb";
        description = "A library for reading CDB (Constant Database) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-dotnet" = callPackage
@@ -108268,7 +106698,6 @@ self: {
        librarySystemDepends = [ ole32 oleaut32 ];
        description = "Pragmatic .NET interop for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ole32 = null; oleaut32 = null;};
 
   "hs-duktape" = callPackage
@@ -108290,7 +106719,6 @@ self: {
        homepage = "https://github.com/myfreeweb/hs-duktape";
        description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-excelx" = callPackage
@@ -108320,7 +106748,6 @@ self: {
        homepage = "http://patch-tag.com/r/VasylPasternak/hs-ffmpeg";
        description = "Bindings to FFMPEG library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-fltk" = callPackage
@@ -108334,7 +106761,6 @@ self: {
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hs-fltk/";
        description = "Binding to GUI library FLTK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {fltk = null; fltk_images = null;};
 
   "hs-gchart" = callPackage
@@ -108347,7 +106773,6 @@ self: {
        homepage = "http://github.com/deepakjois/hs-gchart";
        description = "Haskell wrapper for the Google Chart API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-gen-iface" = callPackage
@@ -108366,7 +106791,6 @@ self: {
        ];
        description = "Utility to generate haskell-names interface files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-gizapp" = callPackage
@@ -108414,7 +106838,6 @@ self: {
        ];
        description = "Java .class files assembler/disassembler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-json-rpc" = callPackage
@@ -108429,7 +106852,6 @@ self: {
        homepage = "http://patch-tag.com/r/Azel/hs-json-rpc";
        description = "JSON-RPC client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-logo" = callPackage
@@ -108457,7 +106879,6 @@ self: {
        homepage = "http://deepakjois.github.com/hs-logo";
        description = "Logo interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-mesos" = callPackage
@@ -108482,7 +106903,6 @@ self: {
          tasty-quickcheck
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;};
 
   "hs-nombre-generator" = callPackage
@@ -108497,7 +106917,6 @@ self: {
        jailbreak = true;
        description = "Name generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-pgms" = callPackage
@@ -108516,7 +106935,6 @@ self: {
        ];
        description = "Programmer's Mine Sweeper in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-php-session" = callPackage
@@ -108565,7 +106983,6 @@ self: {
        homepage = "https://github.com/tazjin/hs-pkpass";
        description = "A library for Passbook pass creation & signing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-re" = callPackage
@@ -108615,7 +107032,6 @@ self: {
        ];
        description = "Haskell binding to the Twitter API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-twitterarchiver" = callPackage
@@ -108630,7 +107046,6 @@ self: {
        homepage = "https://github.com/deepakjois/hs-twitterarchiver";
        description = "Commandline Twitter feed archiver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-vcard" = callPackage
@@ -108643,7 +107058,6 @@ self: {
        homepage = "http://qrcard.us/";
        description = "Implements the RFC 2426 vCard 3.0 spec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs2048" = callPackage
@@ -108684,7 +107098,6 @@ self: {
        homepage = "http://www.xanxys.net/hs2bf/";
        description = "Haskell to Brainfuck compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs2dot" = callPackage
@@ -108704,7 +107117,6 @@ self: {
        homepage = "http://www.github.com/finnsson/hs2graphviz";
        description = "Generate graphviz-code from Haskell-code";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsConfigure" = callPackage
@@ -108735,7 +107147,6 @@ self: {
        jailbreak = true;
        description = "Sqlite3 bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsXenCtrl" = callPackage
@@ -108750,7 +107161,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/HsXenCtrl";
        description = "FFI bindings to the Xen Control library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {xenctrl = null;};
 
   "hsass_0_3_0" = callPackage
@@ -108843,7 +107253,6 @@ self: {
        ];
        description = "simple utility for rolling filesystem backups";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsbencher" = callPackage
@@ -108921,7 +107330,6 @@ self: {
        jailbreak = true;
        description = "A preprocessor that helps with writing Haskell bindings to C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3" = callPackage
@@ -108969,7 +107377,6 @@ self: {
        homepage = "http://rd.slavepianos.org/?t=hsc3-cairo";
        description = "haskell supercollider cairo drawing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-data" = callPackage
@@ -108987,7 +107394,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-data";
        description = "haskell supercollider data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-db" = callPackage
@@ -109031,7 +107437,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-forth";
        description = "FORTH SUPERCOLLIDER";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-graphs" = callPackage
@@ -109063,7 +107468,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-graphs";
        description = "Haskell SuperCollider Graphs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-lang" = callPackage
@@ -109084,7 +107488,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-lang";
        description = "Haskell SuperCollider Language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-lisp" = callPackage
@@ -109104,7 +107507,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-lisp";
        description = "LISP SUPERCOLLIDER";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-plot" = callPackage
@@ -109122,7 +107524,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-plot";
        description = "Haskell SuperCollider Plotting";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-process" = callPackage
@@ -109157,7 +107558,6 @@ self: {
        homepage = "http://rd.slavepianos.org/?t=hsc3-rec";
        description = "Haskell SuperCollider Record Variants";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-rw" = callPackage
@@ -109205,7 +107605,6 @@ self: {
        homepage = "https://github.com/kaoskorobase/hsc3-server";
        description = "SuperCollider server resource management and synchronization";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-sf" = callPackage
@@ -109247,7 +107646,6 @@ self: {
        homepage = "http://rd.slavepianos.org/?t=hsc3-unsafe";
        description = "Unsafe Haskell SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-utils" = callPackage
@@ -109284,7 +107682,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings to IIDC1394 cameras, via Camwire";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;};
 
   "hscassandra" = callPackage
@@ -109302,7 +107699,6 @@ self: {
        homepage = "https://github.com/necrobious/hscassandra";
        description = "cassandra database interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscd" = callPackage
@@ -109333,7 +107729,6 @@ self: {
        homepage = "http://haskell.org/gtk2hs/archives/2006/01/26/cairo-eye-candy/";
        description = "An elegant analog clock using Haskell, GTK and Cairo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscolour_1_20_3" = callPackage
@@ -109420,7 +107815,6 @@ self: {
        homepage = "https://github.com/bosu/hscope";
        description = "cscope like browser for Haskell code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscrtmpl" = callPackage
@@ -109565,7 +107959,6 @@ self: {
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsdif" = callPackage
@@ -109593,7 +107986,6 @@ self: {
        homepage = "http://neugierig.org/software/darcs/hsdip/";
        description = "hsdip - a Diplomacy parser/renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsdns" = callPackage
@@ -109624,7 +108016,6 @@ self: {
        homepage = "https://github.com/bazqux/hsdns-cache";
        description = "Caching asynchronous DNS resolver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hse-cpp" = callPackage
@@ -109777,7 +108168,6 @@ self: {
        homepage = "http://lpuppet.banquise.net";
        description = "A small and ugly library that emulates the output of the puppet facter program";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsfcsh" = callPackage
@@ -109822,7 +108212,6 @@ self: {
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls";
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgnutls-yj" = callPackage
@@ -109836,7 +108225,6 @@ self: {
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls";
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgsom" = callPackage
@@ -109848,7 +108236,6 @@ self: {
        libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsgtd" = callPackage
@@ -109984,7 +108371,6 @@ self: {
        ];
        description = "A command line program for extending the import list of a Haskell source file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsini" = callPackage
@@ -110013,7 +108399,6 @@ self: {
        libraryHaskellDepends = [ base Cabal ];
        description = "Skeleton for new Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hslackbuilder" = callPackage
@@ -110030,7 +108415,6 @@ self: {
        homepage = "http://code.haskell.org/~arossato/hslackbuilder";
        description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hslibsvm" = callPackage
@@ -110043,7 +108427,6 @@ self: {
        librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {svm = null;};
 
   "hslinks" = callPackage
@@ -110266,7 +108649,6 @@ self: {
        homepage = "https://github.com/vincentg/hsmagick";
        description = "FFI bindings for the GraphicsMagick library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; 
          inherit (pkgs) jasper; inherit (pkgs) lcms; 
          inherit (pkgs) libjpeg; inherit (pkgs) libpng; 
@@ -110300,7 +108682,6 @@ self: {
        homepage = "http://code.google.com/p/hsmtpclient/";
        description = "Simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsndfile" = callPackage
@@ -110327,7 +108708,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile (Data.StorableVector interface)";
        license = stdenv.lib.licenses.lgpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsndfile-vector" = callPackage
@@ -110361,7 +108741,6 @@ self: {
        homepage = "https://github.com/mrdomino/hsnock/";
        description = "Nock 5K interpreter";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsnoise" = callPackage
@@ -110387,7 +108766,6 @@ self: {
        executableHaskellDepends = [ base network pcap ];
        description = "a miniature network sniffer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsnsq" = callPackage
@@ -110424,7 +108802,6 @@ self: {
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/util/";
        description = "Libraries to use SNTP protocol and small client/server implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsoptions" = callPackage
@@ -110451,7 +108828,6 @@ self: {
        homepage = "https://github.com/josercruz01/hsoptions";
        description = "Haskell library that supports command-line flag processing";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsp" = callPackage
@@ -110476,7 +108852,6 @@ self: {
        homepage = "http://code.google.com/p/hsp";
        description = "Facilitates running Haskell Server Pages web pages as CGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsparklines" = callPackage
@@ -110511,7 +108886,6 @@ self: {
        homepage = "https://github.com/robstewart57/hsparql";
        description = "A SPARQL query generator and DSL, and a client to query a SPARQL server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspear" = callPackage
@@ -110528,7 +108902,6 @@ self: {
        homepage = "http://rd.slavepianos.org/?t=hspear";
        description = "Haskell Spear Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec_2_1_2" = callPackage
@@ -111316,7 +109689,6 @@ self: {
        jailbreak = true;
        description = "An experimental DSL for testing on top of Hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-jenkins" = callPackage
@@ -111537,7 +109909,6 @@ self: {
        libraryHaskellDepends = [ hspec test-shouldbe ];
        description = "Convenience wrapper and utilities for hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-smallcheck_0_3_0" = callPackage
@@ -111883,7 +110254,6 @@ self: {
        ];
        description = "A client library for the spread toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspresent" = callPackage
@@ -111899,7 +110269,6 @@ self: {
        jailbreak = true;
        description = "A terminal presentation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsprocess" = callPackage
@@ -111925,7 +110294,6 @@ self: {
        ];
        description = "The Haskell Stream Processor command line utility";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsql" = callPackage
@@ -111951,7 +110319,6 @@ self: {
        librarySystemDepends = [ mysqlclient ];
        description = "MySQL driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mysqlclient = null;};
 
   "hsql-odbc" = callPackage
@@ -112009,7 +110376,6 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
@@ -112023,7 +110389,6 @@ self: {
        homepage = "https://github.com/marcinmrotek/hsqml-datamodel";
        description = "HsQML (Qt5) data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
@@ -112041,7 +110406,6 @@ self: {
        homepage = "https://github.com/marcinmrotek/hsqml-datamodel-vinyl";
        description = "HsQML DataModel instances for Vinyl Rec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-morris" = callPackage
@@ -112060,7 +110424,6 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-notes" = callPackage
@@ -112079,7 +110442,6 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Sticky notes example program implemented in HsQML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hsqml-demo-samples" = callPackage
@@ -112095,7 +110457,6 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML sample programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-morris" = callPackage
@@ -112115,7 +110476,6 @@ self: {
        homepage = "http://www.gekkou.co.uk/";
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsreadability" = callPackage
@@ -112154,7 +110514,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Haskell bindings to libseccomp";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {seccomp = null;};
 
   "hsshellscript" = callPackage
@@ -112251,7 +110610,6 @@ self: {
        homepage = "https://github.com/haas/hstats";
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstatsd" = callPackage
@@ -112283,7 +110641,6 @@ self: {
        homepage = "http://bitbucket.org/dave4420/hstest/wiki/Home";
        description = "Runs tests via QuickCheck1 and HUnit; like quickCheck-script but uses GHC api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstidy" = callPackage
@@ -112298,7 +110655,6 @@ self: {
        homepage = "http://code.haskell.org/~morrow/code/haskell/hstidy";
        description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstorchat" = callPackage
@@ -112327,7 +110683,6 @@ self: {
        jailbreak = true;
        description = "Distributed instant messaging over Tor";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstradeking" = callPackage
@@ -112353,7 +110708,6 @@ self: {
        jailbreak = true;
        description = "Tradeking API bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstyle" = callPackage
@@ -112372,7 +110726,6 @@ self: {
        jailbreak = true;
        description = "Checks Haskell source code for style compliance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstzaar" = callPackage
@@ -112393,7 +110746,6 @@ self: {
        homepage = "http://www.dcc.fc.up.pt/~pbv/stuff/hstzaar";
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsubconvert" = callPackage
@@ -112416,7 +110768,6 @@ self: {
        homepage = "https://github.com/jwiegley/hsubconvert";
        description = "One-time, faithful conversion of Subversion repositories to Git";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsverilog" = callPackage
@@ -112448,7 +110799,6 @@ self: {
        librarySystemDepends = [ ncurses readline swipl ];
        description = "embedding prolog in haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline; 
          swipl = null;};
 
@@ -112467,7 +110817,6 @@ self: {
        homepage = "http://patch-tag.com/r/nibro/hsx";
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsx-jmacro" = callPackage
@@ -112494,7 +110843,6 @@ self: {
        homepage = "http://code.google.com/hsp";
        description = "XHTML utilities to use together with HSX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsx2hs" = callPackage
@@ -112526,7 +110874,6 @@ self: {
        homepage = "http://github.com/aycanirican/hsyscall";
        description = "FFI to syscalls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsyslog" = callPackage
@@ -112553,7 +110900,6 @@ self: {
        librarySystemDepends = [ com_err zephyr ];
        description = "Simple libzephyr bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {com_err = null; zephyr = null;};
 
   "htaglib" = callPackage
@@ -112572,7 +110918,6 @@ self: {
        homepage = "https://github.com/mrkkrp/htaglib";
        description = "Bindings to TagLib, audio meta-data library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) taglib;};
 
   "htags" = callPackage
@@ -112774,7 +111119,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/html-entities";
        description = "A codec library for HTML-escaped text and HTML-entities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-kure" = callPackage
@@ -112812,7 +111156,6 @@ self: {
        homepage = "http://github.com/kylcarte/html-rules/";
        description = "Perform traversals of HTML structures using sets of rules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-tokenizer" = callPackage
@@ -112923,7 +111266,6 @@ self: {
        homepage = "https://github.com/cies/htoml";
        description = "Parser for TOML files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htrace" = callPackage
@@ -113012,7 +111354,6 @@ self: {
        ];
        description = "Import XML files from The Sports Network into an RDBMS";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-accept" = callPackage
@@ -114011,7 +112352,6 @@ self: {
        homepage = "https://github.com/spl/http-client-request-modifiers";
        description = "Convenient monadic HTTP request modifiers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-streams" = callPackage
@@ -114251,7 +112591,6 @@ self: {
        homepage = "https://github.com/exbb2/http-conduit-browser";
        description = "Browser interface to the http-conduit package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-conduit-downloader" = callPackage
@@ -114272,7 +112611,6 @@ self: {
        homepage = "https://github.com/bazqux/http-conduit-downloader";
        description = "HTTP downloader tailored for web-crawler needs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-date_0_0_4" = callPackage
@@ -114384,7 +112722,6 @@ self: {
        homepage = "http://github.com/snoyberg/http-enumerator";
        description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-kinder" = callPackage
@@ -114549,7 +112886,6 @@ self: {
        jailbreak = true;
        description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-proxy" = callPackage
@@ -114572,7 +112908,6 @@ self: {
        homepage = "https://github.com/erikd/http-proxy";
        description = "A library for writing HTTP and HTTPS proxies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-querystring" = callPackage
@@ -114732,7 +113067,6 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-streams" = callPackage
@@ -114785,7 +113119,6 @@ self: {
        homepage = "https://github.com/openbrainsrc/http-test";
        description = "Test framework for HTTP APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-types_0_8_5" = callPackage
@@ -115059,7 +113392,6 @@ self: {
        homepage = "https://github.com/fmap/https-everywhere-rules";
        description = "High-level access to HTTPS Everywhere rulesets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "https-everywhere-rules-raw" = callPackage
@@ -115073,7 +113405,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/fmap/https-everywhere-rules-raw";
-       description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets";
+       description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
@@ -115092,7 +113424,6 @@ self: {
        ];
        description = "Specification of HTTP request/response generators and parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htune" = callPackage
@@ -115107,7 +113438,6 @@ self: {
        jailbreak = true;
        description = "harmonic analyser and tuner for musical instruments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htzaar" = callPackage
@@ -115123,7 +113453,6 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hub" = callPackage
@@ -115180,7 +113509,6 @@ self: {
        jailbreak = true;
        description = "Support library for Hubris, the Ruby <=> Haskell bridge";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ruby;};
 
   "huckleberry" = callPackage
@@ -115221,7 +113549,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Hugs Front-end to Yhc Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hulk" = callPackage
@@ -115249,7 +113576,6 @@ self: {
        jailbreak = true;
        description = "IRC server written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "human-readable-duration_0_1_0_0" = callPackage
@@ -115312,7 +113638,6 @@ self: {
        jailbreak = true;
        description = "Haskell UPnP Media Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunch" = callPackage
@@ -115364,7 +113689,6 @@ self: {
        homepage = "http://patch-tag.com/r/kwallmar/hunit_gui/home";
        description = "A GUI testrunner for HUnit";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunit-parsec" = callPackage
@@ -115390,7 +113714,6 @@ self: {
        homepage = "github.com/tcrayford/rematch";
        description = "HUnit support for rematch";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunp" = callPackage
@@ -115441,7 +113764,6 @@ self: {
        homepage = "http://github.com/hunt-framework/";
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunt-server" = callPackage
@@ -115467,7 +113789,6 @@ self: {
        homepage = "http://github.com/hunt-framework";
        description = "A search and indexing engine server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunt-server-cli" = callPackage
@@ -115511,7 +113832,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Extract function names from Windows DLLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "husk-scheme" = callPackage
@@ -115571,7 +113891,6 @@ self: {
        homepage = "http://github.com/markusle/husky/tree/master";
        description = "A simple command line calculator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hutton" = callPackage
@@ -115593,7 +113912,6 @@ self: {
        jailbreak = true;
        description = "A program for the button on Reddit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "huttons-razor" = callPackage
@@ -115620,7 +113938,6 @@ self: {
        jailbreak = true;
        description = "Fuzzy logic library with support for T1, IT2, GT2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hvect_0_2_0_0" = callPackage
@@ -115743,7 +114060,6 @@ self: {
        jailbreak = true;
        description = "Simple Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hwsl2" = callPackage
@@ -115817,7 +114133,6 @@ self: {
        jailbreak = true;
        description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxournal" = callPackage
@@ -115845,7 +114160,6 @@ self: {
        homepage = "http://ianwookim.org/hxournal";
        description = "A pen notetaking program written in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxt_9_3_1_7" = callPackage
@@ -115942,7 +114256,6 @@ self: {
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "Serialisation and deserialisation of HXT XmlTrees";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxt-cache" = callPackage
@@ -116053,7 +114366,6 @@ self: {
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "A collection of tools for processing XML with Haskell (Filter variant)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxt-http_9_1_5" = callPackage
@@ -116306,7 +114618,6 @@ self: {
        jailbreak = true;
        description = "Helper functions for HXT";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxweb" = callPackage
@@ -116318,7 +114629,6 @@ self: {
        libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ];
        description = "Minimal webframework using fastcgi, libxml2 and libxslt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyahtzee" = callPackage
@@ -116371,7 +114681,6 @@ self: {
        homepage = "http://repos.mine.nu/davve/darcs/hybrid";
        description = "A implementation of a type-checker for Lambda-H";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hybrid-vectors_0_1_2" = callPackage
@@ -116431,7 +114740,6 @@ self: {
        homepage = "https://github.com/mruegenberg/hydra-hs";
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {sixense_x64 = null;};
 
   "hydra-print" = callPackage
@@ -116503,7 +114811,6 @@ self: {
        homepage = "https://scravy.de/hydrogen-cli/";
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-cli-args" = callPackage
@@ -116521,7 +114828,6 @@ self: {
        homepage = "https://scravy.de/hydrogen-cli-args/";
        description = "Hydrogen Command Line Arguments Parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-data" = callPackage
@@ -116535,7 +114841,6 @@ self: {
        homepage = "https://scravy.de/hydrogen-data/";
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-multimap" = callPackage
@@ -116563,7 +114868,6 @@ self: {
        homepage = "https://scravy.de/hydrogen-parsing/";
        description = "Hydrogen Parsing Utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-prelude" = callPackage
@@ -116584,7 +114888,6 @@ self: {
        homepage = "http://scravy.de/hydrogen-prelude/";
        description = "Hydrogen Prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-prelude-parsec" = callPackage
@@ -116598,7 +114901,6 @@ self: {
        homepage = "http://scravy.de/hydrogen-prelude-parsec/";
        description = "Hydrogen Prelude /w Parsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-syntax" = callPackage
@@ -116617,7 +114919,6 @@ self: {
        homepage = "https://scravy.de/hydrogen-syntax/";
        description = "Hydrogen Syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-util" = callPackage
@@ -116634,7 +114935,6 @@ self: {
        homepage = "https://scravy.de/hydrogen-util/";
        description = "Hydrogen Tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-version" = callPackage
@@ -116666,7 +114966,6 @@ self: {
        homepage = "http://github.com/tibbe/hyena";
        description = "Simple web application server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hylolib" = callPackage
@@ -116683,7 +114982,6 @@ self: {
        jailbreak = true;
        description = "Tools for hybrid logics related programs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hylotab" = callPackage
@@ -116698,7 +114996,6 @@ self: {
        homepage = "http://www.glyc.dc.uba.ar/intohylo/hylotab.php";
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyloutils" = callPackage
@@ -116714,7 +115011,6 @@ self: {
        ];
        description = "Very small programs for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperdrive" = callPackage
@@ -116734,7 +115030,6 @@ self: {
        jailbreak = true;
        description = "a fast, trustworthy HTTP(s) server built";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperfunctions" = callPackage
@@ -116822,7 +115117,6 @@ self: {
        homepage = "https://github.com/mkscrg/hyperpublic-haskell";
        description = "A thin wrapper for the Hyperpublic API";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyphenate" = callPackage
@@ -116965,7 +115259,6 @@ self: {
        homepage = "https://github.com/zoetic-community/hypher";
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hzaif" = callPackage
@@ -117071,7 +115364,6 @@ self: {
        ];
        description = "Internationalization for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iCalendar" = callPackage
@@ -117100,9 +115392,8 @@ self: {
        version = "0.0.1";
        sha256 = "f7c8ed3664c44f8fce891addc48051d181c0a4d47f1796a4e724855af681303d";
        libraryHaskellDepends = [ base interleavableIO mtl ];
-       description = "Version of Control.Exception using InterleavableIO";
+       description = "Version of Control.Exception using InterleavableIO.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iap-verifier" = callPackage
@@ -117865,7 +116156,6 @@ self: {
        homepage = "http://ideas.cs.uu.nl/www/";
        description = "Feedback services for intelligent tutoring systems";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ideas-math" = callPackage
@@ -117885,7 +116175,6 @@ self: {
        homepage = "http://ideas.cs.uu.nl/www/";
        description = "Interactive domain reasoner for logic and mathematics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "idempotent" = callPackage
@@ -117945,7 +116234,6 @@ self: {
        ];
        description = "ID3v2 (tagging standard for MP3 files) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "idna" = callPackage
@@ -117969,7 +116257,6 @@ self: {
        jailbreak = true;
        description = "Converts Unicode hostnames into ASCII";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "idris" = callPackage
@@ -118032,7 +116319,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "ieee-utils";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ieee-utils-tempfix" = callPackage
@@ -118186,7 +116472,6 @@ self: {
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ige-mac-integration = null;};
 
   "ignore" = callPackage
@@ -118225,7 +116510,6 @@ self: {
        homepage = "http://giorgidze.github.com/igraph/";
        description = "Bindings to the igraph C library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {igraph = null;};
 
   "igrf" = callPackage
@@ -118505,7 +116789,6 @@ self: {
        homepage = "https://tweag.github.io/HaskellR/";
        description = "Embed R quasiquotes and plots in IHaskell notebooks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-juicypixels" = callPackage
@@ -118603,7 +116886,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IPython standard widgets for IHaskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihttp" = callPackage
@@ -118622,7 +116904,6 @@ self: {
        executableHaskellDepends = [ base network ];
        description = "Incremental HTTP iteratee";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "illuminate" = callPackage
@@ -118644,7 +116925,6 @@ self: {
        homepage = "http://github.com/jgm/illuminate";
        description = "A fast syntax highlighting library built with alex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "image-type" = callPackage
@@ -118697,7 +116977,6 @@ self: {
        testPkgconfigDepends = [ imagemagick ];
        description = "bindings to imagemagick library";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) imagemagick;};
 
   "imagepaste" = callPackage
@@ -118718,7 +116997,6 @@ self: {
        homepage = "https://bitbucket.org/balta2ar/imagepaste";
        description = "Command-line image paste utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imagesize-conduit_1_0_0_4" = callPackage
@@ -118822,7 +117100,6 @@ self: {
        jailbreak = true;
        description = "Minimalistic reference manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imgurder" = callPackage
@@ -118843,7 +117120,6 @@ self: {
        ];
        description = "Uploader for Imgur";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imm" = callPackage
@@ -118873,7 +117149,6 @@ self: {
        jailbreak = true;
        description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "immortal" = callPackage
@@ -118917,7 +117192,6 @@ self: {
        jailbreak = true;
        description = "Multi-platform parser analyzer and generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imperative-edsl" = callPackage
@@ -118957,7 +117231,6 @@ self: {
        ];
        description = "Deep embedding of VHDL programs with code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "implicit" = callPackage
@@ -118981,7 +117254,7 @@ self: {
          unordered-containers vector-space
        ];
        homepage = "https://github.com/colah/ImplicitCAD";
-       description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export.";
+       description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
        license = "GPL";
      }) {};
 
@@ -119018,7 +117291,7 @@ self: {
        sha256 = "7f4f8d20bea5ee0c125218276d6e252d85c748808fc7f8ec5d6990aa84e277e2";
        libraryHaskellDepends = [ base lens ];
        homepage = "https://github.com/wdanilo/impossible";
-       description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable";
+       description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -119033,7 +117306,6 @@ self: {
        homepage = "http://github.com/tomahawkins/improve/wiki/ImProve";
        description = "An imperative, verifiable programming language for high assurance applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inc-ref" = callPackage
@@ -119069,7 +117341,6 @@ self: {
        homepage = "https://github.com/adamgundry/inch/";
        description = "A type-checker for Haskell with integer constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "include-file_0_1_0_2" = callPackage
@@ -119119,7 +117390,6 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/incremental-computing";
        description = "Incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-parser_0_2_3_3" = callPackage
@@ -119193,7 +117463,6 @@ self: {
        homepage = "https://github.com/blamario/incremental-parser";
        description = "Generic parser library capable of providing partial results from partial input";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-sat-solver" = callPackage
@@ -119206,7 +117475,6 @@ self: {
        homepage = "http://github.com/sebfisch/incremental-sat-solver";
        description = "Simple, Incremental SAT Solving as a Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "increments" = callPackage
@@ -119227,7 +117495,6 @@ self: {
        jailbreak = true;
        description = "type classes for incremental updates to data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentation" = callPackage
@@ -119285,7 +117552,6 @@ self: {
        jailbreak = true;
        description = "Indexed Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indexed" = callPackage
@@ -119361,7 +117627,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Multi-dimensional statically bounded indices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indieweb-algorithms" = callPackage
@@ -119388,7 +117653,6 @@ self: {
        homepage = "https://github.com/myfreeweb/indieweb-algorithms";
        description = "A collection of implementations of IndieWeb algorithms";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inf-interval" = callPackage
@@ -119422,7 +117686,6 @@ self: {
        homepage = "https://github.com/silky/infer-upstream";
        description = "Find the repository from where a given repo was forked";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "infernu" = callPackage
@@ -119472,7 +117735,6 @@ self: {
        ];
        jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "infix" = callPackage
@@ -119485,7 +117747,6 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Infix expression re-parsing (for HsParser library)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inflections" = callPackage
@@ -119517,7 +117778,6 @@ self: {
        homepage = "https://bitbucket.org/eegg/inflist";
        description = "An infinite list type and operations thereon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "influxdb" = callPackage
@@ -119549,7 +117809,6 @@ self: {
        homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "informative" = callPackage
@@ -119578,7 +117837,6 @@ self: {
        homepage = "http://doomanddarkness.eu/pub/informative";
        description = "A yesod subsite serving a wiki";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ini_0_2_2" = callPackage
@@ -119685,7 +117943,6 @@ self: {
        homepage = "https://chiselapp.com/user/mwm/repository/inilist";
        description = "Processing for .ini files with duplicate sections and options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inject" = callPackage
@@ -119744,7 +118001,7 @@ self: {
          raw-strings-qq regex-posix template-haskell transformers
          unordered-containers vector
        ];
-       description = "Write Haskell source files including C code inline. No FFI required";
+       description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl; gslcblas = null;};
@@ -119773,7 +118030,7 @@ self: {
          raw-strings-qq regex-posix template-haskell transformers
          unordered-containers vector
        ];
-       description = "Write Haskell source files including C code inline. No FFI required";
+       description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
@@ -119787,7 +118044,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Lets you embed C++ code into Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "inline-c-win32" = callPackage
@@ -119833,9 +118089,8 @@ self: {
          tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
          template-haskell temporary text unix vector
        ];
-       description = "Seamlessly call R from Haskell and vice versa. No FFI required";
+       description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) R;};
 
   "inquire" = callPackage
@@ -119967,7 +118222,6 @@ self: {
        jailbreak = true;
        description = "Heterogenous Zipper in Instant Generics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "instinct" = callPackage
@@ -120034,7 +118288,6 @@ self: {
        homepage = "http://projects.haskell.org/~malcolm/integer-pure";
        description = "A pure-Haskell implementation of arbitrary-precision Integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "integration_0_2_0_1" = callPackage
@@ -120079,7 +118332,6 @@ self: {
        homepage = "https://github.com/rrnewton/intel-aes/wiki";
        description = "Hardware accelerated AES encryption and Random Number Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {intel_aes = null;};
 
   "interchangeable" = callPackage
@@ -120105,7 +118357,6 @@ self: {
        executableHaskellDepends = [ base directory haskell-src hint mtl ];
        description = "Generates a version of a module using InterleavableIO";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interleavableIO" = callPackage
@@ -120117,7 +118368,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Use other Monads in functions that asks for an IO Monad";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interleave" = callPackage
@@ -120176,7 +118426,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/internetmarke/";
        description = "Shell command for constructing custom stamps for German Post";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interpol" = callPackage
@@ -120262,7 +118511,6 @@ self: {
        ];
        description = "QuasiQuoter for Ruby-style multi-line interpolated strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interpolatedstring-qq-mwotton" = callPackage
@@ -120276,9 +118524,8 @@ self: {
          base haskell-src-meta-mwotton template-haskell
        ];
        jailbreak = true;
-       description = "DO NOT USE THIS. interpolatedstring-qq works now";
+       description = "DO NOT USE THIS. interpolatedstring-qq works now.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interpolation" = callPackage
@@ -120359,8 +118606,8 @@ self: {
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.5.7.2";
-       sha256 = "50482ec337ab24992a46e92df1263da65b7f1b2eb84f563de5f41d56f96a952a";
+       version = "0.6";
+       sha256 = "8cd3cdd44e80f65f79c88a3a18580ce4bf02dc5086652f8af46ec90d18cadb42";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120388,7 +118635,6 @@ self: {
        homepage = "https://github.com/pxqr/intset";
        description = "Pure, mergeable, succinct Int sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invariant_0_2" = callPackage
@@ -120564,7 +118810,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "An API for generating TIMBER style reactive objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "io-region" = callPackage
@@ -120776,7 +119021,6 @@ self: {
        homepage = "https://bitbucket.org/dshearer/iotransaction/";
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ip-quoter" = callPackage
@@ -120825,7 +119069,6 @@ self: {
        homepage = "http://darcs.nomeata.de/ipatch";
        description = "interactive patch editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ipc" = callPackage
@@ -120842,7 +119085,6 @@ self: {
        jailbreak = true;
        description = "High level inter-process communication library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ipcvar" = callPackage
@@ -120878,7 +119120,6 @@ self: {
        jailbreak = true;
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ipopt; nlopt = null;};
 
   "ipprint" = callPackage
@@ -120994,7 +119235,6 @@ self: {
        jailbreak = true;
        description = "iptables rules parser/printer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iptadmin" = callPackage
@@ -121021,7 +119261,6 @@ self: {
        homepage = "http://iptadmin.117.su";
        description = "web-interface for iptables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ipython-kernel_0_6_1_2" = callPackage
@@ -121431,7 +119670,6 @@ self: {
        jailbreak = true;
        description = "Check whether a value has been evaluated";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "isiz" = callPackage
@@ -121473,7 +119711,6 @@ self: {
        ];
        description = "Advanced ESMTP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iso3166-country-codes" = callPackage
@@ -121582,7 +119819,6 @@ self: {
        homepage = "https://github.com/JohnLato/iter-stats";
        description = "iteratees for statistical processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iterIO" = callPackage
@@ -121603,7 +119839,6 @@ self: {
        homepage = "http://www.scs.stanford.edu/~dm/iterIO";
        description = "Iteratee-based IO with pipe operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "iterable" = callPackage
@@ -121643,7 +119878,6 @@ self: {
        homepage = "http://www.tiresiaspress.us/haskell/iteratee";
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iteratee-compress" = callPackage
@@ -121656,7 +119890,6 @@ self: {
        librarySystemDepends = [ bzip2 zlib ];
        description = "Enumeratees for compressing and decompressing streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;};
 
   "iteratee-mtl" = callPackage
@@ -121693,7 +119926,6 @@ self: {
        jailbreak = true;
        description = "Package allowing parsec parser initeratee";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iteratee-stm" = callPackage
@@ -121709,7 +119941,6 @@ self: {
        homepage = "http://www.tiresiaspress.us/~jwlato/haskell/iteratee-stm";
        description = "Concurrent iteratees using STM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iterio-server" = callPackage
@@ -121728,7 +119959,6 @@ self: {
        homepage = "https://github.com/alevy/iterio-server";
        description = "Library for building servers with IterIO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivar-simple" = callPackage
@@ -121759,7 +119989,6 @@ self: {
        homepage = "http://www.dcs.st-and.ac.uk/~eb/Ivor/";
        description = "Theorem proving library based on dependent type theory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory" = callPackage
@@ -121777,7 +120006,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-backend-c" = callPackage
@@ -121798,7 +120026,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-bitdata" = callPackage
@@ -121819,7 +120046,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory bit-data support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-examples" = callPackage
@@ -121842,7 +120068,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-hw" = callPackage
@@ -121860,7 +120085,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-opts" = callPackage
@@ -121878,7 +120102,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory compiler optimizations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-quickcheck" = callPackage
@@ -121892,7 +120115,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "QuickCheck driver for Ivory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-stdlib" = callPackage
@@ -121906,7 +120128,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivy-web" = callPackage
@@ -121923,7 +120144,6 @@ self: {
        homepage = "https://github.com/lilac/ivy-web/";
        description = "A lightweight web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ix-shapable" = callPackage
@@ -121950,7 +120170,6 @@ self: {
        homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ixmonad" = callPackage
@@ -122034,7 +120253,6 @@ self: {
        ];
        description = "CLI (command line interface) to YQL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "j2hs" = callPackage
@@ -122056,7 +120274,6 @@ self: {
        jailbreak = true;
        description = "j2hs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ja-base-extra" = callPackage
@@ -122089,7 +120306,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libjack2;};
 
   "jack-bindings" = callPackage
@@ -122103,7 +120319,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libjack2;};
 
   "jackminimix" = callPackage
@@ -122117,7 +120332,6 @@ self: {
        homepage = "http://www.renickbell.net/doku.php?id=jackminimix";
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jacobi-roots" = callPackage
@@ -122131,7 +120345,6 @@ self: {
        homepage = "http://github.com/ghorn/jacobi-roots";
        description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jail" = callPackage
@@ -122198,9 +120411,8 @@ self: {
          test-framework-quickcheck2
        ];
        homepage = "https://github.com/cgo/jalla";
-       description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE";
+       description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; cblas = null; lapacke = null;};
 
   "jammittools" = callPackage
@@ -122224,7 +120436,6 @@ self: {
        homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jarfind" = callPackage
@@ -122245,7 +120456,6 @@ self: {
        ];
        description = "Tool for searching java classes, members and fields in classfiles and JAR archives";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "java-bridge" = callPackage
@@ -122269,7 +120479,6 @@ self: {
        ];
        description = "Bindings to the JNI and a high level interface generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "java-bridge-extras" = callPackage
@@ -122282,7 +120491,6 @@ self: {
        jailbreak = true;
        description = "Utilities for working with the java-bridge package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "java-character" = callPackage
@@ -122322,7 +120530,6 @@ self: {
        jailbreak = true;
        description = "Tools for reflecting on Java classes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "javasf" = callPackage
@@ -122344,7 +120551,6 @@ self: {
        homepage = "https://github.com/tonymorris/javasf";
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "javav" = callPackage
@@ -122362,7 +120568,6 @@ self: {
        homepage = "https://github.com/tonymorris/javav";
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jcdecaux-vls" = callPackage
@@ -122431,7 +120636,6 @@ self: {
        homepage = "http://github.com/achudnov/jespresso";
        description = "Extract all JavaScript from an HTML page and consolidate it in one script";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jmacro_0_6_11" = callPackage
@@ -122628,7 +120832,6 @@ self: {
        homepage = "http://sulzmann.blogspot.com/2008/12/parallel-join-patterns-with-guards-and.html";
        description = "Parallel Join Patterns with Guards and Propagation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "joinlist" = callPackage
@@ -122641,7 +120844,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Join list - symmetric list type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jonathanscard" = callPackage
@@ -122659,7 +120861,6 @@ self: {
        homepage = "http://rawr.mschade.me/jonathanscard/";
        description = "An implementation of the Jonathan's Card API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jort" = callPackage
@@ -122674,7 +120875,6 @@ self: {
        jailbreak = true;
        description = "JP's own ray tracer";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jose" = callPackage
@@ -122792,7 +120992,6 @@ self: {
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "jpeg" = callPackage
@@ -122829,7 +121028,6 @@ self: {
        homepage = "https://github.com/sseefried/js-good-parts.git";
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "js-jquery_1_11_1" = callPackage
@@ -122962,7 +121160,6 @@ self: {
        jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsmw" = callPackage
@@ -122975,7 +121172,6 @@ self: {
        jailbreak = true;
        description = "Javascript Monadic Writer base package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json" = callPackage
@@ -123248,6 +121444,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-autotype_1_0_11" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, GenericPretty, hashable, hflags, hint, lens, mmap, mtl
+     , pretty, process, QuickCheck, scientific, smallcheck, text
+     , uniplate, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "json-autotype";
+       version = "1.0.11";
+       sha256 = "98926e7cd2e0b93b1ea61e18270ec70fb71face4bcb10df777dcbe5a21c5bf23";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers filepath GenericPretty hashable
+         hflags hint lens mmap mtl pretty process scientific text uniplate
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers filepath GenericPretty hashable
+         hflags hint lens mtl pretty process scientific text uniplate
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath GenericPretty
+         hashable hflags lens mtl pretty process QuickCheck scientific
+         smallcheck text uniplate unordered-containers vector
+       ];
+       homepage = "https://github.com/mgajda/json-autotype";
+       description = "Automatic type declaration for JSON input data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "json-b" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-nums, bytestring-trie
      , bytestringparser-temporary, containers, utf8-string
@@ -123270,7 +121499,6 @@ self: {
        homepage = "http://github.com/jsnx/JSONb/";
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-builder" = callPackage
@@ -123325,7 +121553,6 @@ self: {
        homepage = "http://github.com/snoyberg/json-enumerator";
        description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-extra" = callPackage
@@ -123378,7 +121605,7 @@ self: {
        testHaskellDepends = [ base hspec json QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/jonathankochems/json-litobj";
-       description = "Extends Text.JSON to handle literal JS objects";
+       description = "Extends Text.JSON to handle literal JS objects.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -123444,7 +121671,6 @@ self: {
        homepage = "http://github.com/finnsson/json-qq";
        description = "Json Quasiquatation library for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-rpc" = callPackage
@@ -123471,7 +121697,6 @@ self: {
        homepage = "https://github.com/xenog/json-rpc";
        description = "Fully-featured JSON-RPC 2.0 library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-rpc-client" = callPackage
@@ -123496,7 +121721,7 @@ self: {
          test-framework-quickcheck2 text unordered-containers vector
        ];
        homepage = "https://github.com/grayjay/json-rpc-client";
-       description = "JSON-RPC 2.0 on the client side";
+       description = "JSON-RPC 2.0 on the client side.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -123519,7 +121744,7 @@ self: {
          text unordered-containers vector
        ];
        homepage = "https://github.com/grayjay/json-rpc-server";
-       description = "JSON-RPC 2.0 on the server side";
+       description = "JSON-RPC 2.0 on the server side.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -123828,7 +122053,6 @@ self: {
        homepage = "https://github.com/ondrap/json-stream";
        description = "Incremental applicative JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "json-togo" = callPackage
@@ -123866,7 +122090,6 @@ self: {
        ];
        description = "A collection of JSON tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-types" = callPackage
@@ -123894,7 +122117,6 @@ self: {
        ];
        description = "Library provides support for JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json2-hdbc" = callPackage
@@ -123910,7 +122132,6 @@ self: {
        ];
        description = "Support JSON for SQL Database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json2-types" = callPackage
@@ -123953,7 +122174,6 @@ self: {
        homepage = "https://github.com/dpwright/jsonresume.hs";
        description = "Parser and datatypes for the JSON Resume format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsonrpc-conduit" = callPackage
@@ -123972,7 +122192,7 @@ self: {
        testHaskellDepends = [
          aeson base bytestring conduit conduit-extra hspec text
        ];
-       description = "JSON-RPC 2.0 server over a Conduit";
+       description = "JSON-RPC 2.0 server over a Conduit.";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -123995,7 +122215,6 @@ self: {
        homepage = "https://github.com/yuga/jsonschema-gen";
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsonsql" = callPackage
@@ -124055,7 +122274,6 @@ self: {
        ];
        description = "Extract substructures from JSON by following a path";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "judy" = callPackage
@@ -124072,7 +122290,6 @@ self: {
        homepage = "http://github.com/mwotton/judy";
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {Judy = null;};
 
   "jukebox" = callPackage
@@ -124094,7 +122311,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A first-order reasoning toolbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "jumpthefive" = callPackage
@@ -124194,9 +122410,8 @@ self: {
          process QuickCheck temporary time
        ];
        homepage = "https://github.com/abhinav/kafka-client";
-       description = "Low-level Haskell client library for Apache Kafka 0.7";
+       description = "Low-level Haskell client library for Apache Kafka 0.7.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "kan-extensions_4_1_1" = callPackage
@@ -124332,7 +122547,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Binary parsing with random access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kanji" = callPackage
@@ -124411,7 +122625,6 @@ self: {
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "Kansas Lava is a hardware simulator and VHDL generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kansas-lava-cores" = callPackage
@@ -124432,7 +122645,6 @@ self: {
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "FPGA Cores Written in Kansas Lava";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kansas-lava-papilio" = callPackage
@@ -124450,7 +122662,6 @@ self: {
        ];
        description = "Kansas Lava support files for the Papilio FPGA board";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kansas-lava-shake" = callPackage
@@ -124462,7 +122673,6 @@ self: {
        libraryHaskellDepends = [ base hastache kansas-lava shake text ];
        description = "Shake rules for building Kansas Lava projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "karakuri" = callPackage
@@ -124480,7 +122690,6 @@ self: {
        homepage = "https://github.com/fumieval/karakuri";
        description = "Good stateful automata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "karver" = callPackage
@@ -124522,7 +122731,6 @@ self: {
        homepage = "https://github.com/davnils/katt";
        description = "Client for the Kattis judge system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kazura-queue" = callPackage
@@ -124680,7 +122888,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-model-lightmodel" = callPackage
@@ -124698,7 +122905,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Rapid Gtk Application Development - Reactive Protected Light Models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-model-protectedmodel" = callPackage
@@ -124716,7 +122922,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Rapid Gtk Application Development - Protected Reactive Models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-solutions-config" = callPackage
@@ -124751,7 +122956,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-view" = callPackage
@@ -124794,7 +122998,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Files as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-gtk" = callPackage
@@ -124812,7 +123015,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-network" = callPackage
@@ -124827,7 +123029,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Sockets as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-polling" = callPackage
@@ -124843,7 +123044,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Polling based Readable RVs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-wx" = callPackage
@@ -124858,7 +123058,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Fields for WX widgets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-yampa" = callPackage
@@ -124875,7 +123074,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - FRP Yampa Signal Functions as RVs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactivelenses" = callPackage
@@ -124888,7 +123086,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Reactive Haskell on Rails - Lenses applied to Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactivevalues" = callPackage
@@ -124908,7 +123105,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-posture" = callPackage
@@ -124943,7 +123139,6 @@ self: {
        homepage = "http://keera.co.uk/projects/keera-posture";
        description = "Get notifications when your sitting posture is inappropriate";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL_mixer;};
 
   "keiretsu" = callPackage
@@ -124966,7 +123161,6 @@ self: {
        jailbreak = true;
        description = "Multi-process orchestration for development and integration testing";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keter_1_3_6" = callPackage
@@ -125312,7 +123506,6 @@ self: {
        ];
        description = "a dAmn ↔ IRC proxy";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keycode_0_1" = callPackage
@@ -125369,7 +123562,6 @@ self: {
        homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keys_3_10_1" = callPackage
@@ -125459,7 +123651,6 @@ self: {
        homepage = "http://github.com/cdornan/keystore";
        description = "Managing stores of secret things";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keyvaluehash" = callPackage
@@ -125531,7 +123722,6 @@ self: {
        homepage = "http://github.com/kasbah/haskell-kicad-data";
        description = "Parser and writer for KiCad files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kickass-torrents-dump-parser" = callPackage
@@ -125550,7 +123740,6 @@ self: {
        jailbreak = true;
        description = "Parses kat.ph torrent dumps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kickchan" = callPackage
@@ -125587,7 +123776,6 @@ self: {
        ];
        description = "Process KIF iOS test logs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kinds" = callPackage
@@ -125621,7 +123809,6 @@ self: {
        homepage = "http://github.com/nkpart/kit";
        description = "A dependency manager for Xcode (Objective-C) projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kmeans" = callPackage
@@ -125650,7 +123837,6 @@ self: {
        ];
        description = "Sequential and parallel implementations of Lloyd's algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kmeans-vector" = callPackage
@@ -125710,7 +123896,6 @@ self: {
        doHaddock = false;
        description = "\"map German words to code representing pronunciation\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kontrakcja-templates" = callPackage
@@ -125769,7 +123954,6 @@ self: {
        homepage = "http://blog.malde.org/";
        description = "The Korfu ORF Utility";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kqueue" = callPackage
@@ -125785,7 +123969,6 @@ self: {
        homepage = "http://github.com/hesselink/kqueue";
        description = "A binding to the kqueue event library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kraken" = callPackage
@@ -125849,7 +124032,6 @@ self: {
        homepage = "https://github.com/corngood/ktx";
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {egl = null; inherit (pkgs) glew;};
 
   "kure_2_4_10" = callPackage
@@ -125940,7 +124122,6 @@ self: {
        homepage = "http://ittc.ku.edu/~andygill/kure.php";
        description = "Generator for Boilerplate KURE Combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kyotocabinet" = callPackage
@@ -125966,7 +124147,6 @@ self: {
        homepage = "http://nonempty.org/software/haskell-l-bfgs-b";
        description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {lbfgsb = null;};
 
   "labeled-graph" = callPackage
@@ -125978,7 +124158,6 @@ self: {
        libraryHaskellDepends = [ base labeled-tree ];
        description = "Labeled graph structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "labeled-tree" = callPackage
@@ -126015,7 +124194,6 @@ self: {
        homepage = "https://github.com/lucasdicioccio/laborantin-hs";
        description = "an experiment management framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "labyrinth" = callPackage
@@ -126039,7 +124217,6 @@ self: {
        homepage = "https://github.com/koterpillar/labyrinth";
        description = "A complicated turn-based game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "labyrinth-server" = callPackage
@@ -126075,7 +124252,6 @@ self: {
        homepage = "https://github.com/koterpillar/labyrinth-server";
        description = "A complicated turn-based game - Web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lackey" = callPackage
@@ -126111,7 +124287,6 @@ self: {
        homepage = "http://github.com/jfischoff/lagrangian";
        description = "Solve Lagrange multiplier problems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "laika" = callPackage
@@ -126133,7 +124308,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/laika";
        description = "Minimalistic type-checked compile-time template engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda-ast" = callPackage
@@ -126160,7 +124334,6 @@ self: {
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/LambdaBridge";
        description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda-canvas" = callPackage
@@ -126173,7 +124346,6 @@ self: {
        jailbreak = true;
        description = "Educational drawing canvas for FP explorers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lambda-devs" = callPackage
@@ -126201,7 +124373,6 @@ self: {
        homepage = "http://github.com/alios/lambda-devs";
        description = "a Paralell-DEVS implementaion based on distributed-process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda-options" = callPackage
@@ -126241,7 +124412,6 @@ self: {
        homepage = "http://scravy.de/blog/2012-02-20/a-lambda-toolbox-in-haskell.htm";
        description = "An application to work with the lambda calculus (for learning)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda2js" = callPackage
@@ -126268,7 +124438,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdaFeed" = callPackage
@@ -126283,7 +124452,6 @@ self: {
        homepage = "http://www.cse.unsw.edu.au/~chak/haskell/lambdaFeed/";
        description = "RSS 2.0 feed generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdaLit" = callPackage
@@ -126299,9 +124467,8 @@ self: {
        executableHaskellDepends = [
          base bytestring haskeline lambdaBase mtl network
        ];
-       description = "..";
+       description = "...";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot" = callPackage
@@ -126324,7 +124491,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -126351,7 +124517,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot core functionality";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-haskell-plugins" = callPackage
@@ -126381,7 +124546,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -126400,7 +124564,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "IRC plugins for lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-misc-plugins" = callPackage
@@ -126424,7 +124587,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-novelty-plugins" = callPackage
@@ -126445,7 +124607,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-reference-plugins" = callPackage
@@ -126464,7 +124625,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot reference plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-social-plugins" = callPackage
@@ -126483,7 +124643,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Social plugins for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-trusted" = callPackage
@@ -126518,7 +124677,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Utility libraries for the advanced IRC bot, Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacat" = callPackage
@@ -126538,7 +124696,6 @@ self: {
        homepage = "http://github.com/baldo/lambdacat";
        description = "Webkit Browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacms-core" = callPackage
@@ -126594,7 +124751,6 @@ self: {
        executableHaskellDepends = [ base editline mtl pretty ];
        description = "A simple lambda cube type checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-bullet" = callPackage
@@ -126609,31 +124765,32 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "Example for combining LambdaCube and Bullet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-compiler" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , deepseq, directory, exceptions, filepath, indentation
-     , lambdacube-ir, monad-control, mtl, optparse-applicative, parsec
-     , pretty-compact, QuickCheck, tasty, tasty-quickcheck, text, time
-     , vector
+    ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
+     , containers, deepseq, directory, exceptions, filepath, JuicyPixels
+     , lambdacube-ir, megaparsec, monad-control, mtl
+     , optparse-applicative, patience, pretty-show, process, QuickCheck
+     , tasty, tasty-quickcheck, text, time, vect, vector, websockets
+     , wl-pprint
      }:
      mkDerivation {
        pname = "lambdacube-compiler";
-       version = "0.4.0.1";
-       sha256 = "4487798702474096e80a7b0582dc9e2feceef4f82155d65226da474e40f7e4b3";
+       version = "0.5.0.1";
+       sha256 = "d84cefdf1d21e12e6d9ca92f314e35881e5b911630709e36971337dda32ad564";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base containers deepseq directory exceptions filepath
-         indentation lambdacube-ir mtl parsec pretty-compact text vector
+         lambdacube-ir megaparsec mtl pretty-show text vector wl-pprint
        ];
        executableHaskellDepends = [
-         aeson async base bytestring containers deepseq directory exceptions
-         filepath indentation lambdacube-ir monad-control mtl
-         optparse-applicative parsec pretty-compact QuickCheck tasty
-         tasty-quickcheck text time vector
+         aeson async base base64-bytestring bytestring containers deepseq
+         directory exceptions filepath JuicyPixels lambdacube-ir megaparsec
+         monad-control mtl optparse-applicative patience pretty-show process
+         QuickCheck tasty tasty-quickcheck text time vect vector websockets
+         wl-pprint
        ];
        doHaddock = false;
        homepage = "http://lambdacube3d.com";
@@ -126694,7 +124851,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "3D rendering engine written entirely in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-examples" = callPackage
@@ -126711,34 +124867,41 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "Examples for LambdaCube";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-gl" = callPackage
-    ({ mkDerivation, base, bytestring, containers, JuicyPixels
-     , lambdacube-ir, mtl, OpenGLRaw, vector, vector-algorithms
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , containers, exceptions, GLFW-b, JuicyPixels, lambdacube-ir, mtl
+     , network, OpenGLRaw, text, time, vector, vector-algorithms
+     , websockets
      }:
      mkDerivation {
        pname = "lambdacube-gl";
-       version = "0.4.0.2";
-       sha256 = "f9ebec4a981381ffa9f998a636c0aba3f4425b4fb2ae06650ff24e9109328174";
+       version = "0.5.0.1";
+       sha256 = "7a54a39726b993d81fc8e9e0fa58595bd5f69ad317e4a26229d065a82432a9fd";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
          vector vector-algorithms
        ];
+       executableHaskellDepends = [
+         aeson base base64-bytestring bytestring containers exceptions
+         GLFW-b JuicyPixels lambdacube-ir network OpenGLRaw text time vector
+         websockets
+       ];
        doHaddock = false;
        homepage = "http://lambdacube3d.com";
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-ir" = callPackage
     ({ mkDerivation, aeson, base, containers, mtl, text, vector }:
      mkDerivation {
        pname = "lambdacube-ir";
-       version = "0.2.0.0";
-       sha256 = "488cbb21a8dca80c16552d3aca868d5aa7085b7bfa2e9ea7c92965bd1e288c48";
+       version = "0.3.0.0";
+       sha256 = "4a9c3f2193984bf36eb06d13db92de541c619502a89e956e1e3a2750a4b68dbc";
        libraryHaskellDepends = [ aeson base containers mtl text vector ];
        description = "LambdaCube 3D intermediate representation of 3D graphics pipelines";
        license = stdenv.lib.licenses.bsd3;
@@ -126764,7 +124927,6 @@ self: {
        homepage = "http://lambdacube3d.wordpress.com/";
        description = "Samples for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdatex" = callPackage
@@ -126810,9 +124972,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/ashyisme/lambdatwit";
-       description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot";
+       description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdiff" = callPackage
@@ -126832,7 +124993,6 @@ self: {
        homepage = "https://github.com/jamwt/lambdiff.git";
        description = "Diff Viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lame-tester" = callPackage
@@ -126850,7 +125010,6 @@ self: {
        homepage = "http://github.com/TheBizzle";
        description = "A strange and unnecessary selective test-running library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-asn1" = callPackage
@@ -126882,7 +125041,6 @@ self: {
        homepage = "http://github.com/knrafto/language-bash/";
        description = "Parsing and pretty-printing Bash shell scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-boogie" = callPackage
@@ -126908,7 +125066,6 @@ self: {
        homepage = "https://bitbucket.org/nadiapolikarpova/boogaloo";
        description = "Interpreter and language infrastructure for Boogie";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-c" = callPackage
@@ -126929,6 +125086,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-c_0_5_0" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers
+     , directory, filepath, happy, pretty, process, syb
+     }:
+     mkDerivation {
+       pname = "language-c";
+       version = "0.5.0";
+       sha256 = "86d58bc017a7bba157fc4d5d0ab9e3a3d3f3a2f98bfe46b5b0d5d72a0f5d2222";
+       libraryHaskellDepends = [
+         array base bytestring containers directory filepath pretty process
+         syb
+       ];
+       libraryToolDepends = [ alex happy ];
+       homepage = "http://visq.github.io/language-c/";
+       description = "Analysis and generation of C code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-c-comments" = callPackage
     ({ mkDerivation, alex, array, base, language-c }:
      mkDerivation {
@@ -126940,7 +125116,6 @@ self: {
        homepage = "http://github.com/ghulette/language-c-comments";
        description = "Extracting comments from C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-c-inline" = callPackage
@@ -126960,7 +125135,6 @@ self: {
        homepage = "https://github.com/mchakravarty/language-c-inline/";
        description = "Inline C & Objective-C code in Haskell for language interoperability";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-c-quote_0_10_2" = callPackage
@@ -127353,7 +125527,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-ecmascript" = callPackage
+  "language-ecmascript_0_17_0_2" = callPackage
     ({ mkDerivation, base, containers, data-default-class, Diff
      , directory, filepath, HUnit, mtl, parsec, QuickCheck
      , template-haskell, test-framework, test-framework-hunit
@@ -127376,6 +125550,31 @@ self: {
        homepage = "http://github.com/jswebtools/language-ecmascript";
        description = "JavaScript parser and pretty-printer library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "language-ecmascript" = callPackage
+    ({ mkDerivation, base, containers, data-default-class, Diff
+     , directory, filepath, HUnit, mtl, parsec, QuickCheck
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, testing-feat, uniplate, wl-pprint
+     }:
+     mkDerivation {
+       pname = "language-ecmascript";
+       version = "0.17.1.0";
+       sha256 = "df1e3f0d3096d522f278c644d3efbedabee29e2babfdf9d497287550f017883e";
+       libraryHaskellDepends = [
+         base containers data-default-class Diff mtl parsec QuickCheck
+         template-haskell testing-feat uniplate wl-pprint
+       ];
+       testHaskellDepends = [
+         base containers data-default-class Diff directory filepath HUnit
+         mtl parsec QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 uniplate wl-pprint
+       ];
+       homepage = "http://github.com/jswebtools/language-ecmascript";
+       description = "JavaScript parser and pretty-printer library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "language-ecmascript-analysis" = callPackage
@@ -127411,7 +125610,6 @@ self: {
        homepage = "https://github.com/scottgw/language-eiffel";
        description = "Parser and pretty printer for the Eiffel language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-fortran" = callPackage
@@ -127488,7 +125686,6 @@ self: {
        jailbreak = true;
        description = "A library for analysis and synthesis of Go code";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-guess" = callPackage
@@ -127574,7 +125771,6 @@ self: {
        ];
        description = "Parser for Java .class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-javascript_0_5_13" = callPackage
@@ -127779,7 +125975,6 @@ self: {
        homepage = "http://github.com/jtdaugherty/language-mixal/";
        description = "Parser, pretty-printer, and AST types for the MIXAL assembly language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-nix" = callPackage
@@ -127819,7 +126014,6 @@ self: {
        homepage = "http://www.tiresiaspress.us/haskell/language-objc";
        description = "Analysis and generation of Objective C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-openscad" = callPackage
@@ -127900,7 +126094,6 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-python" = callPackage
@@ -127934,7 +126127,6 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/";
        description = "Generate coloured XHTML for Python code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-python-test" = callPackage
@@ -127967,7 +126159,6 @@ self: {
        homepage = "https://github.com/qux-lang/language-qux";
        description = "Utilities for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-sh" = callPackage
@@ -127984,7 +126175,6 @@ self: {
        homepage = "http://code.haskell.org/shsh/";
        description = "A package for parsing shell scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-slice" = callPackage
@@ -128025,7 +126215,6 @@ self: {
        homepage = "https://github.com/bitonic/language-spelling";
        description = "Various tools to detect/correct mistakes in words";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-sqlite" = callPackage
@@ -128042,7 +126231,6 @@ self: {
        homepage = "http://dankna.com/software/";
        description = "Full parser and generator for SQL as implemented by SQLite3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-thrift_0_6_2_0" = callPackage
@@ -128130,7 +126318,6 @@ self: {
        homepage = "https://github.com/abhinav/language-thrift";
        description = "Parser and pretty printer for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-typescript" = callPackage
@@ -128213,7 +126400,6 @@ self: {
        jailbreak = true;
        description = "Tool to track security alerts on LWN";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "latest-npm-version" = callPackage
@@ -128246,7 +126432,6 @@ self: {
        homepage = "https://github.com/passy/latest-npm-version";
        description = "Find the latest version of a package on npm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "latex" = callPackage
@@ -128450,7 +126635,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "High and low-level interface to the Novation Launchpad midi controller";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lax" = callPackage
@@ -128476,7 +126660,6 @@ self: {
        homepage = "http://github.com/duairc/layers";
        description = "Modular type class machinery for monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "layers-game" = callPackage
@@ -128496,7 +126679,6 @@ self: {
        jailbreak = true;
        description = "A prototypical 2d platform game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "layout" = callPackage
@@ -128508,7 +126690,6 @@ self: {
        libraryHaskellDepends = [ base convertible hinduce-missingh ];
        description = "Turn values into pretty text or markup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "layout-bootstrap" = callPackage
@@ -128521,7 +126702,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/layout-bootstrap";
        description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lazy-csv_0_5" = callPackage
@@ -128576,7 +126756,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lazyio" = callPackage
@@ -128614,7 +126793,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Differential solving with lazy splines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lbfgs" = callPackage
@@ -128665,7 +126843,6 @@ self: {
        homepage = "http://urchin.earth.li/~ian/cabal/lcs/";
        description = "Find longest common sublist of two lists";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lda" = callPackage
@@ -128701,7 +126878,6 @@ self: {
        homepage = "https://supki.github.io/ldap-client";
        description = "Pure Haskell LDAP Client Library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ldif" = callPackage
@@ -128726,7 +126902,6 @@ self: {
        homepage = "http://rampa.sk/static/ldif.html";
        description = "The LDAP Data Interchange Format (LDIF) tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leaf" = callPackage
@@ -128746,7 +126921,6 @@ self: {
        homepage = "https://github.com/skypers/leaf";
        description = "A simple portfolio generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leaky" = callPackage
@@ -128767,7 +126941,6 @@ self: {
        homepage = "http://fremissant.net/leaky";
        description = "Robust space leak, and its strictification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leankit-api" = callPackage
@@ -128825,7 +126998,6 @@ self: {
        ];
        description = "Haskell code for learning physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "learn-physics-examples" = callPackage
@@ -128844,7 +127016,6 @@ self: {
        jailbreak = true;
        description = "examples for learn-physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "learning-hmm" = callPackage
@@ -129651,7 +127822,6 @@ self: {
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
@@ -129679,7 +127849,6 @@ self: {
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) leveldb;};
 
   "levmar" = callPackage
@@ -129693,7 +127862,6 @@ self: {
        homepage = "https://github.com/basvandijk/levmar";
        description = "An implementation of the Levenberg-Marquardt algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-darwin" ];
      }) {};
 
   "levmar-chart" = callPackage
@@ -129712,7 +127880,6 @@ self: {
        jailbreak = true;
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lexer-applicative" = callPackage
@@ -129759,7 +127926,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LGtk";
        description = "Lens GUI Toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lha" = callPackage
@@ -129772,7 +127938,6 @@ self: {
        homepage = "https://github.com/bytbox/lha.hs";
        description = "Data structures for the Les Houches Accord";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lhae" = callPackage
@@ -129794,7 +127959,6 @@ self: {
        homepage = "http://www.imn.htwk-leipzig.de/~abau/lhae";
        description = "Simple spreadsheet program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lhc" = callPackage
@@ -129832,7 +127996,6 @@ self: {
        libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ];
        description = "Parser and writer for Les-Houches event files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lhs2TeX-hl" = callPackage
@@ -129935,7 +128098,6 @@ self: {
        homepage = "http://trac.loria.fr/~geni";
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libarchive-conduit" = callPackage
@@ -129973,7 +128135,6 @@ self: {
        homepage = "https://github.com/peddie/libconfig-haskell";
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libconfig;};
 
   "libcspm" = callPackage
@@ -129996,7 +128157,6 @@ self: {
        homepage = "https://github.com/tomgr/libcspm";
        description = "A library providing a parser, type checker and evaluator for CSPM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libexpect" = callPackage
@@ -130009,7 +128169,6 @@ self: {
        librarySystemDepends = [ expect tcl ];
        description = "Library for interacting with console applications via pseudoterminals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) expect; inherit (pkgs) tcl;};
 
   "libffi" = callPackage
@@ -130064,7 +128223,6 @@ self: {
        homepage = "http://maartenfaddegon.nl";
        description = "Store and manipulate data in a graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libhbb" = callPackage
@@ -130089,7 +128247,6 @@ self: {
        homepage = "https://bitbucket.org/bhris/libhbb";
        description = "Backend for text editors to provide better Haskell editing support";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libinfluxdb" = callPackage
@@ -130134,7 +128291,6 @@ self: {
        ];
        description = "Jenkins API interface";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "liblastfm" = callPackage
@@ -130176,7 +128332,6 @@ self: {
        homepage = "http://github.com/NathanHowell/liblinear-enumerator";
        description = "liblinear iteratee";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "libltdl" = callPackage
@@ -130192,7 +128347,6 @@ self: {
        homepage = "http://www.eecs.harvard.edu/~mainland/projects/libffi";
        description = "FFI interface to libltdl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libmpd" = callPackage
@@ -130263,7 +128417,6 @@ self: {
        homepage = "http://okmij.org/ftp/";
        description = "An evolving collection of Oleg Kiselyov's Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libpafe" = callPackage
@@ -130278,7 +128431,6 @@ self: {
        jailbreak = true;
        description = "Wrapper for libpafe";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {pafe = null;};
 
   "libpq" = callPackage
@@ -130292,7 +128444,6 @@ self: {
        homepage = "http://github.com/tnarg/haskell-libpq";
        description = "libpq binding for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
   "librandomorg" = callPackage
@@ -130377,7 +128528,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/libssh2-hs";
        description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libstackexchange" = callPackage
@@ -130414,7 +128564,6 @@ self: {
        ];
        description = "Haskell bindings for libsystemd-daemon";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libsystemd-daemon = null; systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
@@ -130434,7 +128583,6 @@ self: {
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
@@ -130464,7 +128612,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/libvirt-hs";
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {virt = null;};
 
   "libvorbis" = callPackage
@@ -130500,7 +128647,6 @@ self: {
        librarySystemDepends = [ libxml2 ];
        description = "Binding to libxml2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libxml2;};
 
   "libxml-enumerator" = callPackage
@@ -130545,7 +128691,6 @@ self: {
        jailbreak = true;
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {xslt = null;};
 
   "life" = callPackage
@@ -130560,7 +128705,6 @@ self: {
        homepage = "http://github.com/sproingie/haskell-cells/";
        description = "Conway's Life cellular automaton";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lift-generics" = callPackage
@@ -130790,7 +128934,6 @@ self: {
        homepage = "http://icfpcontest2012.wordpress.com/";
        description = "A boulderdash-like game and solution validator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ligature" = callPackage
@@ -130831,7 +128974,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Lighttpd configuration file tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lighttpd-conf-qq" = callPackage
@@ -130848,7 +128990,6 @@ self: {
        ];
        description = "A QuasiQuoter for lighttpd configuration files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lilypond" = callPackage
@@ -130865,7 +129006,6 @@ self: {
        ];
        description = "Bindings to Lilypond";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "limp" = callPackage
@@ -130899,7 +129039,6 @@ self: {
        homepage = "https://github.com/amosr/limp-cbc";
        description = "bindings for integer linear programming solver Coin/CBC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lin-alg" = callPackage
@@ -130911,7 +129050,6 @@ self: {
        libraryHaskellDepends = [ base NumInstances vector ];
        description = "Low-dimensional matrices and vectors for graphics and physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linda" = callPackage
@@ -130923,7 +129061,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix HUnit ];
        description = "LINear Discriminant Analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lindenmayer" = callPackage
@@ -131240,7 +129377,6 @@ self: {
        homepage = "http://github.com/cartazio/hs-cblas";
        description = "A linear algebra library with bindings to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-circuit" = callPackage
@@ -131262,7 +129398,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/linear-circuit";
        description = "Compute resistance of linear electrical circuits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-grammar" = callPackage
@@ -131289,7 +129424,6 @@ self: {
        jailbreak = true;
        description = "Finite maps for linear use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-opengl" = callPackage
@@ -131307,7 +129441,6 @@ self: {
        homepage = "http://www.github.com/bgamari/linear-opengl";
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-vect" = callPackage
@@ -131368,7 +129501,6 @@ self: {
        homepage = "http://github.com/jwiegley/linearscan-hoopl";
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linebreak" = callPackage
@@ -131426,7 +129558,6 @@ self: {
        homepage = "http://www.haskell.org/~petersen/haskell/linkchk/";
        description = "linkchk is a network interface link ping monitor";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linkcore" = callPackage
@@ -131442,7 +129573,6 @@ self: {
        ];
        description = "Combines multiple GHC Core modules into a single module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linkedhashmap" = callPackage
@@ -131504,7 +129634,6 @@ self: {
        homepage = "http://github.com/Helkafen/haskell-linode#readme";
        description = "Bindings to the Linode API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linux-blkid" = callPackage
@@ -131522,7 +129651,6 @@ self: {
        jailbreak = true;
        description = "Linux libblkid";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {blkid = null;};
 
   "linux-cgroup" = callPackage
@@ -131547,7 +129675,6 @@ self: {
        homepage = "http://github.com/bgamari/linux-evdev";
        description = "Bindings to Linux evdev input device interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-file-extents" = callPackage
@@ -131562,7 +129689,6 @@ self: {
        homepage = "https://github.com/redneb/linux-file-extents";
        description = "Retrieve file fragmentation information under Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-inotify" = callPackage
@@ -131574,7 +129700,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hashable unix ];
        description = "Thinner binding to the Linux Kernel's inotify interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-kmod" = callPackage
@@ -131588,7 +129713,6 @@ self: {
        homepage = "https://github.com/tensor5/linux-kmod";
        description = "Linux kernel modules support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libkmod = null;};
 
   "linux-mount" = callPackage
@@ -131601,7 +129725,6 @@ self: {
        homepage = "https://github.com/tensor5/linux-mount";
        description = "Mount and unmount filesystems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-namespaces" = callPackage
@@ -131614,7 +129737,6 @@ self: {
        homepage = "https://github.com/redneb/hs-linux-namespaces";
        description = "Create new or enter an existing linux namespaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-perf" = callPackage
@@ -131638,7 +129760,6 @@ self: {
        homepage = "https://github.com/bjpop/haskell-linux-perf";
        description = "Read files generated by perf on Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linux-ptrace" = callPackage
@@ -131655,7 +129776,6 @@ self: {
        jailbreak = true;
        description = "Wrapping of Linux' ptrace(2)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linux-xattr" = callPackage
@@ -131717,7 +129837,6 @@ self: {
        ];
        description = "Labeled IO library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lio-fs" = callPackage
@@ -131733,7 +129852,6 @@ self: {
        ];
        description = "Labeled File System interface for LIO";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lio-simple" = callPackage
@@ -131759,7 +129877,6 @@ self: {
        homepage = "http://simple.cx";
        description = "LIO support for the Simple web framework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lipsum-gen" = callPackage
@@ -132219,7 +130336,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/list-t-html-parser";
        description = "Streaming HTML parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-t-http-client" = callPackage
@@ -132315,7 +130431,6 @@ self: {
        homepage = "http://jwlato.webfactional.com/haskell/listlike-instances";
        description = "Extra instances of the ListLike class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lists" = callPackage
@@ -132371,7 +130486,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Non-overloaded functions for concrete literals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "live-sequencer" = callPackage
@@ -132400,7 +130514,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer";
        description = "Live coding of MIDI music";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ll-picosat" = callPackage
@@ -132413,7 +130526,6 @@ self: {
        librarySystemDepends = [ picosat ];
        jailbreak = true;
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) picosat;};
 
   "llrbtree" = callPackage
@@ -132447,7 +130559,6 @@ self: {
        homepage = "http://wiki.secondlife.com/wiki/LLSD";
        description = "An implementation of the LLSD data system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm" = callPackage
@@ -132465,7 +130576,6 @@ self: {
        homepage = "https://github.com/bos/llvm";
        description = "Bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-analysis" = callPackage
@@ -132493,7 +130603,6 @@ self: {
        ];
        description = "A Haskell library for analyzing LLVM bitcode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-base" = callPackage
@@ -132506,7 +130615,6 @@ self: {
        homepage = "https://github.com/bos/llvm";
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-base-types" = callPackage
@@ -132526,7 +130634,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "The base types for a mostly pure Haskell LLVM analysis library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-base-util" = callPackage
@@ -132539,7 +130646,6 @@ self: {
        homepage = "https://github.com/bos/llvm";
        description = "Utilities for bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-data-interop" = callPackage
@@ -132560,7 +130666,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A low-level data interoperability binding for LLVM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-extra" = callPackage
@@ -132580,7 +130685,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/llvm-extra/";
        description = "Utility functions for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-ffi" = callPackage
@@ -132596,7 +130700,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/LLVM";
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (self.llvmPackages) llvm;};
 
   "llvm-general" = callPackage
@@ -132670,7 +130773,6 @@ self: {
        homepage = "https://github.com/tvh/llvm-general-quote";
        description = "QuasiQuoting llvm code for llvm-general";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-ht" = callPackage
@@ -132687,7 +130789,6 @@ self: {
        homepage = "http://darcs.serpentine.com/llvm/";
        description = "Bindings to the LLVM compiler toolkit with some custom extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-pkg-config" = callPackage
@@ -132761,7 +130862,6 @@ self: {
        ];
        description = "Bindings to the LLVM compiler toolkit using type families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-tools" = callPackage
@@ -132789,7 +130889,6 @@ self: {
        jailbreak = true;
        description = "Useful tools built on llvm-analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lmdb" = callPackage
@@ -132803,7 +130902,6 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-lmdb";
        description = "Lightning MDB bindings";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) lmdb;};
 
   "lmonad" = callPackage
@@ -132824,7 +130922,6 @@ self: {
        ];
        description = "LMonad is an Information Flow Control (IFC) framework for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lmonad-yesod" = callPackage
@@ -132845,7 +130942,6 @@ self: {
        ];
        description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "load-env" = callPackage
@@ -132897,7 +130993,6 @@ self: {
        homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellLocalSearch";
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "located-base" = callPackage
@@ -132944,7 +131039,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Support for precise error locations in source files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "loch-th" = callPackage
@@ -133003,7 +131097,6 @@ self: {
        ];
        description = "Very simple poll lock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lockfree-queue" = callPackage
@@ -133046,7 +131139,6 @@ self: {
        homepage = "https://github.com/scrive/log";
        description = "Structured logging solution with multiple backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "log-domain_0_9_3" = callPackage
@@ -133266,7 +131358,6 @@ self: {
        homepage = "https://github.com/ibotty/log-effect";
        description = "An extensible log effect using extensible-effects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log2json" = callPackage
@@ -133282,7 +131373,6 @@ self: {
        homepage = "https://github.com/haroldl/log2json";
        description = "Turn log file records into JSON";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logfloat_0_12_1" = callPackage
@@ -133421,7 +131511,6 @@ self: {
        ];
        description = "Journald back-end for logging-facade";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "logic-TPTP" = callPackage
@@ -133462,7 +131551,6 @@ self: {
        homepage = "https://github.com/seereason/logic-classes";
        description = "Framework for propositional and first order logic, theorem proving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logicst" = callPackage
@@ -133547,7 +131635,6 @@ self: {
        jailbreak = true;
        description = "Useful utilities for the Lojban language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lojbanParser" = callPackage
@@ -133562,7 +131649,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "lojban parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lojbanXiragan" = callPackage
@@ -133577,7 +131663,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "lojban to xiragan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lojysamban" = callPackage
@@ -133592,7 +131677,6 @@ self: {
        homepage = "http://homepage3.nifty.com/salamander/myblog/lojysamban.html";
        description = "Prolog with lojban";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lol" = callPackage
@@ -133605,8 +131689,10 @@ self: {
      }:
      mkDerivation {
        pname = "lol";
-       version = "0.2.0.0";
-       sha256 = "8787dde0e356a8d436fc6dcea548098bb9e92237fc138701582e2f5eabbce564";
+       version = "0.2.0.1";
+       sha256 = "275b9cd28a8a2b9d8bdfeeda02cc409f820d3aeab79c3ce647561ffc3cb7b446";
+       revision = "1";
+       editedCabalFile = "47c14b05d02b22f27307dbfa5f1a499a9508d63512fc4a77a467ef22053b9149";
        libraryHaskellDepends = [
          arithmoi base binary bytestring constraints containers crypto-api
          data-default deepseq MonadRandom mtl numeric-prelude QuickCheck
@@ -133621,7 +131707,6 @@ self: {
        homepage = "https://github.com/cpeikert/Lol";
        description = "A library for lattice cryptography";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "lol-apps" = callPackage
@@ -133633,8 +131718,8 @@ self: {
        pname = "lol-apps";
        version = "0.0.0.1";
        sha256 = "988a006f77beb0fdf40ad446d1ae333b93bc60d818e3623f323eb1ff9349d149";
-       revision = "1";
-       editedCabalFile = "60383b773f8b931df96fac94a014194fcbc8f7f31025471e49e39ffc2b991907";
+       revision = "2";
+       editedCabalFile = "0b6c201fff6fbe7f10bb5777ae8cefad4668865e5a30b260961453ad49eabb8f";
        libraryHaskellDepends = [
          base deepseq lol MonadRandom numeric-prelude
        ];
@@ -133663,7 +131748,6 @@ self: {
        homepage = "http://github.com/nfjinjing/loli";
        description = "A minimum web dev DSL in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lookup-tables" = callPackage
@@ -133719,7 +131803,6 @@ self: {
        homepage = "https://github.com/konn/loop-effin";
        description = "control-monad-loop port for effin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "loop-while" = callPackage
@@ -133767,7 +131850,6 @@ self: {
        homepage = "http://www.esc.cam.ac.uk/people/research-students/emily-king";
        description = "Find all biological feedback loops within an ecosystem graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lord" = callPackage
@@ -133808,7 +131890,6 @@ self: {
        homepage = "https://github.com/rnons/lord";
        description = "A command line interface to online radios";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lorem" = callPackage
@@ -133840,7 +131921,6 @@ self: {
        homepage = "http://www.tiresiaspress.us/haskell/loris";
        description = "interface to Loris API";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {loris = null;};
 
   "loshadka" = callPackage
@@ -133880,7 +131960,6 @@ self: {
        homepage = "http://www.ncc.up.pt/~pbv/stuff/lostcities";
        description = "An implementation of an adictive two-player card game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lowgl" = callPackage
@@ -133932,7 +132011,6 @@ self: {
        ];
        description = "SVG Backend for lp-diagrams";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lrucache" = callPackage
@@ -133965,7 +132043,6 @@ self: {
        homepage = "https://github.com/roelvandijk/ls-usb";
        description = "List USB devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lscabal" = callPackage
@@ -133984,7 +132061,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/lscabal";
        description = "List exported modules from a set of .cabal files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lss" = callPackage
@@ -134023,7 +132099,6 @@ self: {
        ];
        description = "Paint an L-System Grammar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ltext" = callPackage
@@ -134111,7 +132186,6 @@ self: {
        jailbreak = true;
        description = "Library functions for reading and writing Lua chunks";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "luautils" = callPackage
@@ -134318,7 +132392,6 @@ self: {
        homepage = "http://www.imn.htwk-leipzig.de/~abau/lucienne";
        description = "Server side feed aggregator/reader";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "luhn" = callPackage
@@ -134345,7 +132418,6 @@ self: {
        ];
        description = "Purely FunctionaL User Interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "luka" = callPackage
@@ -134359,7 +132431,6 @@ self: {
        homepage = "https://github.com/nfjinjing/luka";
        description = "Simple ObjectiveC runtime binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {objc = null;};
 
   "luminance_0_9_1" = callPackage
@@ -134475,7 +132546,6 @@ self: {
        homepage = "https://github.com/phaazon/luminance-samples";
        description = "Luminance samples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lushtags" = callPackage
@@ -134491,7 +132561,6 @@ self: {
        homepage = "https://github.com/bitc/lushtags";
        description = "Create ctags compatible tags files for Haskell programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "luthor" = callPackage
@@ -134505,7 +132574,6 @@ self: {
        homepage = "https://github.com/Zankoku-Okuno/luthor";
        description = "Tools for lexing and utilizing lexemes that integrate with Parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lvish" = callPackage
@@ -134534,7 +132602,6 @@ self: {
        jailbreak = true;
        description = "Parallel scheduler, LVar data structures, and infrastructure to build more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lvmlib" = callPackage
@@ -134556,7 +132623,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "The Lazy Virtual Machine (LVM)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lvmrun" = callPackage
@@ -134582,7 +132648,6 @@ self: {
        homepage = "https://github.com/fizruk/lxc";
        description = "High level Haskell bindings to LXC (Linux containers)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lye" = callPackage
@@ -134600,7 +132665,6 @@ self: {
        ];
        description = "A Lilypond-compiling music box";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lz4" = callPackage
@@ -134636,7 +132700,6 @@ self: {
        homepage = "https://github.com/hvr/lzma";
        description = "LZMA/XZ compression and decompression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) lzma;};
 
   "lzma-clib" = callPackage
@@ -134789,7 +132852,6 @@ self: {
        homepage = "https://github.com/hvr/lzma-streams";
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "maam" = callPackage
@@ -135186,7 +133248,6 @@ self: {
        homepage = "http://www.scannedinavian.com/~shae/mage-1.0pre35.tar.gz";
        description = "Rogue-like";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "magic" = callPackage
@@ -135216,7 +133277,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/magico";
        description = "Compute solutions for Magico puzzle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "magma" = callPackage
@@ -135250,7 +133310,6 @@ self: {
        homepage = "http://kagami.touhou.ru/projects/show/mahoro";
        description = "ImageBoards to XMPP gate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maid" = callPackage
@@ -135400,7 +133459,6 @@ self: {
        jailbreak = true;
        description = "Majordomo protocol for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "majority" = callPackage
@@ -135413,7 +133471,6 @@ self: {
        homepage = "https://github.com/niswegmann/majority";
        description = "Boyer-Moore Majority Vote Algorithm";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "make-hard-links" = callPackage
@@ -135524,7 +133581,6 @@ self: {
        jailbreak = true;
        description = "The Haskell/Gtk+ Integrated Live Environment";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-all" = callPackage
@@ -135550,7 +133606,6 @@ self: {
        doHaddock = false;
        description = "Virtual package to install all Manatee packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-anything" = callPackage
@@ -135572,7 +133627,6 @@ self: {
        jailbreak = true;
        description = "Multithread interactive input/search framework for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-browser" = callPackage
@@ -135592,7 +133646,6 @@ self: {
        jailbreak = true;
        description = "Browser extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-core" = callPackage
@@ -135617,7 +133670,6 @@ self: {
        jailbreak = true;
        description = "The core of Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-curl" = callPackage
@@ -135640,7 +133692,6 @@ self: {
        jailbreak = true;
        description = "Download Manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-editor" = callPackage
@@ -135661,7 +133712,6 @@ self: {
        jailbreak = true;
        description = "Editor extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-filemanager" = callPackage
@@ -135682,7 +133732,6 @@ self: {
        jailbreak = true;
        description = "File manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-imageviewer" = callPackage
@@ -135703,7 +133752,6 @@ self: {
        jailbreak = true;
        description = "Image viewer extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-ircclient" = callPackage
@@ -135728,7 +133776,6 @@ self: {
        jailbreak = true;
        description = "IRC client extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-mplayer" = callPackage
@@ -135750,7 +133797,6 @@ self: {
        jailbreak = true;
        description = "Mplayer client extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-pdfviewer" = callPackage
@@ -135771,7 +133817,6 @@ self: {
        jailbreak = true;
        description = "PDF viewer extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-processmanager" = callPackage
@@ -135791,7 +133836,6 @@ self: {
        jailbreak = true;
        description = "Process manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-reader" = callPackage
@@ -135812,7 +133856,6 @@ self: {
        jailbreak = true;
        description = "Feed reader extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-template" = callPackage
@@ -135833,7 +133876,6 @@ self: {
        jailbreak = true;
        description = "Template code to create Manatee application";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-terminal" = callPackage
@@ -135853,7 +133895,6 @@ self: {
        jailbreak = true;
        description = "Terminal Emulator extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-welcome" = callPackage
@@ -135874,7 +133915,6 @@ self: {
        jailbreak = true;
        description = "Welcome module to help user play Manatee quickly";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mancala" = callPackage
@@ -136079,7 +134119,6 @@ self: {
        homepage = "http://gitorious.org/maximus/mandulia";
        description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mangopay_1_11_4" = callPackage
@@ -136204,7 +134243,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manifold-random" = callPackage
@@ -136294,7 +134332,6 @@ self: {
        homepage = "https://github.com/paolino/marionetta";
        description = "A study of marionetta movements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown_0_1_13" = callPackage
@@ -136386,7 +134423,6 @@ self: {
        homepage = "https://github.com/joelteon/markdown-kate";
        description = "Convert Markdown to HTML, with XSS protection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown-pap" = callPackage
@@ -136398,7 +134434,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown-unlit_0_2_0_1" = callPackage
@@ -136458,7 +134493,6 @@ self: {
        ];
        description = "markdown to svg converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marked-pretty" = callPackage
@@ -136511,7 +134545,6 @@ self: {
        testHaskellDepends = [ assertions base bifunctors memoize random ];
        description = "Hidden Markov processes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markup_1_1_0" = callPackage
@@ -136570,7 +134603,6 @@ self: {
        jailbreak = true;
        description = "A simple markup document preview (markdown, textile, reStructuredText)";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marmalade-upload" = callPackage
@@ -136601,7 +134633,6 @@ self: {
        homepage = "https://github.com/lunaryorn/marmalade-upload";
        description = "Upload packages to Marmalade";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marquise" = callPackage
@@ -136636,7 +134667,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Client library for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marxup" = callPackage
@@ -136662,7 +134692,6 @@ self: {
        jailbreak = true;
        description = "Markup language preprocessor for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "masakazu-bot" = callPackage
@@ -136687,7 +134716,6 @@ self: {
        homepage = "https://github.com/minamiyama1994/chomado-bot-on-haskell/tree/minamiyama1994";
        description = "@minamiyama1994_bot on haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mastermind" = callPackage
@@ -136716,7 +134744,6 @@ self: {
        homepage = "http://www.github.com/massysett/matchers";
        description = "Text matchers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) pcre;};
 
   "math-functions" = callPackage
@@ -136766,7 +134793,6 @@ self: {
        homepage = "http://jtdaugherty.github.io/mathblog/";
        description = "A program for creating and managing a static weblog with LaTeX math and diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mathgenealogy" = callPackage
@@ -136828,7 +134854,6 @@ self: {
        homepage = "http://community.haskell.org/~TracyWadleigh/mathlink";
        description = "Write Mathematica packages in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "matlab" = callPackage
@@ -136842,7 +134867,6 @@ self: {
        jailbreak = true;
        description = "Matlab bindings and interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {eng = null; mat = null; mx = null;};
 
   "matrices_0_4_2" = callPackage
@@ -137007,7 +135031,6 @@ self: {
        homepage = "http://kagami.touhou.ru/projects/show/matsuri";
        description = "ncurses XMPP client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maude" = callPackage
@@ -137024,7 +135047,6 @@ self: {
        homepage = "https://github.com/davidlazar/maude-hs";
        description = "An interface to the Maude rewriting system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maxent" = callPackage
@@ -137048,7 +135070,6 @@ self: {
        homepage = "https://github.com/jfischoff/maxent";
        description = "Compute Maximum Entropy Distributions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maximal-cliques" = callPackage
@@ -137082,7 +135103,6 @@ self: {
        homepage = "http://rochel.info/maxsharing/";
        description = "Maximal sharing of terms in the lambda calculus with letrec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maybe-justify" = callPackage
@@ -137115,7 +135135,6 @@ self: {
        homepage = "http://code.google.com/p/maybench/";
        description = "Automated benchmarking tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mbox_0_3" = callPackage
@@ -137161,7 +135180,6 @@ self: {
        homepage = "https://github.com/np/mbox-tools";
        description = "A collection of tools to process mbox files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mcmaster-gloss-examples" = callPackage
@@ -137176,7 +135194,6 @@ self: {
        jailbreak = true;
        homepage = "http://www.cas.mcmaster.ca/~anand/";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "mcmc-samplers" = callPackage
@@ -137193,7 +135210,6 @@ self: {
        jailbreak = true;
        description = "Combinators for MCMC sampling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mcmc-synthesis" = callPackage
@@ -137276,7 +135292,6 @@ self: {
        homepage = "https://github.com/dorafmon/mdcat";
        description = "Markdown viewer in your terminal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mdo" = callPackage
@@ -137322,7 +135337,6 @@ self: {
        homepage = "http://github.com/tanakh/hsmecab";
        description = "A Haskell binding to MeCab";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mecab = null;};
 
   "mecha" = callPackage
@@ -137355,7 +135369,6 @@ self: {
        ];
        description = "Interfacing with the MediaWiki API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mediawiki2latex" = callPackage
@@ -137381,7 +135394,6 @@ self: {
        homepage = "http://sourceforge.net/projects/wb2pdf/";
        description = "Convert MediaWiki text to LaTeX";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "medium-sdk-haskell" = callPackage
@@ -137399,7 +135411,6 @@ self: {
        jailbreak = true;
        description = "Haskell SDK for communicating with the Medium API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meep" = callPackage
@@ -137420,7 +135431,6 @@ self: {
        ];
        description = "A silly container";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mega-sdist" = callPackage
@@ -137442,7 +135452,6 @@ self: {
        homepage = "https://github.com/snoyberg/mega-sdist";
        description = "Handles uploading to Hackage from mega repos (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "megaparsec_4_2_0" = callPackage
@@ -137465,7 +135474,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "megaparsec_4_3_0" = callPackage
+  "megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, mtl, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , text, transformers
@@ -137484,10 +135493,9 @@ self: {
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "megaparsec" = callPackage
+  "megaparsec_4_4_0" = callPackage
     ({ mkDerivation, base, bytestring, fail, HUnit, mtl, QuickCheck
      , semigroups, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, transformers
@@ -137503,9 +135511,11 @@ self: {
          base HUnit mtl QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meldable-heap" = callPackage
@@ -137540,7 +135550,6 @@ self: {
        jailbreak = true;
        description = "A functional scripting language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memcache" = callPackage
@@ -137683,7 +135692,6 @@ self: {
        homepage = "https://gitorious.org/memo-sqlite";
        description = "memoize functions using SQLite3 database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memoization-utils" = callPackage
@@ -137997,7 +136005,6 @@ self: {
        homepage = "https://github.com/simonmar/monad-par";
        description = "Support for integrated Accelerate computations within Meta-par";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "metadata" = callPackage
@@ -138033,7 +136040,6 @@ self: {
        libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ];
        description = "a tiny ghc api wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "metric" = callPackage
@@ -138052,7 +136058,6 @@ self: {
        ];
        description = "Metric spaces";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "metrics" = callPackage
@@ -138100,7 +136105,6 @@ self: {
        ];
        description = "Time Synchronized execution";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mezzolens" = callPackage
@@ -138128,7 +136132,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Equation solver and calculator à la metafont";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mgeneric" = callPackage
@@ -138333,7 +136336,6 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "True folds and getters for microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-each" = callPackage
@@ -138700,7 +136702,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Convert between datatypes of the midi and the alsa packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "midi-music-box" = callPackage
@@ -138758,7 +136759,6 @@ self: {
        homepage = "http://www.youtube.com/watch?v=cOlR73h2uII";
        description = "A Memory-like (Concentration, Pairs, ...) game for tones";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "midisurface" = callPackage
@@ -138777,7 +136777,6 @@ self: {
        jailbreak = true;
        description = "A control midi surface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mighttpd" = callPackage
@@ -138798,7 +136797,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "Simple Web Server in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mighttpd2" = callPackage
@@ -138830,7 +136828,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "High performance web server on WAI/warp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mighty-metropolis" = callPackage
@@ -138860,7 +136857,6 @@ self: {
        homepage = "https://github.com/evanrinehart/mikmod";
        description = "MikMod bindings";
        license = "LGPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "miku" = callPackage
@@ -138929,7 +136925,6 @@ self: {
        homepage = "http://github.com/mboes/mime-directory";
        description = "A library for parsing/printing the text/directory mime type";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime-mail_0_4_6" = callPackage
@@ -139161,7 +137156,6 @@ self: {
        ];
        description = "MIME implementation for String's";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime-types_0_1_0_4" = callPackage
@@ -139233,7 +137227,6 @@ self: {
        jailbreak = true;
        description = "Minesweeper game which is always solvable without guessing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "miniball" = callPackage
@@ -139246,7 +137239,6 @@ self: {
        homepage = "http://nonempty.org/software/haskell-miniball";
        description = "Bindings to Miniball, a smallest enclosing ball library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "miniforth" = callPackage
@@ -139269,7 +137261,6 @@ self: {
        jailbreak = true;
        description = "Miniature FORTH-like interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minilens" = callPackage
@@ -139330,7 +137321,6 @@ self: {
        executableHaskellDepends = [ base GLUT haskell98 unix ];
        description = "Shows how to run grabber on Mac OS X";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minions" = callPackage
@@ -139365,7 +137355,6 @@ self: {
        homepage = "https://github.com/fumieval/minioperational";
        description = "fast and simple operational monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "miniplex" = callPackage
@@ -139383,7 +137372,6 @@ self: {
        jailbreak = true;
        description = "simple 1-to-N interprocess communication";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minirotate" = callPackage
@@ -139405,7 +137393,6 @@ self: {
        homepage = "http://tener.github.com/haskell-minirotate/";
        description = "Minimalistic file rotation utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minisat" = callPackage
@@ -139417,7 +137404,6 @@ self: {
        libraryHaskellDepends = [ async base ];
        description = "A Haskell bundle of the Minisat SAT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ministg" = callPackage
@@ -139437,7 +137423,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Ministg";
        description = "an interpreter for an operational semantics for the STG machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "miniutter" = callPackage
@@ -139470,7 +137455,7 @@ self: {
        testHaskellDepends = [ base binary directory hspec vector ];
        jailbreak = true;
        homepage = "https://github.com/kryoxide/minst-idx/";
-       description = "Read and write IDX data that is used in e.g. the MINST database";
+       description = "Read and write IDX data that is used in e.g. the MINST database.";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -139492,7 +137477,6 @@ self: {
        homepage = "https://github.com/minamiyama1994/mirror-tweet";
        description = "Tweet mirror";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "misfortune" = callPackage
@@ -139540,7 +137524,6 @@ self: {
        homepage = "https://github.com/domdere/missing-py2";
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mix-arrows" = callPackage
@@ -139552,7 +137535,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mixing effects of one arrow into another one";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mixed-strategies" = callPackage
@@ -139582,9 +137564,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath haskell98 ];
-       description = "Makes an OS X .app bundle from a binary";
+       description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mkcabal" = callPackage
@@ -139618,7 +137599,6 @@ self: {
        executableHaskellDepends = [ base mtl parsec pretty ];
        description = "Minimal ML language to to demonstrate the W type infererence algorithm";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mlist" = callPackage
@@ -139631,7 +137611,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/mlist";
        description = "Monadic List alternative to lazy I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmap" = callPackage
@@ -139693,7 +137672,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modular Monad transformer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmtl-base" = callPackage
@@ -139705,7 +137683,6 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "MonadBase type-class for mmtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "moan" = callPackage
@@ -139724,7 +137701,6 @@ self: {
        homepage = "https://github.com/vjeranc/moan";
        description = "Language-agnostic analyzer for positional morphosyntactic tags";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mockery_0_3_0" = callPackage
@@ -139796,7 +137772,6 @@ self: {
        jailbreak = true;
        description = "A parser for the modelica language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modify-fasta_0_8_0_4" = callPackage
@@ -139866,7 +137841,6 @@ self: {
        ];
        description = "Haskell source splitter driven by special comments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modular-arithmetic" = callPackage
@@ -139900,7 +137874,6 @@ self: {
        homepage = "https://github.com/DanBurton/modular-prelude#readme";
        description = "A new Prelude featuring first class modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modular-prelude-classy" = callPackage
@@ -139914,7 +137887,6 @@ self: {
        homepage = "https://github.com/DanBurton/modular-prelude#readme";
        description = "Reifying ClassyPrelude a la ModularPrelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "module-management" = callPackage
@@ -139947,7 +137919,6 @@ self: {
        homepage = "https://github.com/seereason/module-management";
        description = "Clean up module imports, split and merge modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modulespection" = callPackage
@@ -140072,7 +138043,6 @@ self: {
        homepage = "http://code.haskell.org/mohws/";
        description = "Modular Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mole" = callPackage
@@ -140118,7 +138088,6 @@ self: {
        homepage = "https://github.com/mvv/monad-abort-fd";
        description = "A better error monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-atom" = callPackage
@@ -140131,7 +138100,6 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "Monadically convert object to unique integers and back";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-atom-simple" = callPackage
@@ -140143,7 +138111,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically map objects to unique ints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-bool" = callPackage
@@ -140341,7 +138308,6 @@ self: {
        jailbreak = true;
        description = "Exstensible monadic exceptions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-extras_0_5_9" = callPackage
@@ -140432,7 +138398,6 @@ self: {
        homepage = "http://github.com/patperry/monad-interleave";
        description = "Monads with an unsaveInterleaveIO-like operation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-journal_0_5_0_1" = callPackage
@@ -140520,7 +138485,6 @@ self: {
        homepage = "https://github.com/ivan-m/monad-levels";
        description = "Specific levels of monad transformers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger_0_3_11" = callPackage
@@ -140841,7 +138805,6 @@ self: {
        homepage = "https://github.com/bjin/monad-lrs";
        description = "a monad to calculate linear recursive sequence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-memo" = callPackage
@@ -140863,7 +138826,6 @@ self: {
        homepage = "https://github.com/EduardSergeev/monad-memo";
        description = "Memoization monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-mersenne-random" = callPackage
@@ -140876,7 +138838,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/monad-mersenne-random";
        description = "An efficient random generator monad, based on the Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-open" = callPackage
@@ -141103,7 +139064,6 @@ self: {
        jailbreak = true;
        description = "Fast monads and monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-resumption" = callPackage
@@ -141197,7 +139157,6 @@ self: {
        homepage = "http://github.com/taruti/monad-stlike-io";
        description = "ST-like monad capturing variables to regions and supporting IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-stlike-stm" = callPackage
@@ -141210,7 +139169,6 @@ self: {
        homepage = "http://github.com/taruti/monad-stlike-stm";
        description = "ST-like monad capturing variables to regions and supporting STM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-stm" = callPackage
@@ -141269,7 +139227,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A transactional state monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-unify" = callPackage
@@ -141284,7 +139241,6 @@ self: {
        jailbreak = true;
        description = "Generic first-order unification";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-unlift" = callPackage
@@ -141361,7 +139317,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The Acme and AcmeT monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monadbi" = callPackage
@@ -141476,7 +139431,6 @@ self: {
        homepage = "http://users.ugent.be/~tschrijv/MCP/";
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monadiccp-gecode" = callPackage
@@ -141494,7 +139448,6 @@ self: {
        homepage = "http://users.ugent.be/~tschrijv/MCP/";
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gecodeint = null; gecodekernel = null; gecodesearch = null; 
          gecodeset = null; gecodesupport = null;};
 
@@ -141617,7 +139570,6 @@ self: {
        homepage = "https://github.com/notogawa/monarch";
        description = "Monadic interface for TokyoTyrant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mongoDB_2_0_3" = callPackage
@@ -141819,7 +139771,6 @@ self: {
        homepage = "https://github.com/docmunch/haskell-mongodb-queue";
        description = "message queue using MongoDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mongrel2-handler" = callPackage
@@ -141838,7 +139789,6 @@ self: {
        jailbreak = true;
        description = "Mongrel2 Handler Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monitor" = callPackage
@@ -141852,7 +139802,6 @@ self: {
        executableHaskellDepends = [ base filepath hinotify process ];
        description = "Do things when files change";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "mono-foldable" = callPackage
@@ -141866,7 +139815,6 @@ self: {
        homepage = "http://github.com/JohnLato/mono-foldable";
        description = "Folds for monomorphic containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mono-traversable_0_6_3" = callPackage
@@ -142166,7 +140114,6 @@ self: {
        homepage = "http://github.com/nfjinjing/monoid-owns";
        description = "a practical monoid implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-record" = callPackage
@@ -142302,7 +140249,6 @@ self: {
        homepage = "https://github.com/blamario/monoid-subclasses/";
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -142362,7 +140308,6 @@ self: {
        jailbreak = true;
        description = "Extra classes/functions about monoids";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoids" = callPackage
@@ -142380,7 +140325,6 @@ self: {
        homepage = "http://github.com/ekmett/monoids";
        description = "Deprecated: Use 'reducers'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monomorphic" = callPackage
@@ -142462,7 +140406,6 @@ self: {
        homepage = "http://github.com/patperry/hs-monte-carlo";
        description = "A monad and transformer for Monte Carlo calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "moo" = callPackage
@@ -142485,7 +140428,6 @@ self: {
        homepage = "http://www.github.com/astanin/moo/";
        description = "Genetic algorithm library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "moonshine" = callPackage
@@ -142524,7 +140466,6 @@ self: {
        homepage = "http://sites.google.com/site/morfetteweb/";
        description = "A tool for supervised learning of morphology";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "morfeusz" = callPackage
@@ -142542,7 +140483,6 @@ self: {
        homepage = "https://github.com/kawu/morfeusz";
        description = "Bindings to the morphological analyser Morfeusz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {morfeusz = null;};
 
   "morte" = callPackage
@@ -142586,7 +140526,6 @@ self: {
        homepage = "http://ldc.usb.ve/~05-38235/cursos/CI3661/2015AJ/";
        description = "Generación interactiva de mosaicos";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mount" = callPackage
@@ -142598,7 +140537,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Mounts and umounts filesystems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mountpoints" = callPackage
@@ -142635,7 +140573,6 @@ self: {
        homepage = "https://bitbucket.org/borekpiotr/linux-music-player";
        description = "Music player for linux";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mp3decoder" = callPackage
@@ -142652,7 +140589,6 @@ self: {
        homepage = "http://www.bjrn.se/mp3dec";
        description = "MP3 decoder for teaching";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mpdmate" = callPackage
@@ -142669,7 +140605,6 @@ self: {
        homepage = "http://neugierig.org/software/darcs/powermate/";
        description = "MPD/PowerMate executable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mpppc" = callPackage
@@ -142684,7 +140619,6 @@ self: {
        jailbreak = true;
        description = "Multi-dimensional parametric pretty-printer with color";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mpretty" = callPackage
@@ -142702,7 +140636,6 @@ self: {
        jailbreak = true;
        description = "a monadic, extensible pretty printing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mpris" = callPackage
@@ -142733,7 +140666,6 @@ self: {
        ];
        description = "Simple equational reasoning for a Haskell-ish language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mps" = callPackage
@@ -142753,7 +140685,6 @@ self: {
        homepage = "http://github.com/nfjinjing/mps/";
        description = "simply oo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mpvguihs" = callPackage
@@ -142773,7 +140704,6 @@ self: {
        homepage = "https://github.com/sebadoom/mpvguihs";
        description = "A minimalist mpv GUI written in I/O heavy Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mqtt-hs" = callPackage
@@ -142879,7 +140809,6 @@ self: {
        homepage = "http://msgpack.org/";
        description = "An IDL Compiler for MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "msgpack-rpc" = callPackage
@@ -142916,7 +140845,6 @@ self: {
        homepage = "http://www.cl.cam.ac.uk/~mbg28/";
        description = "Object-Oriented Programming in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "msi-kb-backlit" = callPackage
@@ -142930,7 +140858,6 @@ self: {
        executableHaskellDepends = [ base bytestring hid split ];
        description = "A command line tool to change backlit colors of your MSI keyboards";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "mstate" = callPackage
@@ -142987,7 +140914,6 @@ self: {
        jailbreak = true;
        description = "Library to communicate with Mt.Gox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mtl_2_1_3_1" = callPackage
@@ -143143,7 +141069,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monad transformer library using type families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mtl-unleashed" = callPackage
@@ -143200,7 +141125,6 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Monad transformer library with type indexes, providing 'free' copies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mtp" = callPackage
@@ -143214,7 +141138,6 @@ self: {
        jailbreak = true;
        description = "Bindings to libmtp";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mtp = null;};
 
   "mtree" = callPackage
@@ -143258,7 +141181,6 @@ self: {
        jailbreak = true;
        description = "Continuous deployment server for use with GitHub";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "muesli" = callPackage
@@ -143347,7 +141269,6 @@ self: {
        homepage = "https://github.com/aka-bash0r/multi-cabal";
        description = "A tool supporting multi cabal project builds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multiaddr" = callPackage
@@ -143434,7 +141355,6 @@ self: {
        ];
        description = "Bidirectional Two-level Transformation of XML Schemas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multihash" = callPackage
@@ -143519,7 +141439,6 @@ self: {
        homepage = "http://github.com/ekmett/multipass/";
        description = "Folding data with multiple named passes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multiplate" = callPackage
@@ -143544,7 +141463,6 @@ self: {
        jailbreak = true;
        description = "Shorter, more generic functions for Multiplate";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multiplicity" = callPackage
@@ -143589,7 +141507,6 @@ self: {
        jailbreak = true;
        description = "Alternative multirec instances deriver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multirec-binary" = callPackage
@@ -143600,9 +141517,8 @@ self: {
        sha256 = "fa57bbf7fd5159713520772307af960e2c79d9c24e045ef23680f18ea5cb41b2";
        libraryHaskellDepends = [ base binary multirec ];
        jailbreak = true;
-       description = "Generic Data.Binary instances using MultiRec";
+       description = "Generic Data.Binary instances using MultiRec.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multiset_0_3_0" = callPackage
@@ -143652,7 +141568,6 @@ self: {
        homepage = "http://sulzmann.blogspot.com/2008/10/multi-set-rewrite-rules-with-guards-and.html";
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multistate" = callPackage
@@ -143713,7 +141628,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo";
        description = "MUtually Recursive Definitions Explicitly Represented";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "murmur-hash" = callPackage
@@ -143758,7 +141672,6 @@ self: {
        homepage = "https://github.com/niswegmann/murmurhash3";
        description = "32-bit non-cryptographic hashing";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-articulation" = callPackage
@@ -143823,7 +141736,6 @@ self: {
        jailbreak = true;
        description = "Diagrams-based visualization of musical data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-parts" = callPackage
@@ -143843,7 +141755,6 @@ self: {
        ];
        description = "Musical instruments, parts and playing techniques";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-pitch" = callPackage
@@ -143899,7 +141810,6 @@ self: {
        testHaskellDepends = [ base process tasty tasty-golden ];
        description = "Some useful preludes for the Music Suite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-score" = callPackage
@@ -143924,7 +141834,6 @@ self: {
        jailbreak = true;
        description = "Musical score and part representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-sibelius" = callPackage
@@ -143944,7 +141853,6 @@ self: {
        ];
        description = "Interaction with Sibelius";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-suite" = callPackage
@@ -143964,7 +141872,6 @@ self: {
        doHaddock = false;
        description = "A set of libraries for composition, analysis and manipulation of music";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-util" = callPackage
@@ -143982,7 +141889,6 @@ self: {
        ];
        description = "Utility for developing the Music Suite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "musicbrainz-email" = callPackage
@@ -144017,7 +141923,6 @@ self: {
        homepage = "http://github.com/metabrainz/mass-mail";
        description = "Send an email to all MusicBrainz editors";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "musicxml" = callPackage
@@ -144035,7 +141940,6 @@ self: {
        homepage = "https://troglodita.di.uminho.pt/svn/musica/work/MusicXML";
        description = "MusicXML format encoded as Haskell type and functions of reading and writting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "musicxml2" = callPackage
@@ -144084,7 +141988,6 @@ self: {
        homepage = "https://github.com/JustusAdam/mustache";
        description = "A mustache template parser library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mustache-haskell" = callPackage
@@ -144130,7 +142033,6 @@ self: {
        homepage = "http://github.com/singpolyma/mustache2hs";
        description = "Utility to generate Haskell code from Mustache templates";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mutable-containers_0_2_1_2" = callPackage
@@ -144207,7 +142109,6 @@ self: {
        homepage = "http://jwlato.webfactional.com/haskell/mutable-iter";
        description = "iteratees based upon mutable buffers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mute-unmute" = callPackage
@@ -144257,7 +142158,6 @@ self: {
        jailbreak = true;
        description = "Concurrent and combinable updates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mvclient" = callPackage
@@ -144277,7 +142177,6 @@ self: {
        jailbreak = true;
        description = "Client library for metaverse systems like Second Life";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-probability_1_0_2" = callPackage
@@ -144446,7 +142345,6 @@ self: {
        homepage = "http://haskell.cs.yale.edu/";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mybitcoin-sci" = callPackage
@@ -144458,7 +142356,7 @@ self: {
        libraryHaskellDepends = [
          base cgi curl directory mtl process split
        ];
-       description = "Binding to mybitcoin.com's Shopping Cart Interface";
+       description = "Binding to mybitcoin.com's Shopping Cart Interface.";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
@@ -144484,7 +142382,6 @@ self: {
        homepage = "http://github.com/adinapoli/myo";
        description = "Haskell binding to the Myo armband";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysnapsession" = callPackage
@@ -144502,7 +142399,6 @@ self: {
        jailbreak = true;
        description = "Sessions and continuations for Snap web apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysnapsession-example" = callPackage
@@ -144522,7 +142418,6 @@ self: {
        jailbreak = true;
        description = "Example projects using mysnapsession";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql_0_1_1_7" = callPackage
@@ -144621,7 +142516,6 @@ self: {
        ];
        description = "Quasi-quoter for use with mysql-simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-simple-typed" = callPackage
@@ -144638,7 +142532,6 @@ self: {
        homepage = "https://github.com/tolysz/mysql-simple-typed";
        description = "Typed extension to mysql simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mzv" = callPackage
@@ -144652,7 +142545,6 @@ self: {
        homepage = "http://github.com/ifigueroap/mzv";
        description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "n-m" = callPackage
@@ -144725,7 +142617,6 @@ self: {
        homepage = "https://github.com/fractalcat/nagios-plugin-ekg";
        description = "Monitor ekg metrics via Nagios";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "named-formlet" = callPackage
@@ -144754,7 +142645,6 @@ self: {
        homepage = "http://github.com/nominolo/named-lock";
        description = "A named lock that is created on demand";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "named-records" = callPackage
@@ -144821,7 +142711,6 @@ self: {
        homepage = "http://github.com/chowells79/nano-cryptr";
        description = "A threadsafe binding to glibc's crypt_r function";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nano-erl" = callPackage
@@ -144846,7 +142735,6 @@ self: {
        homepage = "http://www.jasani.org/search/label/nano-hmac";
        description = "Bindings to OpenSSL HMAC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "nano-md5" = callPackage
@@ -144860,7 +142748,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/nano-md5";
        description = "Efficient, ByteString bindings to OpenSSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "nanoAgda" = callPackage
@@ -144879,7 +142766,6 @@ self: {
        jailbreak = true;
        description = "A toy dependently-typed language";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nanocurses" = callPackage
@@ -144893,7 +142779,6 @@ self: {
        homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
        description = "Simple Curses binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "nanomsg" = callPackage
@@ -144907,7 +142792,6 @@ self: {
        jailbreak = true;
        description = "nanomsg - scalability protocols library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) nanomsg;};
 
   "nanomsg-haskell" = callPackage
@@ -144996,7 +142880,6 @@ self: {
        homepage = "http://ezrakilty.net/projects/narc";
        description = "Query SQL databases using Nested Relational Calculus embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nat" = callPackage
@@ -145144,7 +143027,6 @@ self: {
        ];
        description = "Haskell API for NATS messaging system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "natural-number" = callPackage
@@ -145162,7 +143044,6 @@ self: {
        jailbreak = true;
        description = "Natural numbers tagged with a type-level representation of the number";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "natural-numbers" = callPackage
@@ -145343,7 +143224,6 @@ self: {
        homepage = "https://github.com/ajg/neat";
        description = "A Fast Retargetable Template Engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neat-interpolation_0_2_2" = callPackage
@@ -145458,6 +143338,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "neat-interpolation_0_3_2" = callPackage
+    ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell
+     , text
+     }:
+     mkDerivation {
+       pname = "neat-interpolation";
+       version = "0.3.2";
+       sha256 = "875e77c4a624c2fef750a68d0296decd4dd9f3afd174e8831427cdab03ef5e0a";
+       libraryHaskellDepends = [
+         base base-prelude parsec template-haskell text
+       ];
+       testHaskellDepends = [ base-prelude HTF ];
+       homepage = "https://github.com/nikita-volkov/neat-interpolation";
+       description = "A quasiquoter for neat and simple multiline text interpolation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "needle" = callPackage
     ({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec
      , parsec-extra, template-haskell, text, vector
@@ -145474,7 +143372,6 @@ self: {
        homepage = "http://scrambledeggsontoast.github.io/2014/09/28/needle-announce/";
        description = "ASCII-fied arrow notation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neet" = callPackage
@@ -145511,7 +143408,6 @@ self: {
        ];
        description = "Port of the NeHe OpenGL tutorials to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neil" = callPackage
@@ -145601,7 +143497,6 @@ self: {
        homepage = "https://github.com/kawu/nerf";
        description = "Nerf, the named entity recognition tool based on linear-chain CRFs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nero" = callPackage
@@ -145621,7 +143516,6 @@ self: {
        homepage = "https://github.com/plutonbrb/nero";
        description = "Lens-based HTTP toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nero-wai" = callPackage
@@ -145638,7 +143532,6 @@ self: {
        homepage = "https://github.com/plutonbrb/nero-wai";
        description = "WAI adapter for Nero server applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nero-warp" = callPackage
@@ -145651,7 +143544,6 @@ self: {
        homepage = "https://github.com/plutonbrb/nero-warp";
        description = "Run Nero server applications with Warp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nested-routes" = callPackage
@@ -145690,7 +143582,6 @@ self: {
        ];
        description = "Declarative, compositional Wai responses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nested-sets" = callPackage
@@ -145778,7 +143669,6 @@ self: {
        homepage = "http://frenetic-lang.org";
        description = "The NetCore compiler and runtime system for OpenFlow networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netlines" = callPackage
@@ -145797,7 +143687,6 @@ self: {
        executableHaskellDepends = [ base HTF random ];
        description = "Enumerator tools for text-based network protocols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netlink" = callPackage
@@ -145897,7 +143786,6 @@ self: {
        homepage = "http://github.com/DanBurton/netspec";
        description = "Simplify static Networking tasks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netstring-enumerator" = callPackage
@@ -145991,7 +143879,6 @@ self: {
        homepage = "https://github.com/stbuehler/haskell-nettle";
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) nettle;};
 
   "nettle-frp" = callPackage
@@ -146009,7 +143896,6 @@ self: {
        jailbreak = true;
        description = "FRP for controlling networks of OpenFlow switches";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nettle-netkit" = callPackage
@@ -146025,7 +143911,6 @@ self: {
        ];
        description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nettle-openflow" = callPackage
@@ -146042,7 +143927,6 @@ self: {
        ];
        description = "OpenFlow protocol messages, binary formats, and servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netwire" = callPackage
@@ -146093,7 +143977,6 @@ self: {
        homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
        description = "GLFW instance of netwire-input";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "network_2_5_0_0" = callPackage
@@ -146211,7 +144094,6 @@ self: {
        homepage = "http://github.com/sebnow/haskell-network-address";
        description = "IP data structures and textual representation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-anonymous-i2p" = callPackage
@@ -146381,7 +144263,6 @@ self: {
        ];
        description = "Linux NetworkNameSpace Builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-bytestring" = callPackage
@@ -146395,7 +144276,6 @@ self: {
        homepage = "http://github.com/tibbe/network-bytestring";
        description = "Fast, memory-efficient, low-level networking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-carbon_1_0_5" = callPackage
@@ -146584,7 +144464,6 @@ self: {
        homepage = "http://darcs.imperialviolet.org/network-connection";
        description = "A wrapper around a generic stream-like connection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-data" = callPackage
@@ -146653,13 +144532,12 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "network-fancy";
-       version = "0.2.3";
-       sha256 = "c5c5818797db9fcacc1a68e47233f64f590a7ec3add7a0e1e078e4b8305f90ac";
+       version = "0.2.4";
+       sha256 = "4936ea7f980768a66656332f7211b1877af4b387ad5c81ab3dde76b3eb76df57";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/taruti/network-fancy";
        description = "Networking support with a cleaner API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "network-house" = callPackage
@@ -146735,7 +144613,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for the ifreq structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "network-ip" = callPackage
@@ -146794,7 +144671,6 @@ self: {
        homepage = "http://darcs.imperialviolet.org/network-minihttp";
        description = "A ByteString based library for writing HTTP(S) servers and clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-msg" = callPackage
@@ -146846,7 +144722,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for low-level packet sockets (AF_PACKET)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "network-pgi" = callPackage
@@ -146896,7 +144771,6 @@ self: {
        ];
        description = "A cross-platform RPC library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-server" = callPackage
@@ -146911,7 +144785,6 @@ self: {
        executableHaskellDepends = [ base network unix ];
        description = "A light abstraction over sockets & co. for servers";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-service" = callPackage
@@ -147020,7 +144893,6 @@ self: {
        homepage = "https://github.com/k0001/network-simple-tls";
        description = "Simple interface to TLS secured network sockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-socket-options" = callPackage
@@ -147073,7 +144945,6 @@ self: {
        homepage = "https://github.com/bgamari/bayes-stack";
        description = "A few network topic model implementations for bayes-stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-transport_0_4_1_0" = callPackage
@@ -147117,6 +144988,8 @@ self: {
        pname = "network-transport";
        version = "0.4.3.1";
        sha256 = "77fd80f672d6cabed4b60cc728f89543500080203cd91b76e07f814baabbd836";
+       revision = "1";
+       editedCabalFile = "0355f57fcc68a71ac6819a4d091466b39eb247a172ee0b1d8996927c68ca6fa2";
        libraryHaskellDepends = [
          base binary bytestring deepseq hashable transformers
        ];
@@ -147149,7 +145022,6 @@ self: {
        jailbreak = true;
        description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-transport-composed" = callPackage
@@ -147447,7 +145319,6 @@ self: {
        homepage = "http://github.com/michaelmelanson/network-websocket";
        description = "WebSocket library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "networked-game" = callPackage
@@ -147479,7 +145350,6 @@ self: {
        homepage = "http://www.b7j0c.org/content/haskell-newports.html";
        description = "List ports newer than N days on a FreeBSD system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newsynth" = callPackage
@@ -147499,7 +145369,6 @@ self: {
        homepage = "http://www.mathstat.dal.ca/~selinger/newsynth/";
        description = "Exact and approximate synthesis of quantum circuits";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newt" = callPackage
@@ -147526,7 +145395,6 @@ self: {
        jailbreak = true;
        description = "A trivially simple app to create things from simple templates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newtype" = callPackage
@@ -147585,9 +145453,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/mgsloan/newtype-th";
-       description = "A template haskell deriver to create Control.Newtype instances";
+       description = "A template haskell deriver to create Control.Newtype instances.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newtyper" = callPackage
@@ -147659,7 +145526,6 @@ self: {
        homepage = "https://github.com/fhsjaagshs/niagra";
        description = "CSS EDSL for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nibblestring" = callPackage
@@ -147680,7 +145546,6 @@ self: {
        ];
        description = "Packed, strict nibble arrays with a list interface (ByteString for nibbles)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nicify" = callPackage
@@ -147750,7 +145615,6 @@ self: {
        homepage = "http://www.codemanic.com/uwe";
        description = "Command line utility publishes Nike+ runs on blogs and Twitter";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nimber" = callPackage
@@ -147763,7 +145627,6 @@ self: {
        homepage = "http://andersk.mit.edu/haskell/nimber/";
        description = "Finite nimber arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "nist-beacon" = callPackage
@@ -147789,7 +145652,6 @@ self: {
        homepage = "http://haskell.gonitro.io";
        description = "Haskell bindings for Nitro";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nix-eval" = callPackage
@@ -147855,7 +145717,6 @@ self: {
        ];
        description = "Generate nix expressions from npm packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nixos-types" = callPackage
@@ -147888,7 +145749,6 @@ self: {
        homepage = "https://github.com/kawu/nkjp";
        description = "Manipulating the National Corpus of Polish (NKJP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nlp-scores" = callPackage
@@ -147934,7 +145794,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Network Manager, binding to libnm-glib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {g = null; inherit (pkgs) glib; libnm-glib = null; 
          nm-glib = null;};
 
@@ -147948,7 +145807,6 @@ self: {
        homepage = "https://github.com/singpolyma/NME-Haskell";
        description = "Bindings to the Nyctergatis Markup Engine";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nntp" = callPackage
@@ -147964,7 +145822,6 @@ self: {
        ];
        description = "Library to connect to an NNTP Server";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "no-buffering-workaround" = callPackage
@@ -148043,7 +145900,6 @@ self: {
        homepage = "http://github.com/brow/noise";
        description = "A friendly language for graphic design";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "non-empty" = callPackage
@@ -148155,7 +146011,6 @@ self: {
        homepage = "https://github.com/jessopher/noodle";
        description = "the noodle programming language";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "normaldistribution" = callPackage
@@ -148177,15 +146032,15 @@ self: {
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.6.4";
-       sha256 = "a43d0b18834237da91b9ffb44ce23a6fe764b962ed0b3bca56ea01903603534e";
+       version = "0.7.6.5";
+       sha256 = "2d035f7086cdf09542010b98881feb4aeb9e4eaddb9e3d28292d20fe3984e804";
        libraryHaskellDepends = [
          base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
          spatial-math time vector vector-binary-instances
        ];
+       jailbreak = true;
        description = "Painless 3D graphics, no affiliation with gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "not-gloss-examples" = callPackage
@@ -148203,7 +146058,6 @@ self: {
        ];
        description = "examples for not-gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "not-in-base" = callPackage
@@ -148246,7 +146100,6 @@ self: {
        executableSystemDepends = [ notmuch ];
        description = "Binding for notmuch MUA library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) notmuch;};
 
   "notmuch-web" = callPackage
@@ -148285,7 +146138,6 @@ self: {
        homepage = "https://bitbucket.org/wuzzeb/notmuch-web";
        description = "A web interface to the notmuch email indexer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "notzero" = callPackage
@@ -148333,7 +146185,6 @@ self: {
        jailbreak = true;
        description = "Linear algebra for the numeric-prelude framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nptools" = callPackage
@@ -148352,7 +146203,6 @@ self: {
        ];
        description = "A collection of random tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nsis_0_2_4" = callPackage
@@ -148430,7 +146280,6 @@ self: {
        sha256 = "9e6a4e4cf0116a8aab09185bcdb62106206c6b41816cc1c6d6e3dac50fe621e2";
        libraryHaskellDepends = [ base type-level ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ntp-control" = callPackage
@@ -148467,7 +146316,6 @@ self: {
        homepage = "https://github.com/Tener/null-canvas";
        description = "HTML5 Canvas Graphics Library - forked Blank Canvas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nullary" = callPackage
@@ -148562,7 +146410,6 @@ self: {
        homepage = "https://github.com/roelvandijk/numerals";
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numerals-base" = callPackage
@@ -148586,7 +146433,6 @@ self: {
        homepage = "https://github.com/roelvandijk/numerals-base";
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numeric-extras_0_0_3" = callPackage
@@ -148661,7 +146507,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/numeric-qq";
        description = "Quasi-quoters for numbers of different bases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numeric-quest" = callPackage
@@ -148824,7 +146669,6 @@ self: {
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvim-hs-contrib" = callPackage
@@ -148851,7 +146695,6 @@ self: {
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nyan" = callPackage
@@ -148901,7 +146744,6 @@ self: {
        jailbreak = true;
        description = "An interactive GUI for manipulating L-systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oanda-rest-api" = callPackage
@@ -148982,7 +146824,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo";
        description = "Oberon0 Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "obj" = callPackage
@@ -149002,7 +146843,6 @@ self: {
        ];
        description = "Reads and writes obj models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "objectid" = callPackage
@@ -149025,10 +146865,9 @@ self: {
        homepage = "https://github.com/tsuraan/objectid";
        description = "Rather unique identifier for things that need to be stored";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "objective" = callPackage
+  "objective_1_0_5" = callPackage
     ({ mkDerivation, base, containers, either, exceptions, free
      , hashable, monad-skeleton, monad-stm, mtl, profunctors, stm
      , template-haskell, transformers, transformers-compat
@@ -149046,6 +146885,27 @@ self: {
        homepage = "https://github.com/fumieval/objective";
        description = "Composable objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "objective" = callPackage
+    ({ mkDerivation, base, containers, either, exceptions, free
+     , hashable, monad-skeleton, mtl, profunctors, template-haskell
+     , transformers, transformers-compat, unordered-containers, void
+     , witherable
+     }:
+     mkDerivation {
+       pname = "objective";
+       version = "1.1";
+       sha256 = "38a3e0d27fbff0d358942202051121ef0080e68a9e0e57bd2b97de7586006a0e";
+       libraryHaskellDepends = [
+         base containers either exceptions free hashable monad-skeleton mtl
+         profunctors template-haskell transformers transformers-compat
+         unordered-containers void witherable
+       ];
+       homepage = "https://github.com/fumieval/objective";
+       description = "Composable objects";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "observable-sharing" = callPackage
@@ -149135,7 +146995,6 @@ self: {
        homepage = "https://github.com/Zankoku-Okuno/octopus/";
        description = "Lisp with more dynamism, more power, more simplicity";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oculus" = callPackage
@@ -149154,7 +147013,6 @@ self: {
        homepage = "http://github.com/cpdurham/oculus";
        description = "Oculus Rift ffi providing head tracking data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; 
          inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;};
 
@@ -149238,7 +147096,6 @@ self: {
        homepage = "https://github.com/fthomas/ohloh-hs";
        description = "Interface to the Ohloh API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oi" = callPackage
@@ -149255,7 +147112,6 @@ self: {
        executableHaskellDepends = [ base directory filepath parallel ];
        description = "Library for purely functional lazy interactions with the outer world";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oidc-client" = callPackage
@@ -149279,7 +147135,6 @@ self: {
        homepage = "https://github.com/krdlab/haskell-oidc-client";
        description = "OpenID Connect 1.0 library for RP";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ois-input-manager" = callPackage
@@ -149293,7 +147148,6 @@ self: {
        jailbreak = true;
        description = "wrapper for OIS input manager for use with hogre";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OIS = null;};
 
   "old-locale" = callPackage
@@ -149377,7 +147231,6 @@ self: {
        homepage = "https://github.com/pcapriotti/omaketex";
        description = "A simple tool to generate OMakefile for latex files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omega" = callPackage
@@ -149396,7 +147249,6 @@ self: {
        homepage = "http://code.google.com/p/omega/";
        description = "A purely functional programming language and a proof system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omnicodec" = callPackage
@@ -149415,7 +147267,6 @@ self: {
        jailbreak = true;
        description = "data encoding and decoding command line utilities";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omnifmt" = callPackage
@@ -149461,7 +147312,6 @@ self: {
        homepage = "http://haskell.on-a-horse.org";
        description = "\"Haskell on a Horse\" - A combinatorial web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "on-demand-ssh-tunnel" = callPackage
@@ -149514,7 +147364,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "one-time-password" = callPackage
@@ -149559,7 +147408,6 @@ self: {
        homepage = "https://github.com/thinkpad20/oneormore";
        description = "A never-empty list type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "only" = callPackage
@@ -149584,7 +147432,6 @@ self: {
        libraryHaskellDepends = [ base smallcheck ];
        description = "Code for the Haskell course taught at the Odessa National University in 2012";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oo-prototypes" = callPackage
@@ -149887,7 +147734,6 @@ self: {
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Conversion between markup formats";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-symbology" = callPackage
@@ -149916,7 +147762,6 @@ self: {
        homepage = "https://github.com/emilaxelsson/open-typerep";
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "open-union" = callPackage
@@ -149932,7 +147777,6 @@ self: {
        homepage = "https://github.com/RobotGymnast/open-union";
        description = "Extensible, type-safe unions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-witness" = callPackage
@@ -149945,7 +147789,6 @@ self: {
        jailbreak = true;
        description = "open witnesses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opencog-atomspace" = callPackage
@@ -149959,7 +147802,6 @@ self: {
        homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell";
        description = "Haskell Bindings for the AtomSpace";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {atomspace-cwrapper = null;};
 
   "opencv-raw" = callPackage
@@ -149974,7 +147816,6 @@ self: {
        homepage = "www.github.com/arjuncomar/opencv-raw.git";
        description = "Raw Haskell bindings to OpenCV >= 2.0";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) opencv;};
 
   "opendatatable" = callPackage
@@ -150004,7 +147845,6 @@ self: {
        homepage = "https://github.com/singpolyma/openexchangerates-haskell";
        description = "Fetch exchange rates from OpenExchangeRates.org";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openflow" = callPackage
@@ -150023,7 +147863,6 @@ self: {
        homepage = "https://github.com/AndreasVoellmy/openflow";
        description = "OpenFlow";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opengl-dlp-stereo" = callPackage
@@ -150076,7 +147915,6 @@ self: {
        jailbreak = true;
        description = "OpenGL ES 2.0 and 3.0 with EGL 1.4";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {EGL = null; GLESv2 = null;};
 
   "openid" = callPackage
@@ -150093,9 +147931,8 @@ self: {
          base bytestring containers HsOpenSSL HTTP monadLib network time xml
        ];
        homepage = "http://github.com/elliottt/hsopenid";
-       description = "An implementation of the OpenID-2.0 spec";
+       description = "An implementation of the OpenID-2.0 spec.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openpgp" = callPackage
@@ -150141,7 +147978,6 @@ self: {
        homepage = "http://github.com/singpolyma/OpenPGP-Crypto";
        description = "Implementation of cryptography for use with OpenPGP using the Crypto library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openpgp-asciiarmor" = callPackage
@@ -150189,7 +148025,6 @@ self: {
        homepage = "http://github.com/singpolyma/OpenPGP-CryptoAPI";
        description = "Implement cryptography for OpenPGP using crypto-api compatible libraries";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opensoundcontrol-ht" = callPackage
@@ -150229,7 +148064,6 @@ self: {
        homepage = "https://github.com/stackbuilders/openssh-github-keys";
        description = "Fetch OpenSSH keys from a GitHub team";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openssl-createkey" = callPackage
@@ -150330,7 +148164,6 @@ self: {
        jailbreak = true;
        description = "Unicode characters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opentheory-divides" = callPackage
@@ -150563,7 +148396,7 @@ self: {
          uri-bytestring xml-conduit-parse
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
-       description = "Streaming parser/renderer for the OPML 2.0 format";
+       description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -150627,9 +148460,8 @@ self: {
          uri-bytestring xml-conduit-parse
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
-       description = "Streaming parser/renderer for the OPML 2.0 format";
+       description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opn" = callPackage
@@ -150672,7 +148504,6 @@ self: {
        homepage = "https://github.com/tsuraan/optimal-blocks";
        description = "Optimal Block boundary determination for rsync-like behaviours";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optimization" = callPackage
@@ -150710,7 +148541,6 @@ self: {
        homepage = "http://optimusprime.posterous.com/";
        description = "A supercompiler for f-lite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "option" = callPackage
@@ -150994,9 +148824,8 @@ self: {
          wreq
        ];
        jailbreak = true;
-       description = "An API client for http://orchestrate.io/";
+       description = "An API client for http://orchestrate.io/.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orchid" = callPackage
@@ -151017,7 +148846,6 @@ self: {
        jailbreak = true;
        description = "Haskell Wiki Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orchid-demo" = callPackage
@@ -151037,7 +148865,6 @@ self: {
        jailbreak = true;
        description = "Haskell Wiki Demo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ord-adhoc" = callPackage
@@ -151067,7 +148894,18 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/order-maintenance";
        description = "Algorithms for the order maintenance problem with a safe interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "order-statistic-tree" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }:
+     mkDerivation {
+       pname = "order-statistic-tree";
+       version = "0.1.1.0";
+       sha256 = "0069ae9ad6ed98ca367026e9c1d6be4c553e6ec451aff0f658532e0ed6a692bd";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       description = "Order statistic trees based on weight-balanced trees";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "order-statistics" = callPackage
@@ -151164,8 +149002,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgmode-parse";
-       version = "0.1.1.2";
-       sha256 = "b10f3d1db39338cd763f2df71db969288898c1f9b5d9a356b15dded83c7b49fb";
+       version = "0.1.1.3";
+       sha256 = "322779285609e1f99d7d046802db2b6a54c51adc803dfd55a81d6518f9cab627";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable
          old-locale text thyme unordered-containers
@@ -151176,7 +149014,6 @@ self: {
        ];
        description = "A collection of Attoparsec combinators for parsing org-mode flavored documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "origami" = callPackage
@@ -151196,7 +149033,6 @@ self: {
        homepage = "http://github.com/nedervold/origami";
        description = "An un-SYB framework for transforming heterogenous data through folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "os-release" = callPackage
@@ -151273,7 +149109,6 @@ self: {
        jailbreak = true;
        description = "Download Open Street Map tiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oso2pdf" = callPackage
@@ -151325,7 +149160,6 @@ self: {
        homepage = "https://github.com/operational-transformation/ot.hs";
        description = "Real-time collaborative editing with Operational Transformation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ottparse-pretty" = callPackage
@@ -151343,6 +149177,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "overloaded-records" = callPackage
+    ({ mkDerivation, base, data-default-class, HUnit, template-haskell
+     , test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "overloaded-records";
+       version = "0.3.0.0";
+       sha256 = "54cc3bfdf30ceaf6f7dbcf481c68a282bf5ac872c79b4665acfc9209b628a3d4";
+       libraryHaskellDepends = [
+         base data-default-class template-haskell
+       ];
+       testHaskellDepends = [
+         base data-default-class HUnit template-haskell test-framework
+         test-framework-hunit
+       ];
+       homepage = "https://github.com/trskop/overloaded-records";
+       description = "Overloaded Records based on current GHC proposal";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "overture" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
@@ -151420,7 +149274,6 @@ self: {
        jailbreak = true;
        description = "Haskell Package Versioning Tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "packdeps" = callPackage
@@ -151477,7 +149330,6 @@ self: {
        jailbreak = true;
        description = "(Deprecated) Packed Strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "packer" = callPackage
@@ -151514,7 +149366,6 @@ self: {
        ];
        description = "Serialization library for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "packunused" = callPackage
@@ -151569,7 +149420,6 @@ self: {
        homepage = "https://github.com/fumieval/padKONTROL";
        description = "Controlling padKONTROL native mode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pagarme" = callPackage
@@ -151854,7 +149704,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) pam;};
 
   "panda" = callPackage
@@ -151875,7 +149724,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Panda";
        description = "A simple static blog engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc_1_13_1" = callPackage
@@ -152841,7 +150689,6 @@ self: {
        executableHaskellDepends = [ base pandoc ];
        description = "Literate Haskell support for GitHub's Markdown flavor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pango_0_13_0_4" = callPackage
@@ -152945,7 +150792,6 @@ self: {
        homepage = "https://skami.iocikun.jp/computer/haskell/packages/papillon";
        description = "packrat parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pappy" = callPackage
@@ -152960,7 +150806,6 @@ self: {
        homepage = "http://pdos.csail.mit.edu/~baford/packrat/thesis/";
        description = "Packrat parsing; linear-time parsers for grammars in TDPL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "para" = callPackage
@@ -153000,7 +150845,6 @@ self: {
        jailbreak = true;
        description = "Paragon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parallel_3_2_0_3" = callPackage
@@ -153083,7 +150927,6 @@ self: {
        ];
        jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parallel-tree-search" = callPackage
@@ -153108,7 +150951,6 @@ self: {
        homepage = "http://code.haskell.org/parameterized-data";
        description = "Parameterized data library implementing lightweight dependent types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parco" = callPackage
@@ -153120,7 +150962,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised parser combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parco-attoparsec" = callPackage
@@ -153132,7 +150973,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base mtl parco ];
        description = "Generalised parser combinators - Attoparsec interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parco-parsec" = callPackage
@@ -153144,7 +150984,6 @@ self: {
        libraryHaskellDepends = [ base mtl parco parsec ];
        description = "Generalised parser combinators - Parsec interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parcom-lib" = callPackage
@@ -153187,7 +151026,6 @@ self: {
        jailbreak = true;
        description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parport" = callPackage
@@ -153199,7 +151037,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Simply interfacing the parallel port on linux";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "parse-dimacs" = callPackage
@@ -153230,7 +151067,6 @@ self: {
        homepage = "http://github.com/gregwebs/cmdargs-help";
        description = "generate command line arguments from a --help output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parseargs_0_1_5_2" = callPackage
@@ -153367,7 +151203,7 @@ self: {
        sha256 = "b187eebf9d24bf66a2d5dbf66cf83442eb68bf316519985a2c738e04f87ecd79";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec QuickCheck ];
-       description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm";
+       description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -153497,7 +151333,6 @@ self: {
        libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://naesten.dyndns.org:8080/repos/parsely";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parser-helper" = callPackage
@@ -153514,7 +151349,6 @@ self: {
        jailbreak = true;
        description = "Prints Haskell parse trees in JSON";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parser241" = callPackage
@@ -153530,7 +151364,6 @@ self: {
        homepage = "https://github.com/YLiLarry/parser241";
        description = "An interface to create production rules using augmented grammars";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsergen" = callPackage
@@ -153652,7 +151485,6 @@ self: {
        jailbreak = true;
        description = "NMR-STAR file format parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsimony" = callPackage
@@ -153755,7 +151587,6 @@ self: {
        jailbreak = true;
        description = "Haskell 98 Partial Lenses";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partial-uri" = callPackage
@@ -153791,7 +151622,6 @@ self: {
        homepage = "https://github.com/startling/partly";
        description = "Inspect, create, and alter MBRs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "passage" = callPackage
@@ -153809,7 +151639,6 @@ self: {
        ];
        description = "Parallel code generation for hierarchical Bayesian modeling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "passwords" = callPackage
@@ -153832,7 +151661,6 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Interface to the past.is URL shortening service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pasty" = callPackage
@@ -153847,7 +151675,6 @@ self: {
        homepage = "http://github.com/markusle/pasty/tree/master";
        description = "A simple command line pasting utility";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "patch-combinators" = callPackage
@@ -154098,7 +151925,6 @@ self: {
        homepage = "http://github.com/TheBizzle";
        description = "A toy pathfinding library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pathtype" = callPackage
@@ -154186,7 +152012,6 @@ self: {
        homepage = "http://github.com/toschoo/mom";
        description = "Common patterns in message-oriented applications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "paymill" = callPackage
@@ -154225,7 +152050,6 @@ self: {
        homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "paypal-api" = callPackage
@@ -154244,7 +152068,6 @@ self: {
        homepage = "http://projects.haskell.org/paypal-api/";
        description = "PayPal API, currently supporting \"ButtonManager\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pb" = callPackage
@@ -154260,7 +152083,6 @@ self: {
        ];
        description = "pastebin command line application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pbc4hs" = callPackage
@@ -154760,7 +152582,6 @@ self: {
        ];
        description = "pdynload is polymorphic dynamic linking library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peakachu" = callPackage
@@ -154776,7 +152597,6 @@ self: {
        ];
        description = "Experiemental library for composable interactive programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peano" = callPackage
@@ -154822,7 +152642,6 @@ self: {
        ];
        description = "pec embedded compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pecoff" = callPackage
@@ -154852,7 +152671,6 @@ self: {
        homepage = "http://github.com/HackerFoo/peg";
        description = "a lazy non-deterministic concatenative programming language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peggy" = callPackage
@@ -154893,7 +152711,6 @@ self: {
        homepage = "https://github.com/brunjlar/pell";
        description = "Package to solve the Generalized Pell Equation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pem" = callPackage
@@ -154954,7 +152771,6 @@ self: {
        homepage = "http://www.github.com/massysett/penny";
        description = "Extensible double-entry accounting system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "penny-bin" = callPackage
@@ -154975,7 +152791,6 @@ self: {
        homepage = "http://www.github.com/massysett/penny";
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "penny-lib" = callPackage
@@ -154999,7 +152814,6 @@ self: {
        homepage = "http://www.github.com/massysett/penny";
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peparser" = callPackage
@@ -155012,7 +152826,6 @@ self: {
        homepage = "https://github.com/igraves/peparser-haskell";
        description = "A parser for PE object files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "perceptron" = callPackage
@@ -155055,7 +152868,6 @@ self: {
        homepage = "https://github.com/Cognimeta/perdure";
        description = "Robust persistence for acyclic immutable data";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "period" = callPackage
@@ -155094,7 +152906,6 @@ self: {
        homepage = "https://github.com/sonyandy/perm";
        description = "permutation Applicative and Monad with many mtl instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "permutation" = callPackage
@@ -155118,7 +152929,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised permutation parser combinator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persist2er" = callPackage
@@ -155721,7 +153531,6 @@ self: {
        ];
        description = "Declare Persistent entities using SQL SELECT query syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-instances-iproute" = callPackage
@@ -155768,7 +153577,6 @@ self: {
        homepage = "http://darcs.monoid.at/persistent-map";
        description = "A thread-safe (STM) persistency interface for finite map types";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-mongoDB_2_1_2" = callPackage
@@ -156337,7 +154145,6 @@ self: {
        homepage = "https://github.com/mstone/persistent-protobuf";
        description = "Template-Haskell helpers for integrating protobufs with persistent";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-ratelimit" = callPackage
@@ -156981,7 +154788,6 @@ self: {
        homepage = "http://www.cs.chalmers.se/~aarne/pesca/";
        description = "Proof Editor for Sequent Calculus";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peyotls" = callPackage
@@ -157009,7 +154815,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/peyotls/wiki";
        description = "Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peyotls-codec" = callPackage
@@ -157029,7 +154834,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/peyotls/wiki";
        description = "Codec parts of Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pez" = callPackage
@@ -157048,7 +154852,6 @@ self: {
        homepage = "http://brandon.si/code/pez-zipper-library-released/";
        description = "A Pretty Extraordinary Zipper library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pg-harness" = callPackage
@@ -157069,7 +154872,6 @@ self: {
        homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "REST service and library for creating/consuming temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pg-harness-client" = callPackage
@@ -157101,7 +154903,6 @@ self: {
        homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "REST service for creating temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgdl" = callPackage
@@ -157171,7 +154972,6 @@ self: {
        homepage = "https://github.com/chrisdone/pgsql-simple";
        description = "A mid-level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgstream" = callPackage
@@ -157197,7 +154997,6 @@ self: {
        jailbreak = true;
        description = "Streaming Postgres bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phantom-state" = callPackage
@@ -157207,7 +155006,7 @@ self: {
        version = "0.2.0.2";
        sha256 = "d536663dbfc4c0039e2d964ae1a52339f0c8ab30de0b8b78d4524d9b8e04cf11";
        libraryHaskellDepends = [ base transformers ];
-       description = "Phantom State Transformer. Like State Monad, but without values";
+       description = "Phantom State Transformer. Like State Monad, but without values.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -157225,7 +155024,6 @@ self: {
        homepage = "http://github.com/glehel/phasechange";
        description = "Freezing, thawing, and copy elision";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phash" = callPackage
@@ -157267,13 +155065,13 @@ self: {
   "phoityne" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cmdargs, conduit
      , conduit-extra, ConfigFile, containers, directory, filepath, gtk3
-     , hslogger, HStringTemplate, MissingH, mtl, parsec, process
+     , hslogger, hspec, HStringTemplate, MissingH, mtl, parsec, process
      , resourcet, safe, text, transformers
      }:
      mkDerivation {
        pname = "phoityne";
-       version = "0.0.3.0";
-       sha256 = "97823be82846237159a13767ae9a9b29acf8dbc68a95ff099b942b3bcae0790f";
+       version = "0.0.4.0";
+       sha256 = "ce5ff314971995fd37318a0858ce5fd8276a5f0b5f43f5110f80ae2f0e31b957";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -157281,6 +155079,7 @@ self: {
          containers directory filepath gtk3 hslogger HStringTemplate
          MissingH mtl parsec process resourcet safe text transformers
        ];
+       testHaskellDepends = [ base hspec ];
        description = "ghci debug viewer with simple editor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157296,7 +155095,6 @@ self: {
        homepage = "https://github.com/christian-marie/phone-numbers";
        description = "Haskell bindings to the libphonenumber library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {phonenumber = null;};
 
   "phone-push" = callPackage
@@ -157315,7 +155113,6 @@ self: {
        homepage = "https://github.com/gurgeh/haskell-phone-push";
        description = "Push notifications for Android and iOS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phonetic-code" = callPackage
@@ -157345,7 +155142,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Phooey";
        description = "Functional user interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "photoname" = callPackage
@@ -157368,7 +155164,6 @@ self: {
        homepage = "http://hub.darcs.net/dino/photoname";
        description = "Rename photo image files based on EXIF shoot date";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phraskell" = callPackage
@@ -157384,7 +155179,6 @@ self: {
        homepage = "https://github.com/skypers/phraskell";
        description = "A fractal viewer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phybin" = callPackage
@@ -157419,7 +155213,6 @@ self: {
        homepage = "http://www.cs.indiana.edu/~rrnewton/projects/phybin/";
        description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pi-calculus" = callPackage
@@ -157441,7 +155234,6 @@ self: {
        homepage = "https://github.com/renzyq19/pi-calculus";
        description = "Applied pi-calculus interpreter";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pia-forward" = callPackage
@@ -157488,7 +155280,6 @@ self: {
        ];
        description = "Remotely controlling Java Swing applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "picologic" = callPackage
@@ -157584,7 +155375,6 @@ self: {
        homepage = "https://bitbucket.org/blamario/picoparsec";
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "picosat" = callPackage
@@ -157610,7 +155400,6 @@ self: {
        libraryHaskellDepends = [ array base containers Imlib mtl ];
        description = "A Piet interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "piki" = callPackage
@@ -157625,7 +155414,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/piki/";
        description = "Yet another text-to-html converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinboard" = callPackage
@@ -158086,20 +155874,26 @@ self: {
      }) {};
 
   "pipes-bzip" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib, pipes, pipes-bytestring
+    ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, bzlib
+     , data-default, directory, hspec, MonadRandom, mtl, pipes
+     , pipes-bytestring, pipes-safe, QuickCheck, random
      }:
      mkDerivation {
        pname = "pipes-bzip";
-       version = "0.1.0.0";
-       sha256 = "c294c8bad74a68a4cc31d613c9d6e0fd1ee4e57f6b69567f9760bf2ce1291c0d";
+       version = "0.2.0.4";
+       sha256 = "77dab58950936e2a0f7327de5e2442aafe381e7ff4981c772377624cfdd0b08a";
        libraryHaskellDepends = [
-         base bytestring bzlib pipes pipes-bytestring
+         base bindings-DSL bytestring data-default mtl pipes pipes-safe
        ];
-       testHaskellDepends = [ base ];
-       homepage = "http://github.com/chemist/pipes-bzip#readme";
-       description = "Bzip2 compression and decompression for Pipes streams";
+       librarySystemDepends = [ bzip2 ];
+       testHaskellDepends = [
+         base bytestring bzlib directory hspec MonadRandom pipes
+         pipes-bytestring pipes-safe QuickCheck random
+       ];
+       homepage = "https://github.com/chemist/pipes-bzip";
+       description = "Streaming compression/decompression via pipes";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) {inherit (pkgs) bzip2;};
 
   "pipes-cacophony_0_1_3" = callPackage
     ({ mkDerivation, async, base, bytestring, cacophony, hlint, mtl
@@ -158195,7 +155989,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/pipes-cereal-plus";
        description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-cliff" = callPackage
@@ -158281,7 +156074,6 @@ self: {
        homepage = "https://github.com/pcapriotti/pipes-extra";
        description = "Conduit adapters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-core" = callPackage
@@ -158312,7 +156104,6 @@ self: {
        homepage = "http://github.com/kvanberendonck/pipes-courier";
        description = "Pipes utilities for interfacing with the courier message-passing framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-csv" = callPackage
@@ -158430,7 +156221,6 @@ self: {
        homepage = "https://github.com/jwiegley/pipes-files";
        description = "Fast traversal of directory trees using pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "pipes-group_1_0_2" = callPackage
@@ -158580,7 +156370,6 @@ self: {
        homepage = "https://github.com/k0001/pipes-network-tls";
        description = "TLS-secured network connections support for pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-p2p" = callPackage
@@ -158619,7 +156408,6 @@ self: {
        homepage = "https://github.com/jdnavarro/pipes-p2p-examples";
        description = "Examples using pipes-p2p";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-parse_3_0_2" = callPackage
@@ -158830,7 +156618,6 @@ self: {
        ];
        description = "Interfacing pipes with foldl folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-vector" = callPackage
@@ -158956,7 +156743,6 @@ self: {
        jailbreak = true;
        description = "A dependently typed core language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pit" = callPackage
@@ -158981,7 +156767,6 @@ self: {
        homepage = "https://github.com/chiro/haskell-pit";
        description = "Account management tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pitchtrack" = callPackage
@@ -159083,7 +156868,6 @@ self: {
        executableHaskellDepends = [ base Cabal split ];
        description = "Package dependency graph for installed packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pktree" = callPackage
@@ -159174,7 +156958,6 @@ self: {
        jailbreak = true;
        description = "A representation of planar graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plat" = callPackage
@@ -159188,7 +156971,6 @@ self: {
        ];
        description = "Simple templating library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "playlists" = callPackage
@@ -159244,7 +157026,6 @@ self: {
        ];
        description = "Remote monad for editing plists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plivo" = callPackage
@@ -159266,7 +157047,6 @@ self: {
        homepage = "https://github.com/singpolyma/plivo-haskell";
        description = "Plivo API wrapper for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plot_0_2_3_4" = callPackage
@@ -159414,7 +157194,7 @@ self: {
        sha256 = "63f09f22e05a1d9119baaecfd5c9db9580b756430d050953fe348d6e28a80fcb";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       description = "Plotter-like fonts i.e. a series of straight lines which make letter shapes";
+       description = "Plotter-like fonts i.e. a series of straight lines which make letter shapes.";
        license = "GPL";
      }) {};
 
@@ -159462,7 +157242,6 @@ self: {
        testHaskellDepends = [ base directory process ];
        description = "Automatic recompilation and reloading of haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plugins-multistage" = callPackage
@@ -159481,7 +157260,6 @@ self: {
        ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plumbers" = callPackage
@@ -159493,7 +157271,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Pointless plumbing combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ply-loader" = callPackage
@@ -159513,7 +157290,6 @@ self: {
        executableHaskellDepends = [ base bytestring linear vector ];
        description = "PLY file loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "png-file" = callPackage
@@ -159530,7 +157306,6 @@ self: {
        homepage = "https://skami.iocikun.jp/haskell/packages/png-file";
        description = "read/write png file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pngload" = callPackage
@@ -159546,7 +157321,6 @@ self: {
        ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pngload-fixed" = callPackage
@@ -159558,7 +157332,6 @@ self: {
        libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pnm" = callPackage
@@ -159604,7 +157377,6 @@ self: {
        ];
        description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pointed_4_1" = callPackage
@@ -159821,7 +157593,6 @@ self: {
        homepage = "http://haskell.di.uminho.pt/wiki/Pointless+Lenses";
        description = "Pointless Lenses library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pointless-rewrite" = callPackage
@@ -159837,7 +157608,6 @@ self: {
        ];
        description = "Pointless Rewrite library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "poker-eval" = callPackage
@@ -159893,7 +157663,6 @@ self: {
        testHaskellDepends = [ base containers HUnit MissingH mtl parsec ];
        description = "Fork of ConfigFile for Polar Game Engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polar-shader" = callPackage
@@ -159926,7 +157695,6 @@ self: {
        homepage = "https://github.com/kawu/polh/tree/master/lexicon";
        description = "A library for manipulating the historical dictionary of Polish (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polimorf" = callPackage
@@ -160072,7 +157840,6 @@ self: {
        ];
        description = "Polynomial types and operations";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polynomial" = callPackage
@@ -160164,7 +157931,6 @@ self: {
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polysoup" = callPackage
@@ -160179,7 +157945,6 @@ self: {
        homepage = "https://github.com/kawu/polysoup";
        description = "Online XML parsing with polyparse and tagsoup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polytypeable" = callPackage
@@ -160191,7 +157956,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Typeable for polymorphic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polytypeable-utils" = callPackage
@@ -160203,7 +157967,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 polytypeable ];
        description = "Utilities for polytypeable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ponder" = callPackage
@@ -160250,7 +158013,6 @@ self: {
        homepage = "http://www.pontarius.org/projects/pontarius-mediaserver/";
        description = "Extended Personal Media Network (XPMN) media server";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pontarius-xmpp" = callPackage
@@ -160290,7 +158052,6 @@ self: {
        homepage = "https://github.com/pontarius/pontarius-xmpp/";
        description = "An XMPP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pontarius-xpmn" = callPackage
@@ -160308,7 +158069,6 @@ self: {
        homepage = "http://www.pontarius.org/projects/pontarius-xpmn/";
        description = "Extended Personal Media Network (XPMN) library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pony" = callPackage
@@ -160338,7 +158098,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Thread-safe resource pools. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pool-conduit" = callPackage
@@ -160358,7 +158117,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Resource pool allocations via ResourceT. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pooled-io" = callPackage
@@ -160402,7 +158160,6 @@ self: {
        homepage = "http://www.haskell.org/~petersen/haskell/popenhs/";
        description = "popenhs is a popen-like library for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "poppler" = callPackage
@@ -160422,7 +158179,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs";
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk2 = null; inherit (pkgs) gdk_pixbuf; 
          inherit (pkgs.gnome) pango; inherit (pkgs) poppler;};
 
@@ -160460,7 +158216,6 @@ self: {
        homepage = "http://code.haskell.org/portaudio";
        description = "Haskell bindings for the PortAudio library";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) portaudio;};
 
   "porte" = callPackage
@@ -160478,7 +158233,6 @@ self: {
        ];
        description = "FreeBSD ports index search and analysis tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "porter" = callPackage
@@ -160490,7 +158244,6 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "Implementation of the Porter stemming algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ports" = callPackage
@@ -160503,7 +158256,6 @@ self: {
        homepage = "http://www.cse.unsw.edu.au/~chak/haskell/ports/";
        description = "The Haskell Ports Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ports-tools" = callPackage
@@ -160546,7 +158298,6 @@ self: {
        homepage = "https://github.com/tensor5/posix-acl";
        description = "Support for Posix ACL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) acl;};
 
   "posix-escape" = callPackage
@@ -160621,7 +158372,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "POSIX Realtime functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "posix-timer" = callPackage
@@ -160645,7 +158395,6 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "Low-level wrapping of POSIX waitpid(2)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "possible" = callPackage
@@ -160943,6 +158692,7 @@ self: {
          tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time
          transformers uuid vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
@@ -161267,12 +159017,12 @@ self: {
 
   "postgresql-simple-migration" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
-     , directory, hspec, postgresql-simple, time
+     , directory, hspec, postgresql-simple, text, time
      }:
      mkDerivation {
        pname = "postgresql-simple-migration";
-       version = "0.1.3.0";
-       sha256 = "5f0aca18d1382d680121280b19f32401ce0b53c3d951de9736d890715f2be763";
+       version = "0.1.5.0";
+       sha256 = "c45e5467c384498dc07ca9e96578ea69781a899f92c53f19fb7024d6d98aa06e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -161281,10 +159031,9 @@ self: {
        ];
        executableHaskellDepends = [
          base base64-bytestring bytestring cryptohash directory
-         postgresql-simple time
+         postgresql-simple text time
        ];
        testHaskellDepends = [ base bytestring hspec postgresql-simple ];
-       jailbreak = true;
        homepage = "https://github.com/ameingast/postgresql-simple-migration";
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
@@ -161317,7 +159066,6 @@ self: {
        homepage = "https://github.com/tolysz/postgresql-simple-typed";
        description = "Typed extension for PostgreSQL simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-url" = callPackage
@@ -161343,26 +159091,23 @@ self: {
 
   "postgresql-typed" = callPackage
     ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
-     , containers, cryptohash, haskell-src-meta, network, old-locale
-     , QuickCheck, scientific, template-haskell, text, time, utf8-string
-     , uuid
+     , containers, cryptonite, haskell-src-meta, memory, network
+     , old-locale, postgresql-binary, QuickCheck, scientific
+     , template-haskell, text, time, utf8-string, uuid
      }:
      mkDerivation {
        pname = "postgresql-typed";
-       version = "0.4.2.2";
-       sha256 = "80b2be671ad75782e19a808cbdecb1e814e2450b7645d2da0280c12802df188c";
-       revision = "1";
-       editedCabalFile = "a774fcb5f4d1cd12b2495cd376a5a010b6c1eac422601bbc4c379b1df99b4f5f";
+       version = "0.4.3";
+       sha256 = "6d7150da2dc0d290435c54892d2ff0e92a2517e142d08da31c74d05957d79407";
        libraryHaskellDepends = [
-         aeson array attoparsec base binary bytestring containers cryptohash
-         haskell-src-meta network old-locale scientific template-haskell
-         text time utf8-string uuid
+         aeson array attoparsec base binary bytestring containers cryptonite
+         haskell-src-meta memory network old-locale postgresql-binary
+         scientific template-haskell text time utf8-string uuid
        ];
        testHaskellDepends = [ base bytestring network QuickCheck time ];
        homepage = "https://github.com/dylex/postgresql-typed";
        description = "A PostgreSQL access library with compile-time SQL type inference";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgrest" = callPackage
@@ -161407,7 +159152,6 @@ self: {
        homepage = "https://github.com/begriffs/postgrest";
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postie" = callPackage
@@ -161430,7 +159174,6 @@ self: {
        ];
        description = "SMTP server library to receive emails from within Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postmark" = callPackage
@@ -161472,7 +159215,6 @@ self: {
        homepage = "http://github.com/peti/postmaster";
        description = "Postmaster ESMTP Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) adns; inherit (pkgs) openssl;};
 
   "potato-tool" = callPackage
@@ -161527,7 +159269,6 @@ self: {
        homepage = "http://neugierig.org/software/darcs/powermate/";
        description = "PowerMate bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "powerpc" = callPackage
@@ -161540,7 +159281,6 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "Tools for PowerPC programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ppm" = callPackage
@@ -161566,7 +159306,6 @@ self: {
        homepage = "http://hub.darcs.net/shelarcy/pqc";
        description = "Parallel batch driver for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pqueue_1_2_1" = callPackage
@@ -161621,7 +159360,6 @@ self: {
        jailbreak = true;
        description = "Fully encapsulated monad transformers with queuelike functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "practice-room" = callPackage
@@ -161640,7 +159378,6 @@ self: {
        homepage = "http://github.com/nfjinjing/practice-room";
        description = "Practice Room";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "precis" = callPackage
@@ -161661,7 +159398,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Diff Cabal packages";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pred-trie_0_2_0" = callPackage
@@ -161702,7 +159438,6 @@ self: {
        ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "predicates" = callPackage
@@ -161810,7 +159545,6 @@ self: {
        homepage = "http://www.github.com/massysett/prednote";
        description = "Tests and QuickCheck generators to accompany prednote";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prefix-units_0_1_0_2" = callPackage
@@ -161878,7 +159612,6 @@ self: {
        jailbreak = true;
        description = "A library for building a prefork-style server quickly";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pregame" = callPackage
@@ -161898,7 +159631,6 @@ self: {
        homepage = "https://github.com/jxv/pregame";
        description = "Prelude counterpart";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prelude-edsl" = callPackage
@@ -161961,7 +159693,6 @@ self: {
        jailbreak = true;
        description = "Another kind of alternate Prelude file";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prelude-plus" = callPackage
@@ -161975,7 +159706,6 @@ self: {
        libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prelude-prime" = callPackage
@@ -162019,7 +159749,6 @@ self: {
        jailbreak = true;
        description = "Preprocess Haskell Repositories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "preprocessor-tools" = callPackage
@@ -162077,7 +159806,6 @@ self: {
        homepage = "http://github.com/bickfordb/text-press";
        description = "Text template library targeted at the web / HTML generation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "presto-hdbc" = callPackage
@@ -162098,7 +159826,6 @@ self: {
        jailbreak = true;
        description = "An HDBC connector for Presto";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prettify" = callPackage
@@ -162112,12 +159839,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pretty_1_1_3_2" = callPackage
+  "pretty_1_1_3_3" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck }:
      mkDerivation {
        pname = "pretty";
-       version = "1.1.3.2";
-       sha256 = "715f2de429fa581859bee06e4d1ed3d076a0e1b00107bf2127be01c2c2d9c14c";
+       version = "1.1.3.3";
+       sha256 = "3b632679f51cc709ec96e51c6a03bbc1ded8dbc5c8ea3fda75501cf7962f9798";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base deepseq ghc-prim QuickCheck ];
        homepage = "http://github.com/haskell/pretty";
@@ -162425,7 +160152,6 @@ self: {
        homepage = "http://kagami.touhou.ru/projects/show/primula";
        description = "ImageBoard on Happstack and HSP";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primula-bot" = callPackage
@@ -162445,7 +160171,6 @@ self: {
        homepage = "http://kagami.touhou.ru/projects/show/primula";
        description = "Jabber-bot for primula-board ImageBoard";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "print-debugger" = callPackage
@@ -162474,7 +160199,6 @@ self: {
        ];
        description = "A Perl printf like formatter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "printxosd" = callPackage
@@ -162489,7 +160213,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/printxosd";
        description = "Simple tool to display some text on an on-screen display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "priority-queue" = callPackage
@@ -162503,7 +160226,6 @@ self: {
        homepage = "http://code.haskell.org/~mokus/priority-queue";
        description = "Simple implementation of a priority queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "priority-sync" = callPackage
@@ -162597,7 +160319,6 @@ self: {
        ];
        description = "Parse process information for Linux";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process_1_4_2_0" = callPackage
@@ -162752,7 +160473,6 @@ self: {
        homepage = "https://github.com/garious/process-iterio";
        description = "IterIO Process Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-leksah" = callPackage
@@ -162765,7 +160485,6 @@ self: {
        jailbreak = true;
        description = "Process libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-listlike" = callPackage
@@ -162784,7 +160503,6 @@ self: {
        homepage = "https://github.com/ddssff/process-listlike";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-progress" = callPackage
@@ -162802,7 +160520,6 @@ self: {
        homepage = "https://src.seereason.com/process-progress";
        description = "Run a process and do reportsing on its progress";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-qq" = callPackage
@@ -162821,7 +160538,6 @@ self: {
        homepage = "http://github.com/tanakh/process-qq";
        description = "Quasi-Quoters for exec process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-streaming" = callPackage
@@ -162870,9 +160586,8 @@ self: {
          transformers
        ];
        jailbreak = true;
-       description = "Web graphic applications with processing.js";
+       description = "Web graphic applications with processing.js.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "processor-creative-kit" = callPackage
@@ -162900,7 +160615,6 @@ self: {
        libraryHaskellDepends = [ base procrastinating-variable ];
        description = "Pure structures that can be incrementally created in impure code";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "procrastinating-variable" = callPackage
@@ -162913,7 +160627,6 @@ self: {
        homepage = "http://github.com/gcross/procrastinating-variable";
        description = "Haskell values that cannot be evaluated immediately";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "procstat" = callPackage
@@ -162927,7 +160640,6 @@ self: {
        homepage = "http://closure.ath.cx/procstat";
        description = "get information on processes in Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proctest" = callPackage
@@ -163056,7 +160768,6 @@ self: {
        homepage = "http://antiope.com/downloads.html";
        description = "Convert GHC profiles into GraphViz's dot format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prof2pretty" = callPackage
@@ -163083,8 +160794,8 @@ self: {
      }:
      mkDerivation {
        pname = "profiteur";
-       version = "0.3.0.1";
-       sha256 = "a0e2ea372a6259dcd25b69160e9afef9039c25e0acbafd8824eb907117dd5b86";
+       version = "0.3.0.2";
+       sha256 = "43df79a7d3b0a9562658367a46016c361522ea07ac67fb5ad65d891ad77bfbaf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -163210,7 +160921,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Simple progress tracking & projection library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "progressbar" = callPackage
@@ -163225,7 +160935,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "progression" = callPackage
@@ -163244,7 +160953,6 @@ self: {
        homepage = "http://chplib.wordpress.com/2010/02/04/progression-supporting-optimisation-in-haskell/";
        description = "Automates the recording and graphing of criterion benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "progressive" = callPackage
@@ -163265,7 +160973,6 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/progression";
        description = "Multilabel classification model which learns sequentially (online)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proj4-hs-bindings" = callPackage
@@ -163278,7 +160985,6 @@ self: {
        librarySystemDepends = [ proj ];
        description = "Haskell bindings for the Proj4 C dynamic library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) proj;};
 
   "project-template_0_1_4_2" = callPackage
@@ -163368,7 +161074,6 @@ self: {
        homepage = "https://github.com/Erdwolf/prolog";
        description = "A Prolog interpreter written in Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prolog-graph" = callPackage
@@ -163388,7 +161093,6 @@ self: {
        homepage = "https://github.com/Erdwolf/prolog";
        description = "A command line tool to visualize query resolution in Prolog";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prolog-graph-lib" = callPackage
@@ -163401,7 +161105,6 @@ self: {
        homepage = "https://github.com/Erdwolf/prolog";
        description = "Generating images of resolution trees for Prolog queries";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prologue" = callPackage
@@ -163443,7 +161146,7 @@ self: {
          QuickCheck random-shuffle stm time transformers utf8-string
        ];
        homepage = "https://github.com/fimad/prometheus-haskell";
-       description = "Haskell client library for http://prometheus.io";
+       description = "Haskell client library for http://prometheus.io.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -163512,7 +161215,6 @@ self: {
        ];
        description = "Functional synthesis of images and animations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "propellor" = callPackage
@@ -163584,7 +161286,6 @@ self: {
        homepage = "http://www-users.cs.york.ac.uk/~ndm/proplang/";
        description = "A library for functional GUI development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "props" = callPackage
@@ -163629,7 +161330,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A wrapper for the proteaaudio library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "protobuf" = callPackage
@@ -163677,7 +161377,6 @@ self: {
        homepage = "https://github.com/nicta/protobuf-native";
        description = "Protocol Buffers via C++";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers_2_1_4" = callPackage
@@ -163929,7 +161628,6 @@ self: {
        homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-fork" = callPackage
@@ -163947,7 +161645,6 @@ self: {
        homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proton-haskell" = callPackage
@@ -163999,7 +161696,6 @@ self: {
        homepage = "https://github.com/prove-everywhere/server";
        description = "The server for ProveEverywhere";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proxied" = callPackage
@@ -164025,7 +161721,6 @@ self: {
        homepage = "https://github.com/jberryman/proxy-kindness";
        description = "A library for kind-polymorphic manipulation and inspection of Proxy values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "psc-ide_0_5_0" = callPackage
@@ -164207,7 +161902,6 @@ self: {
        jailbreak = true;
        description = "Pipe stdin to a redis pub/sub channel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffix_0_20151212" = callPackage
@@ -164274,7 +161968,6 @@ self: {
        homepage = "https://github.com/litherum/publicsuffixlist";
        description = "Create the publicsuffixlist package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pubnub" = callPackage
@@ -164309,7 +162002,6 @@ self: {
        homepage = "http://github.com/pubnub/haskell";
        description = "PubNub Haskell SDK";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pubsub" = callPackage
@@ -164330,7 +162022,6 @@ self: {
        homepage = "http://projects.haskell.org/pubsub/";
        description = "A library for Google/SixApart pubsub hub interaction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "puffytools" = callPackage
@@ -164361,7 +162052,6 @@ self: {
        homepage = "https://github.com/pharpend/puffytools";
        description = "A CLI assistant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pugixml" = callPackage
@@ -164380,7 +162070,6 @@ self: {
        homepage = "https://github.com/philopon/pugixml-hs";
        description = "pugixml binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "pugs-DrIFT" = callPackage
@@ -164415,7 +162104,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, lightweight YAML loader and dumper";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pugs-compat" = callPackage
@@ -164447,7 +162135,6 @@ self: {
        homepage = "http://repetae.net/john/computer/haskell/hsregex/";
        description = "Haskell PCRE binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pulse-simple" = callPackage
@@ -164460,7 +162147,6 @@ self: {
        librarySystemDepends = [ libpulseaudio ];
        description = "binding to Simple API of pulseaudio";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libpulseaudio;};
 
   "punkt" = callPackage
@@ -164480,7 +162166,6 @@ self: {
        homepage = "https://github.com/bryant/punkt";
        description = "Multilingual unsupervised sentence tokenization with Punkt";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "punycode" = callPackage
@@ -164517,9 +162202,8 @@ self: {
          mtl text
        ];
        homepage = "http://lpuppet.banquise.net";
-       description = "A program that displays the puppet resources associated to a node given .pp files";
+       description = "A program that displays the puppet resources associated to a node given .pp files.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pure-cdb" = callPackage
@@ -164872,36 +162556,40 @@ self: {
   "purescript" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
      , base-compat, bower-json, boxes, bytestring, containers, directory
-     , dlist, filepath, Glob, haskeline, HUnit, language-javascript
-     , lifted-base, monad-control, mtl, optparse-applicative, parallel
-     , parsec, pattern-arrows, process, safe, semigroups, split, syb
-     , text, time, transformers, transformers-base, transformers-compat
-     , unordered-containers, utf8-string, vector
+     , dlist, edit-distance, filepath, fsnotify, Glob, haskeline, hspec
+     , hspec-discover, http-types, HUnit, language-javascript
+     , lifted-base, monad-control, monad-logger, mtl, network
+     , optparse-applicative, parallel, parsec, pattern-arrows, pipes
+     , pipes-http, process, regex-tdfa, safe, semigroups, sourcemap
+     , split, stm, syb, text, time, transformers, transformers-base
+     , transformers-compat, unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.8.0.0";
-       sha256 = "a263933c4ae407f2c97e230d08ab343f597e101a597f7fa01151b0b476ce43d0";
+       version = "0.8.2.0";
+       sha256 = "eafb971c6730500e89f8a46e5d7afddb6093240c47ffa0e3523bff2052b9e4b4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-better-errors base base-compat bower-json boxes
-         bytestring containers directory dlist filepath Glob
-         language-javascript lifted-base monad-control mtl parallel parsec
-         pattern-arrows process safe semigroups split syb text time
-         transformers transformers-base transformers-compat
+         bytestring containers directory dlist edit-distance filepath
+         fsnotify Glob http-types language-javascript lifted-base
+         monad-control monad-logger mtl parallel parsec pattern-arrows pipes
+         pipes-http process regex-tdfa safe semigroups sourcemap split stm
+         syb text time transformers transformers-base transformers-compat
          unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint base base-compat boxes bytestring containers
-         directory filepath Glob haskeline mtl optparse-applicative parsec
-         process split time transformers transformers-compat utf8-string
+         directory filepath Glob haskeline monad-logger mtl network
+         optparse-applicative parsec process split stm text time
+         transformers transformers-compat utf8-string
        ];
        testHaskellDepends = [
          aeson aeson-better-errors base base-compat boxes bytestring
-         containers directory filepath Glob haskeline HUnit mtl
-         optparse-applicative parsec process time transformers
-         transformers-compat
+         containers directory filepath Glob haskeline hspec hspec-discover
+         HUnit mtl optparse-applicative parsec process stm text time
+         transformers transformers-compat
        ];
        doCheck = false;
        homepage = "http://www.purescript.org/";
@@ -164949,7 +162637,6 @@ self: {
        homepage = "http://gsoc2013cwithmobiledevices.blogspot.com.ar/";
        description = "A server-side library for sending push notifications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "push-notify-ccs" = callPackage
@@ -164970,7 +162657,6 @@ self: {
        homepage = "http://gsoc2013cwithmobiledevices.blogspot.com.ar/";
        description = "A server-side library for sending/receiving push notifications through CCS (Google Cloud Messaging)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "push-notify-general" = callPackage
@@ -164988,9 +162674,8 @@ self: {
          unordered-containers xml-conduit yesod
        ];
        homepage = "http://gsoc2013cwithmobiledevices.blogspot.com.ar/";
-       description = "A general library for sending/receiving push notif. through dif. services";
+       description = "A general library for sending/receiving push notif. through dif. services.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pusher-haskell" = callPackage
@@ -165094,7 +162779,6 @@ self: {
        homepage = "https://github.com/jwiegley/pushme";
        description = "Tool to synchronize multiple directories with rsync, zfs or git-annex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "putlenses" = callPackage
@@ -165112,7 +162796,6 @@ self: {
        jailbreak = true;
        description = "Put-based lens library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "puzzle-draw" = callPackage
@@ -165142,7 +162825,6 @@ self: {
        ];
        description = "Creating graphics for pencil puzzles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "puzzle-draw-cmdline" = callPackage
@@ -165162,7 +162844,6 @@ self: {
        jailbreak = true;
        description = "Creating graphics for pencil puzzles, command line tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pvd" = callPackage
@@ -165183,7 +162864,6 @@ self: {
        homepage = "http://code.haskell.org/pvd";
        description = "A photo viewer daemon application with remote controlling abilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libdevil;};
 
   "pwstore-cli" = callPackage
@@ -165307,7 +162987,6 @@ self: {
        jailbreak = true;
        description = "Serialization/deserialization using Python Pickle format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qc-oi-testgenerator" = callPackage
@@ -165335,7 +163014,6 @@ self: {
        librarySystemDepends = [ qd ];
        description = "double-double and quad-double number type via libqd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {qd = null;};
 
   "qd-vec" = callPackage
@@ -165347,7 +163025,6 @@ self: {
        libraryHaskellDepends = [ base qd Vec ];
        description = "'Vec' instances for 'qd' types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qed" = callPackage
@@ -165366,7 +163043,6 @@ self: {
        homepage = "https://github.com/ndmitchell/qed#readme";
        description = "Simple prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qhull-simple" = callPackage
@@ -165380,7 +163056,6 @@ self: {
        homepage = "http://nonempty.org/software/haskell-qhull-simple";
        description = "Simple bindings to Qhull, a library for computing convex hulls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) qhull;};
 
   "qrcode" = callPackage
@@ -165409,7 +163084,6 @@ self: {
        homepage = "http://github.com/keerastudios/hsQt";
        description = "Qt bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {qtc_core = null; qtc_gui = null; qtc_network = null; 
          qtc_opengl = null; qtc_script = null; qtc_tools = null;};
 
@@ -165433,7 +163107,6 @@ self: {
        homepage = "https://github.com/ion1/quadratic-irrational";
        description = "An implementation of quadratic irrationals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quandl-api_0_2_0_0" = callPackage
@@ -165526,7 +163199,6 @@ self: {
        homepage = "http://github.com/luqui/quantum-arrow";
        description = "An embedding of quantum computation as a Haskell arrow";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qudb" = callPackage
@@ -165546,7 +163218,6 @@ self: {
        homepage = "https://github.com/jstepien/qudb";
        description = "Quite Useless DB";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quenya-verb" = callPackage
@@ -165569,7 +163240,6 @@ self: {
        jailbreak = true;
        description = "Quenya verb conjugator";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "querystring-pickle" = callPackage
@@ -165587,7 +163257,6 @@ self: {
        ];
        description = "Picklers for de/serialising Generic data types to and from query strings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "questioner" = callPackage
@@ -165628,7 +163297,6 @@ self: {
        libraryHaskellDepends = [ array base containers mtl stateful-mtl ];
        description = "A library of queuelike data structures, both functional and stateful";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quick-generator" = callPackage
@@ -165807,7 +163475,6 @@ self: {
        ];
        description = "Automating QuickCheck for polymorphic and overlaoded properties";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-properties" = callPackage
@@ -165895,7 +163562,6 @@ self: {
        homepage = "http://github.com/tcrayford/rematch";
        description = "QuickCheck support for rematch";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-script" = callPackage
@@ -166030,7 +163696,6 @@ self: {
        homepage = "http://www.github.com/massysett/quickpull";
        description = "Generate Main module with QuickCheck tests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickset" = callPackage
@@ -166042,7 +163707,6 @@ self: {
        libraryHaskellDepends = [ base vector vector-algorithms ];
        description = "Very fast and memory-compact query-only set and map structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickspec" = callPackage
@@ -166075,7 +163739,6 @@ self: {
        homepage = "https://github.com/davidsiegel/quicktest";
        description = "A reflective batch tester for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickwebapp" = callPackage
@@ -166202,7 +163865,6 @@ self: {
        homepage = "https://github.com/talw/quoridor-hs";
        description = "A Quoridor implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qux" = callPackage
@@ -166223,7 +163885,6 @@ self: {
        homepage = "https://github.com/qux-lang/qux";
        description = "Command line binary for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rabocsv2qif" = callPackage
@@ -166238,7 +163899,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A library and program to create QIF files from Rabobank CSV exports";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rad" = callPackage
@@ -166252,7 +163912,6 @@ self: {
        homepage = "http://comonad.com/reader/";
        description = "Reverse Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radian" = callPackage
@@ -166286,7 +163945,6 @@ self: {
        homepage = "https://github.com/klangner/radium";
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radium-formula-parser" = callPackage
@@ -166304,7 +163962,6 @@ self: {
        homepage = "https://github.com/klangner/radium-formula-parser";
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radix" = callPackage
@@ -166341,7 +163998,6 @@ self: {
        homepage = "github";
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {rados = null;};
 
   "rail-compiler-editor" = callPackage
@@ -166365,7 +164021,6 @@ self: {
        homepage = "https://github.com/SWP-Ubau-SoSe2014-Haskell/SWPSoSe14";
        description = "Compiler and editor for the esolang rail";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rainbow_0_20_0_4" = callPackage
@@ -166429,7 +164084,6 @@ self: {
        homepage = "http://www.github.com/massysett/rainbow";
        description = "Tests and QuickCheck generators to accompany rainbow";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rainbox_0_18_0_2" = callPackage
@@ -166522,7 +164176,6 @@ self: {
        homepage = "http://github.com/YoEight/rakhana";
        description = "Stream based PDF library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ralist" = callPackage
@@ -166534,7 +164187,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rallod" = callPackage
@@ -166547,7 +164199,6 @@ self: {
        homepage = "http://github.com/moonmaster9000/rallod";
        description = "'$' in reverse";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "raml" = callPackage
@@ -166575,7 +164226,6 @@ self: {
        libraryHaskellDepends = [ array base IntervalMap mtl random ];
        description = "Random variable library, with Functor, Applicative and Monad instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "randfile" = callPackage
@@ -166594,7 +164244,6 @@ self: {
        ];
        description = "Program for picking a random file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random_1_0_1_1" = callPackage
@@ -166630,7 +164279,6 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "Random-access lists in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-derive" = callPackage
@@ -166655,7 +164303,6 @@ self: {
        jailbreak = true;
        description = "A simple random generator library for extensible-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-effin" = callPackage
@@ -166668,7 +164315,6 @@ self: {
        jailbreak = true;
        description = "A simple random generator library for effin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-extras" = callPackage
@@ -166741,7 +164387,6 @@ self: {
        homepage = "https://github.com/srijs/random-hypergeometric";
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-shuffle" = callPackage
@@ -166782,7 +164427,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring random ];
        description = "An infinite stream of random data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-tree" = callPackage
@@ -166817,7 +164461,6 @@ self: {
        homepage = "https://bitbucket.org/kpratt/random-variate";
        description = "\"Uniform RNG => Non-Uniform RNGs\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "randomgen" = callPackage
@@ -166932,7 +164575,6 @@ self: {
        libraryHaskellDepends = [ base containers primitive vector ];
        description = "Linear range-min algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ranges" = callPackage
@@ -167213,7 +164855,7 @@ self: {
        sha256 = "efe86052c5979261d9aa6861c6297205ee0b60e1b36de191d20485e823c9781a";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/RaphaelJ/ratio-int";
-       description = "Fast specialisation of Data.Ratio for Int";
+       description = "Fast specialisation of Data.Ratio for Int.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -167251,7 +164893,6 @@ self: {
        homepage = "http://bitbucket.org/dpwiz/raven-haskell";
        description = "Sentry http interface for Scotty web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "raw-strings-qq_1_0_2" = callPackage
@@ -167323,7 +164964,6 @@ self: {
        homepage = "http://malde.org/~ketil/";
        description = "Mask nucleotide (EST) sequences in Fasta format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rclient" = callPackage
@@ -167361,7 +165001,6 @@ self: {
        homepage = "http://github.com/ekmett/rcu/";
        description = "Read-Copy-Update for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rdf4h" = callPackage
@@ -167393,7 +165032,6 @@ self: {
        homepage = "https://github.com/robstewart57/rdf4h";
        description = "A library for RDF processing in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rdioh" = callPackage
@@ -167416,7 +165054,6 @@ self: {
        ];
        description = "A Haskell wrapper for Rdio's API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rdtsc" = callPackage
@@ -167454,7 +165091,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-re2/";
        description = "Bindings to the re2 regular expression library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "react-flux" = callPackage
@@ -167508,7 +165144,6 @@ self: {
        homepage = "http://wiki.github.com/paolino/realogic";
        description = "pluggable pure logic serializable reactor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive" = callPackage
@@ -167526,7 +165161,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/reactive";
        description = "Push-pull functional reactive programming";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-bacon" = callPackage
@@ -167540,7 +165174,6 @@ self: {
        homepage = "http://github.com/raimohanska/reactive-bacon";
        description = "FRP (functional reactive programming) framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-balsa" = callPackage
@@ -167563,7 +165196,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana" = callPackage
@@ -167604,7 +165236,6 @@ self: {
        homepage = "https://github.com/JPMoresmau/reactive-banana-sdl";
        description = "Reactive Banana bindings for SDL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-sdl2" = callPackage
@@ -167633,7 +165264,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-wx" = callPackage
@@ -167651,7 +165281,6 @@ self: {
        homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "reactive-fieldtrip" = callPackage
@@ -167669,7 +165298,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/reactive-fieldtrip";
        description = "Connect Reactive and FieldTrip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-glut" = callPackage
@@ -167686,7 +165314,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/reactive-glut";
        description = "Connects Reactive and GLUT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-haskell" = callPackage
@@ -167727,7 +165354,6 @@ self: {
        homepage = "https://github.com/strager/reactive-thread";
        description = "Reactive programming via imperative threads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactor" = callPackage
@@ -167746,7 +165372,6 @@ self: {
        homepage = "http://comonad.com/reader/";
        description = "Reactor - task parallel reactive programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "read-bounded" = callPackage
@@ -167837,7 +165462,7 @@ self: {
        executableHaskellDepends = [ base bliplib parseargs ];
        jailbreak = true;
        homepage = "https://github.com/bjpop/blip";
-       description = "Read and pretty print Python bytecode (.pyc) files";
+       description = "Read and pretty print Python bytecode (.pyc) files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -167852,7 +165477,6 @@ self: {
        homepage = "http://website-ckkashyap.rhcloud.com";
        description = "A really simple XML parser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reasonable-lens" = callPackage
@@ -167863,9 +165487,8 @@ self: {
        sha256 = "5575f5ee0cff708aeb37ea79cc9fae555e62e55053656f252653e33e631a8245";
        libraryHaskellDepends = [ base mtl split template-haskell ];
        homepage = "https://github.com/tokiwoousaka/reasonable-lens";
-       description = "Lens implementation. It is more small but adequately";
+       description = "Lens implementation. It is more small but adequately.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reasonable-operational" = callPackage
@@ -167885,18 +165508,19 @@ self: {
   "rebase" = callPackage
     ({ mkDerivation, base, base-prelude, bifunctors, bytestring
      , containers, contravariant, contravariant-extras, deepseq, dlist
-     , either, hashable, mtl, profunctors, scientific, semigroups, text
-     , time, transformers, unordered-containers, uuid, vector, void
+     , either, fail, hashable, mtl, profunctors, scientific, semigroups
+     , text, time, transformers, unordered-containers, uuid, vector
+     , void
      }:
      mkDerivation {
        pname = "rebase";
-       version = "0.4.3";
-       sha256 = "375e6cb300a7d93b8c64bad5edd69464b787d5d5b22ac80e3705ad2c0f07bde5";
+       version = "0.5";
+       sha256 = "005c556d164d4debc2770f91a66d5f67413a88e3343aab563ceca8de61308707";
        libraryHaskellDepends = [
          base base-prelude bifunctors bytestring containers contravariant
-         contravariant-extras deepseq dlist either hashable mtl profunctors
-         scientific semigroups text time transformers unordered-containers
-         uuid vector void
+         contravariant-extras deepseq dlist either fail hashable mtl
+         profunctors scientific semigroups text time transformers
+         unordered-containers uuid vector void
        ];
        homepage = "https://github.com/nikita-volkov/rebase";
        description = "A more progressive alternative to the \"base\" package";
@@ -167948,7 +165572,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/record-aeson";
        description = "Instances of \"aeson\" classes for the \"record\" types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "record-gl" = callPackage
@@ -167972,7 +165595,6 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "record-preprocessor" = callPackage
@@ -167993,7 +165615,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/record-preprocessor";
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "record-syntax" = callPackage
@@ -168016,7 +165637,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/record-syntax";
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "records" = callPackage
@@ -168029,7 +165649,6 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/records";
        description = "A flexible record system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "records-th" = callPackage
@@ -168048,7 +165667,6 @@ self: {
        homepage = "github.com/lassoinc/records-th";
        description = "Template Haskell declarations for the records package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "recursion-schemes" = callPackage
@@ -168097,7 +165715,6 @@ self: {
        jailbreak = true;
        description = "Monadic HTTP request handlers combinators to build a standalone web apps";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reddit" = callPackage
@@ -168387,7 +166004,6 @@ self: {
        homepage = "http://github.com/NicolasT/reedsolomon";
        description = "Reed-Solomon Erasure Coding in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reenact" = callPackage
@@ -168424,7 +166040,6 @@ self: {
        homepage = "https://bitbucket.org/carter/ref";
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ref-fd" = callPackage
@@ -168559,7 +166174,6 @@ self: {
        homepage = "https://github.com/Raynes/refh";
        description = "A command-line tool for pasting to https://www.refheap.com";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "refined" = callPackage
@@ -168695,7 +166309,6 @@ self: {
        homepage = "http://github.com/jfischoff/reflection-extras";
        description = "Utilities for the reflection package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflection-without-remorse" = callPackage
@@ -168732,7 +166345,6 @@ self: {
        homepage = "https://github.com/ryantrinkle/reflex";
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-animation" = callPackage
@@ -168751,7 +166363,6 @@ self: {
        homepage = "https://github.com/saulzar/reflex-animation";
        description = "Continuous animations support for reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-dom" = callPackage
@@ -168775,7 +166386,6 @@ self: {
        ];
        description = "Functional Reactive Web Apps with Reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-dom-contrib" = callPackage
@@ -168795,7 +166405,6 @@ self: {
        homepage = "https://github.com/reflex-frp/reflex-dom-contrib";
        description = "A playground for experimenting with infrastructure and common code for reflex applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-gloss" = callPackage
@@ -168812,7 +166421,6 @@ self: {
        homepage = "https://github.com/reflex-frp/reflex-gloss";
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-gloss-scene" = callPackage
@@ -168842,7 +166450,6 @@ self: {
        homepage = "https://github.com/saulzar/reflex-gloss-scene";
        description = "A simple scene-graph using reflex and gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-transformers" = callPackage
@@ -168860,7 +166467,6 @@ self: {
        homepage = "http://github.com/saulzar/reflex-transformers";
        description = "Collections and switchable Monad transformers for Reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reform" = callPackage
@@ -169087,7 +166693,6 @@ self: {
        homepage = "http://code.google.com/p/xhaskell-regex-deriv/";
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Brzozowski's Deriviatives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-dfa" = callPackage
@@ -169100,7 +166705,6 @@ self: {
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-easy" = callPackage
@@ -169148,7 +166752,6 @@ self: {
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-pcre" = callPackage
@@ -169195,9 +166798,8 @@ self: {
          parsec regex-base
        ];
        homepage = "http://code.google.com/p/xhaskell-library/";
-       description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives";
+       description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-posix" = callPackage
@@ -169356,7 +166958,6 @@ self: {
        jailbreak = true;
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-tre" = callPackage
@@ -169370,7 +166971,6 @@ self: {
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) tre;};
 
   "regex-xmlschema" = callPackage
@@ -169384,7 +166984,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
        description = "A regular expression library for W3C XML Schema regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regexchar" = callPackage
@@ -169436,7 +167035,6 @@ self: {
        homepage = "http://github.com/baldo/regexp-tries";
        description = "Regular Expressions on Tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regexpr" = callPackage
@@ -169476,7 +167074,6 @@ self: {
        homepage = "http://code.haskell.org/~morrow/code/haskell/regexqq";
        description = "A quasiquoter for PCRE regexes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regional-pointers" = callPackage
@@ -169493,7 +167090,6 @@ self: {
        homepage = "https://github.com/basvandijk/regional-pointers/";
        description = "Regional memory pointers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regions" = callPackage
@@ -169511,7 +167107,6 @@ self: {
        homepage = "https://github.com/basvandijk/regions/";
        description = "Provides the region monad for safely opening and working with scarce resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regions-monadsfd" = callPackage
@@ -169528,7 +167123,6 @@ self: {
        jailbreak = true;
        description = "Monads-fd instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regions-monadstf" = callPackage
@@ -169546,7 +167140,6 @@ self: {
        homepage = "https://github.com/basvandijk/regions-monadstf/";
        description = "Monads-tf instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regions-mtl" = callPackage
@@ -169560,7 +167153,6 @@ self: {
        homepage = "https://github.com/basvandijk/regions-mtl/";
        description = "mtl instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regress" = callPackage
@@ -169610,7 +167202,6 @@ self: {
        jailbreak = true;
        description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regular-web" = callPackage
@@ -169628,7 +167219,6 @@ self: {
        homepage = "http://github.com/chriseidhof/regular-web";
        description = "Generic programming for the web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regular-xmlpickler" = callPackage
@@ -169656,7 +167246,6 @@ self: {
        homepage = "https://github.com/mrVanDalo/reheat";
        description = "to make notes and reduce impact on idle time on writing other programms";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rehoo" = callPackage
@@ -169694,7 +167283,6 @@ self: {
        homepage = "https://github.com/kerkomen/rei";
        description = "Process lists easily";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reified-records" = callPackage
@@ -169708,7 +167296,6 @@ self: {
        homepage = "http://bitbucket.org/jozefg/reified-records";
        description = "Reify records to Maps and back again";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reify" = callPackage
@@ -169725,7 +167312,6 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Serialize data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reinterpret-cast" = callPackage
@@ -169739,7 +167325,6 @@ self: {
        homepage = "https://github.com/nh2/reinterpret-cast";
        description = "Memory reinterpretation casts for Float/Double and Word32/Word64";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "relacion" = callPackage
@@ -169783,7 +167368,6 @@ self: {
        homepage = "https://github.com/yuga/haskell-relational-record-driver-postgresql8";
        description = "PostgreSQL v8.x driver for haskell-relational-record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-query" = callPackage
@@ -169943,7 +167527,6 @@ self: {
        ];
        description = "Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "remote-debugger" = callPackage
@@ -170075,7 +167658,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/remotion";
        description = "A library for client-server applications based on custom protocols";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "renderable" = callPackage
@@ -170115,7 +167697,6 @@ self: {
        jailbreak = true;
        description = "Define compound types that do not depend on member order";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa_3_3_1_2" = callPackage
@@ -170226,7 +167807,6 @@ self: {
        homepage = "http://repa.ouroborus.net";
        description = "Bulk array representations and operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-bytestring" = callPackage
@@ -170353,7 +167933,6 @@ self: {
        homepage = "http://repa.ouroborus.net";
        description = "Data-parallel data flows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-io_3_3_1_2" = callPackage
@@ -170412,8 +167991,8 @@ self: {
     ({ mkDerivation, base, hmatrix, repa, vector }:
      mkDerivation {
        pname = "repa-linear-algebra";
-       version = "0.3.0.0";
-       sha256 = "643cbbbd486fa48f74ae1bbdcd05a8092325c8dba08e1950522fe27e8c45f559";
+       version = "0.3.0.1";
+       sha256 = "560e1b429ab07e712d28954c6443a6fd8d07d922ccd3041ac28fb996c2f499a2";
        libraryHaskellDepends = [ base hmatrix repa vector ];
        homepage = "https://github.com/marcinmrotek/repa-linear-algebra";
        description = "HMatrix operations for Repa";
@@ -170435,7 +168014,6 @@ self: {
        jailbreak = true;
        description = "Data Flow Fusion GHC Plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-scalar" = callPackage
@@ -170465,7 +168043,6 @@ self: {
        jailbreak = true;
        description = "Series Expressionss API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-sndfile" = callPackage
@@ -170500,7 +168077,6 @@ self: {
        homepage = "http://repa.ouroborus.net";
        description = "Stream functions not present in the vector library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-v4l2" = callPackage
@@ -170521,7 +168097,6 @@ self: {
        homepage = "https://github.com/cgo/hsimage";
        description = "Provides high-level access to webcams";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repl" = callPackage
@@ -170537,7 +168112,6 @@ self: {
        homepage = "https://github.com/mikeplus64/repl";
        description = "IRC friendly REPL library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repl-toolkit" = callPackage
@@ -170599,7 +168173,6 @@ self: {
        homepage = "https://github.com/saep/repo-based-blog";
        description = "Blogging module using blaze html for markup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repr" = callPackage
@@ -170617,7 +168190,6 @@ self: {
        homepage = "https://github.com/basvandijk/repr";
        description = "Render overloaded expressions to their textual representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repr-tree-syb" = callPackage
@@ -170651,7 +168223,6 @@ self: {
        homepage = "http://github.com/ekmett/representable-functors/";
        description = "Representable functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "representable-profunctors" = callPackage
@@ -170685,7 +168256,6 @@ self: {
        homepage = "http://github.com/ekmett/representable-tries/";
        description = "Tries from representations of polynomial functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "request-monad" = callPackage
@@ -170826,7 +168396,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/resistor-cube";
        description = "Compute total resistance of a cube of resistors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resolve-trivial-conflicts_0_3_2_1" = callPackage
@@ -170901,7 +168470,6 @@ self: {
        homepage = "https://bitbucket.org/tdammers/resource-embed";
        description = "Embed data files via C and FFI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resource-pool_0_2_3_1" = callPackage
@@ -170990,7 +168558,6 @@ self: {
        jailbreak = true;
        description = "Allocate resources which are guaranteed to be released";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resourcet_1_1_3_1" = callPackage
@@ -171189,7 +168756,6 @@ self: {
        homepage = "https://github.com/raptros/respond";
        description = "process and route HTTP requests and generate responses on top of WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-client_0_4_0_1" = callPackage
@@ -172363,7 +169929,6 @@ self: {
        jailbreak = true;
        homepage = "https://github.com/ozataman/restful-snap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "restricted-workers" = callPackage
@@ -172384,7 +169949,6 @@ self: {
        homepage = "https://github.com/co-dan/interactive-diagrams/wiki/Restricted-Workers";
        description = "Running worker processes under system resource restrictions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "restyle" = callPackage
@@ -172400,7 +169964,6 @@ self: {
        jailbreak = true;
        description = "Convert between camel case and separated words style";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resumable-exceptions" = callPackage
@@ -172413,7 +169976,6 @@ self: {
        jailbreak = true;
        description = "A monad transformer for resumable exceptions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rethinkdb_2_2_0_2" = callPackage
@@ -172637,7 +170199,6 @@ self: {
        homepage = "http://github.com/seanhess/rethinkdb-model";
        description = "Useful tools for modeling data with rethinkdb";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rethinkdb-wereHamster" = callPackage
@@ -172858,7 +170419,6 @@ self: {
        homepage = "http://www.github.com/massysett/rewrite";
        description = "open file and rewrite it with new contents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rewriting" = callPackage
@@ -172870,7 +170430,6 @@ self: {
        libraryHaskellDepends = [ base containers regular ];
        description = "Generic rewriting library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rex" = callPackage
@@ -172906,7 +170465,6 @@ self: {
        jailbreak = true;
        description = "Github resume generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rfc3339" = callPackage
@@ -172919,7 +170477,6 @@ self: {
        doHaddock = false;
        description = "Parse and display time according to RFC3339 (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rfc5051" = callPackage
@@ -172952,7 +170509,6 @@ self: {
        homepage = "https://github.com/fumieval/rhythm-game-tutorial";
        description = "Haskell rhythm game tutorial";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "riak" = callPackage
@@ -173038,7 +170594,6 @@ self: {
        homepage = "https://github.com/tel/riemann-hs";
        description = "A Riemann client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "riff" = callPackage
@@ -173091,7 +170646,6 @@ self: {
        homepage = "http://modeemi.fi/~tuomov/riot/";
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "ripple" = callPackage
@@ -173112,7 +170666,6 @@ self: {
        homepage = "https://github.com/singpolyma/ripple-haskell";
        description = "Ripple payment system library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ripple-federation" = callPackage
@@ -173131,7 +170684,6 @@ self: {
        homepage = "https://github.com/singpolyma/ripple-federation-haskell";
        description = "Utilities and types to work with the Ripple federation protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "risc386" = callPackage
@@ -173149,7 +170701,6 @@ self: {
        homepage = "http://www2.tcs.ifi.lmu.de/~abel/";
        description = "Reduced instruction set i386 simulator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rivers" = callPackage
@@ -173163,7 +170714,6 @@ self: {
        homepage = "https://github.com/d-rive/rivers";
        description = "Rivers are like Streams, but different";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rivet" = callPackage
@@ -173260,7 +170810,6 @@ self: {
        ];
        description = "Restricted monad library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rncryptor" = callPackage
@@ -173383,9 +170932,8 @@ self: {
          base bytestring directory filepath old-time process
        ];
        homepage = "http://roguestar.downstairspeople.org/";
-       description = "Sci-fi roguelike game. Client application";
+       description = "Sci-fi roguelike game. Client application.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roguestar-engine" = callPackage
@@ -173406,9 +170954,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://roguestar.downstairspeople.org/";
-       description = "Sci-fi roguelike game. Backend";
+       description = "Sci-fi roguelike game. Backend.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roguestar-gl" = callPackage
@@ -173426,9 +170973,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://roguestar.downstairspeople.org/";
-       description = "Sci-fi roguelike game. Client library";
+       description = "Sci-fi roguelike game. Client library.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roguestar-glut" = callPackage
@@ -173442,9 +170988,8 @@ self: {
        executableHaskellDepends = [ base GLUT roguestar-gl rsagl ];
        jailbreak = true;
        homepage = "http://roguestar.downstairspeople.org/";
-       description = "Sci-fi roguelike game. GLUT front-end";
+       description = "Sci-fi roguelike game. GLUT front-end.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rollbar" = callPackage
@@ -173554,7 +171099,6 @@ self: {
        homepage = "http://github.com/ekmett/rope";
        description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rosa" = callPackage
@@ -173573,7 +171117,6 @@ self: {
        ];
        description = "Query the namecoin blockchain";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rose-trees" = callPackage
@@ -173610,7 +171153,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/RaminHAL9001/rose-trie";
-       description = "Provides \"Data.Tree.RoseTrie\": trees with polymorphic paths to nodes, combining properties of Rose Tree data structures and Trie data structures";
+       description = "Provides \"Data.Tree.RoseTrie\": trees with polymorphic paths to nodes, combining properties of Rose Tree data structures and Trie data structures.";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -173656,7 +171199,6 @@ self: {
        homepage = "http://github.com/acowley/roshask";
        description = "Haskell support for the ROS robotics framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rosso" = callPackage
@@ -173668,7 +171210,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "General purpose utility library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rot13" = callPackage
@@ -173685,21 +171226,18 @@ self: {
      }) {};
 
   "rotating-log" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, old-locale
-     , time
-     }:
+    ({ mkDerivation, base, bytestring, directory, filepath, time }:
      mkDerivation {
        pname = "rotating-log";
-       version = "0.2";
-       sha256 = "b320f7cbf926526476c02f61050095d36706f94c4405e3653597dbf1db770dbf";
+       version = "0.4";
+       sha256 = "661a22b9f5b05d7dd8989f61f1d625862d57b18aa19fba7077746f05be77b451";
        libraryHaskellDepends = [
-         base bytestring directory filepath old-locale time
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath old-locale time
+         base bytestring directory filepath time
        ];
+       testHaskellDepends = [ base bytestring directory filepath time ];
+       homepage = "http://github.com/Soostone/rotating-log";
+       description = "Size-limited, concurrent, automatically-rotating log writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rounding" = callPackage
@@ -173713,7 +171251,6 @@ self: {
        homepage = "http://patch-tag.com/r/ekmett/rounding";
        description = "Explicit floating point rounding mode wrappers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip" = callPackage
@@ -173729,7 +171266,6 @@ self: {
        ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-aeson" = callPackage
@@ -173752,7 +171288,6 @@ self: {
        homepage = "https://github.com/anchor/roundtrip-aeson";
        description = "Un-/parse JSON with roundtrip invertible syntax definitions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-string" = callPackage
@@ -173764,7 +171299,6 @@ self: {
        libraryHaskellDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-xml" = callPackage
@@ -173786,7 +171320,6 @@ self: {
        ];
        description = "Bidirectional (de-)serialization for XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "route-generator" = callPackage
@@ -173803,7 +171336,6 @@ self: {
        homepage = "http://github.com/singpolyma/route-generator";
        description = "Utility to generate routes for use with yesod-routes";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "route-planning" = callPackage
@@ -173823,7 +171355,6 @@ self: {
        homepage = "https://github.com/tonymorris/route";
        description = "A library and utilities for creating a route";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rowrecord" = callPackage
@@ -173835,7 +171366,6 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Build records from lists of strings, as from CSV files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rpc" = callPackage
@@ -173852,7 +171382,6 @@ self: {
        ];
        description = "type safe rpcs provided as basic IO actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rpc-framework" = callPackage
@@ -173873,7 +171402,6 @@ self: {
        homepage = "http://github.com/mmirman/rpc-framework";
        description = "a remote procedure call framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rpf" = callPackage
@@ -173906,7 +171434,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rsagl" = callPackage
@@ -173928,7 +171455,6 @@ self: {
        homepage = "http://roguestar.downstairspeople.org/";
        description = "The RogueStar Animation and Graphics Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rsagl-frp" = callPackage
@@ -173946,7 +171472,6 @@ self: {
        homepage = "http://roguestar.downstairspeople.org/";
        description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rsagl-math" = callPackage
@@ -173965,7 +171490,6 @@ self: {
        homepage = "http://roguestar.downstairspeople.org/";
        description = "The RogueStar Animation and Graphics Library: Mathematics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rspp" = callPackage
@@ -173993,7 +171517,7 @@ self: {
          base HaXml network network-uri old-locale time
        ];
        homepage = "https://github.com/basvandijk/rss";
-       description = "A library for generating RSS 2.0 feeds";
+       description = "A library for generating RSS 2.0 feeds.";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
@@ -174019,7 +171543,6 @@ self: {
        homepage = "http://hackage.haskell.org/package/rss2irc";
        description = "watches an RSS/Atom feed and writes it to an IRC channel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rtcm" = callPackage
@@ -174038,7 +171561,6 @@ self: {
        homepage = "http://github.com/swift-nav/librtcm";
        description = "RTCM Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rtld" = callPackage
@@ -174065,7 +171587,6 @@ self: {
        homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rtl-sdr;};
 
   "rtorrent-rpc" = callPackage
@@ -174084,7 +171605,6 @@ self: {
        homepage = "https://github.com/megantti/rtorrent-rpc";
        description = "A library for communicating with RTorrent over its XML-RPC interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rtorrent-state" = callPackage
@@ -174123,7 +171643,6 @@ self: {
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rubberband;};
 
   "ruby-marshal" = callPackage
@@ -174142,7 +171661,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/filib/ruby-marshal";
-       description = "Parse a subset of Ruby objects serialised with Marshal.dump";
+       description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -174174,7 +171693,6 @@ self: {
        homepage = "https://gitorious.org/ruff";
        description = "relatively useful fractal functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ruler" = callPackage
@@ -174211,7 +171729,6 @@ self: {
        ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rungekutta" = callPackage
@@ -174223,7 +171740,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of explicit Runge-Kutta methods of various orders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "runghc" = callPackage
@@ -174407,7 +171923,6 @@ self: {
        homepage = "https://github.com/reinerp/safe-freeze";
        description = "Support for safely freezing multiple arrays in the ST monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-globals" = callPackage
@@ -174419,7 +171934,6 @@ self: {
        libraryHaskellDepends = [ base stm template-haskell ];
        description = "Safe top-level mutable variables which scope like ordinary values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-lazy-io" = callPackage
@@ -174434,7 +171948,6 @@ self: {
        ];
        description = "A library providing safe lazy IO features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-length" = callPackage
@@ -174467,7 +171980,6 @@ self: {
        ];
        description = "A small wrapper over hs-plugins to allow loading safe plugins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-printf" = callPackage
@@ -174653,7 +172165,6 @@ self: {
        homepage = "https://github.com/basvandijk/safer-file-handles/";
        description = "Type-safe file handling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safer-file-handles-bytestring" = callPackage
@@ -174672,7 +172183,6 @@ self: {
        homepage = "https://github.com/basvandijk/safer-file-handles-bytestring/";
        description = "Extends safer-file-handles with ByteString operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safer-file-handles-text" = callPackage
@@ -174690,7 +172200,6 @@ self: {
        homepage = "https://github.com/basvandijk/safer-file-handles-text/";
        description = "Extends safer-file-handles with Text operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "saferoute" = callPackage
@@ -174720,7 +172229,6 @@ self: {
        homepage = "http://fremissant.net/shape-syb";
        description = "Obtain homogeneous values from arbitrary values, transforming or culling data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "saltine" = callPackage
@@ -174760,7 +172268,6 @@ self: {
        homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libsodium;};
 
   "salvia" = callPackage
@@ -174782,7 +172289,6 @@ self: {
        jailbreak = true;
        description = "Modular web application framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salvia-demo" = callPackage
@@ -174805,7 +172311,6 @@ self: {
        jailbreak = true;
        description = "Demo Salvia servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salvia-extras" = callPackage
@@ -174827,7 +172332,6 @@ self: {
        jailbreak = true;
        description = "Collection of non-fundamental handlers for the Salvia web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salvia-protocol" = callPackage
@@ -174845,7 +172349,6 @@ self: {
        jailbreak = true;
        description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salvia-sessions" = callPackage
@@ -174864,7 +172367,6 @@ self: {
        jailbreak = true;
        description = "Session support for the Salvia webserver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salvia-websocket" = callPackage
@@ -174882,7 +172384,6 @@ self: {
        jailbreak = true;
        description = "Websocket implementation for the Salvia Webserver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sample-frame" = callPackage
@@ -174915,8 +172416,8 @@ self: {
     ({ mkDerivation, base, foldl, mwc-random, primitive, vector }:
      mkDerivation {
        pname = "sampling";
-       version = "0.1.1";
-       sha256 = "a1282010e483959c81cf9c018aac5560f2429cc9826e0e79452bc19ea484f19d";
+       version = "0.2.0";
+       sha256 = "0300849bb9b276455397df71fcf061e1db8563045af176f04a2ad31dd333295a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base foldl mwc-random primitive vector ];
@@ -175004,7 +172505,6 @@ self: {
        ];
        description = "Iteratee interface to SamTools library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sandi_0_3_5" = callPackage
@@ -175085,7 +172585,6 @@ self: {
        homepage = "https://github.com/tokiwoousaka/Sarasvati";
        description = "audio library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sasl" = callPackage
@@ -175103,7 +172602,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/sasl/wiki";
        description = "SASL implementation using simple-pipe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sat" = callPackage
@@ -175118,7 +172616,6 @@ self: {
        homepage = "http://tcana.info/sat.html";
        description = "CNF SATisfier";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sat-micro-hs" = callPackage
@@ -175136,7 +172633,6 @@ self: {
        ];
        description = "A minimal SAT solver";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo" = callPackage
@@ -175156,7 +172652,6 @@ self: {
        homepage = "https://github.com/jwaldmann/satchmo";
        description = "SAT encoding monad";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "satchmo-backends" = callPackage
@@ -175173,7 +172668,6 @@ self: {
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "driver for external satchmo backends";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo-examples" = callPackage
@@ -175192,7 +172686,6 @@ self: {
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "examples that show how to use satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo-funsat" = callPackage
@@ -175209,7 +172702,6 @@ self: {
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "funsat driver as backend for satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo-minisat" = callPackage
@@ -175222,7 +172714,6 @@ self: {
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "minisat driver as backend for satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo-toysat" = callPackage
@@ -175240,7 +172731,6 @@ self: {
        homepage = "https://github.com/msakai/satchmo-toysat";
        description = "toysat driver as backend for satchmo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sbp" = callPackage
@@ -175273,7 +172763,6 @@ self: {
        homepage = "https://github.com/swift-nav/libsbp";
        description = "SwiftNav's SBP Library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbv_4_2" = callPackage
@@ -175400,7 +172889,6 @@ self: {
        homepage = "http://github.com/LeventErkok/sbvPlugin";
        description = "Formally prove properties of Haskell programs using SBV/SMT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sc3-rdu" = callPackage
@@ -175446,7 +172934,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/scaleimage";
        description = "Scale an image to a new geometry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scalp-webhooks" = callPackage
@@ -175473,7 +172960,6 @@ self: {
        ];
        description = "Test webhooks locally";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scalpel_0_2_1" = callPackage
@@ -175554,7 +173040,6 @@ self: {
        testHaskellDepends = [ array base HUnit ];
        description = "An implementation of the Scan Vector Machine instruction set in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scat" = callPackage
@@ -175612,7 +173097,6 @@ self: {
        homepage = "http://trac.haskell.org/SCC/";
        description = "Streaming component combinators";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scenegraph" = callPackage
@@ -175631,7 +173115,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/SceneGraph";
        description = "Scene Graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scgi" = callPackage
@@ -175665,7 +173148,6 @@ self: {
        jailbreak = true;
        description = "Marge schedules and show EVR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "schedule-planner" = callPackage
@@ -175741,7 +173223,6 @@ self: {
        homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scholdoc-citeproc" = callPackage
@@ -175777,7 +173258,6 @@ self: {
        homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Scholdoc fork of pandoc-citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scholdoc-texmath" = callPackage
@@ -175869,7 +173349,6 @@ self: {
        jailbreak = true;
        description = "Mathematical/physical/chemical constants";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scientific_0_3_3_3" = callPackage
@@ -176069,7 +173548,6 @@ self: {
        homepage = "http://github.com/nominolo/scion";
        description = "Haskell IDE library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scion-browser" = callPackage
@@ -176106,7 +173584,6 @@ self: {
        homepage = "http://github.com/JPMoresmau/scion-class-browser";
        description = "Command-line interface for browsing and searching packages documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scons2dot" = callPackage
@@ -176138,7 +173615,6 @@ self: {
        ];
        description = "An interactive renderer for plotting time-series data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scope-cairo" = callPackage
@@ -176161,7 +173637,6 @@ self: {
        ];
        description = "An interactive renderer for plotting time-series data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scottish" = callPackage
@@ -176181,7 +173656,6 @@ self: {
        homepage = "https://github.com/echaozh/scottish";
        description = "scotty with batteries included";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty_0_9_0" = callPackage
@@ -176327,7 +173801,6 @@ self: {
        ];
        description = "blaze-html integration for Scotty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-cookie" = callPackage
@@ -176370,7 +173843,6 @@ self: {
        jailbreak = true;
        description = "Fay integration for Scotty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-hastache" = callPackage
@@ -176388,7 +173860,6 @@ self: {
        homepage = "https://github.com/scotty-web/scotty-hastache";
        description = "Easy Mustache templating support for Scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-params-parser" = callPackage
@@ -176450,7 +173921,6 @@ self: {
        homepage = "https://github.com/agrafix/scotty-session";
        description = "Adding session functionality to scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-tls" = callPackage
@@ -176507,7 +173977,6 @@ self: {
        jailbreak = true;
        description = "Scrabble play generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scrobble" = callPackage
@@ -176530,7 +173999,6 @@ self: {
        ];
        description = "Scrobbling server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scroll" = callPackage
@@ -176552,7 +174020,6 @@ self: {
        homepage = "https://joeyh.name/code/scroll/";
        description = "scroll(6), a roguelike game";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scrypt" = callPackage
@@ -176598,7 +174065,6 @@ self: {
        homepage = "http://github.com/wereHamster/scrz";
        description = "Process management and supervision daemon";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scyther-proof" = callPackage
@@ -176701,9 +174167,8 @@ self: {
        ];
        librarySystemDepends = [ SDL2 ];
        libraryPkgconfigDepends = [ SDL2 ];
-       description = "Both high- and low-level bindings to the SDL library (version 2.0.3)";
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.3).";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2;};
 
   "sdl2-cairo" = callPackage
@@ -176715,9 +174180,8 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ];
-       description = "Render with Cairo on SDL textures. Includes optional convenience drawing API";
+       description = "Render with Cairo on SDL textures. Includes optional convenience drawing API.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sdl2-cairo-image" = callPackage
@@ -176751,7 +174215,6 @@ self: {
        ];
        description = "image compositing with sdl2 - declarative style";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sdl2-image" = callPackage
@@ -176766,7 +174229,6 @@ self: {
        jailbreak = true;
        description = "Haskell binding to sdl2-image";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
 
   "sdl2-ttf" = callPackage
@@ -176823,7 +174285,6 @@ self: {
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seacat" = callPackage
@@ -176849,7 +174310,6 @@ self: {
        homepage = "https://github.com/Barrucadu/lambdadelta";
        description = "Small web framework using Warp and WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seal-module" = callPackage
@@ -176879,7 +174339,6 @@ self: {
        homepage = "http://github.com/ekmett/search/";
        description = "Infinite search in finite time with Hilbert's epsilon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sec" = callPackage
@@ -176908,7 +174367,6 @@ self: {
        homepage = "http://github.com/pgavin/secdh";
        description = "SECDH Machine Simulator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seclib" = callPackage
@@ -177073,7 +174531,6 @@ self: {
        homepage = "http://github.com/haskoin/secp256k1#readme";
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "secret-santa" = callPackage
@@ -177093,7 +174550,6 @@ self: {
        homepage = "https://github.com/rodrigosetti/secret-santa";
        description = "Secret Santa game assigner using QR-Codes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "secret-sharing" = callPackage
@@ -177115,7 +174571,6 @@ self: {
        homepage = "http://monoid.at/code";
        description = "Information-theoretic secure secret sharing";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "secrm" = callPackage
@@ -177130,7 +174585,6 @@ self: {
        jailbreak = true;
        description = "Example of writing \"secure\" file removal in Haskell rather than C";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "secure-sockets" = callPackage
@@ -177231,7 +174685,6 @@ self: {
        librarySystemDepends = [ sedna ];
        description = "Sedna C API XML Binding";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {sedna = null;};
 
   "select" = callPackage
@@ -177244,7 +174697,6 @@ self: {
        homepage = "http://nonempty.org/software/haskell-select";
        description = "Wrap the select(2) POSIX function";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "selectors" = callPackage
@@ -177262,7 +174714,6 @@ self: {
        homepage = "http://github.com/rcallahan/selectors";
        description = "CSS Selectors for DOM traversal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selenium" = callPackage
@@ -177274,7 +174725,6 @@ self: {
        libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ];
        description = "Test web applications through a browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selenium-server" = callPackage
@@ -177296,7 +174746,6 @@ self: {
        homepage = "https://github.com/joelteon/selenium-server.git";
        description = "Run the selenium standalone server for usage with webdriver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selfrestart" = callPackage
@@ -177322,7 +174771,6 @@ self: {
        homepage = "https://github.com/luite/selinux";
        description = "SELinux bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {selinux = null;};
 
   "semaphore-plus" = callPackage
@@ -177349,7 +174797,6 @@ self: {
        ];
        description = "Weakened partial isomorphisms, reversible computations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroupoid-extras_4_0" = callPackage
@@ -177638,7 +175085,6 @@ self: {
        homepage = "http://github.com/ppetr/semigroups-actions/";
        description = "Semigroups actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semiring" = callPackage
@@ -177661,7 +175107,6 @@ self: {
        homepage = "http://github.com/srush/SemiRings/tree/master";
        description = "Semirings, ring-like structures used for dynamic programming applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semiring-simple" = callPackage
@@ -177703,7 +175148,6 @@ self: {
        ];
        description = "An implementation of semver and semantic version ranges";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sendfile" = callPackage
@@ -177752,7 +175196,6 @@ self: {
        homepage = "https://github.com/rossdylan/sensenet";
        description = "Distributed sensor network for the raspberry pi";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sentry" = callPackage
@@ -177775,7 +175218,6 @@ self: {
        homepage = "https://github.com/noteed/sentry";
        description = "Process monitoring tool written and configured in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "senza" = callPackage
@@ -177832,7 +175274,6 @@ self: {
        homepage = "http://fremissant.net/seqaid";
        description = "Dynamic strictness control, including space leak repair";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqalign" = callPackage
@@ -177844,7 +175285,6 @@ self: {
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "seqid_0_1_0" = callPackage
@@ -177994,7 +175434,6 @@ self: {
        homepage = "http://www.ingolia-lab.org/seqloc-datafiles-tutorial.html";
        description = "Read and write BED and GTF format genome annotations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sequence" = callPackage
@@ -178024,7 +175463,6 @@ self: {
        homepage = "https://github.com/lukemaurer/sequent-core";
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sequential-index" = callPackage
@@ -178060,7 +175498,6 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/sequor";
        description = "A sequence labeler based on Collins's sequence perceptron";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serf" = callPackage
@@ -178791,7 +176228,6 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "Example programs for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-github" = callPackage
@@ -179036,7 +176472,6 @@ self: {
        homepage = "http://github.com/zalora/servant-pool";
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-postgresql" = callPackage
@@ -179054,7 +176489,6 @@ self: {
        homepage = "http://github.com/zalora/servant-postgresql";
        description = "Useful functions and instances for using servant with a PostgreSQL context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-response" = callPackage
@@ -179089,7 +176523,6 @@ self: {
        homepage = "http://github.com/zalora/servant";
        description = "Generate a web service for servant 'Resource's using scotty and JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-server_0_2_4" = callPackage
@@ -179711,7 +177144,6 @@ self: {
        jailbreak = true;
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sessions" = callPackage
@@ -179727,7 +177159,6 @@ self: {
        homepage = "http://www.wellquite.org/sessions/";
        description = "Session Types for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "set-cover" = callPackage
@@ -179746,7 +177177,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/set-cover/";
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "set-extra_1_3_2" = callPackage
@@ -179757,7 +177187,7 @@ self: {
        sha256 = "f7842446f8961a29de96fa14423d8e23978cfef3db6ec0324358536d6bf8dd53";
        libraryHaskellDepends = [ base containers mtl syb ];
        homepage = "https://github.com/ddssff/set-extra";
-       description = "Functions that could be added to Data.Set";
+       description = "Functions that could be added to Data.Set.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -179800,7 +177230,6 @@ self: {
        ];
        description = "Set of elements sorted by a different data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setdown" = callPackage
@@ -179965,7 +177394,6 @@ self: {
        homepage = "https://github.com/scvalex/sexp";
        description = "S-Expression parsing/printing made fun and easy";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sexp-grammar" = callPackage
@@ -179988,7 +177416,6 @@ self: {
        homepage = "https://github.com/esmolanka/sexp-grammar";
        description = "Invertible parsers for S-expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sexp-show" = callPackage
@@ -180022,7 +177449,6 @@ self: {
        executableHaskellDepends = [ QuickCheck random ];
        description = "S-expression printer and parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sext" = callPackage
@@ -180048,7 +177474,6 @@ self: {
        homepage = "http://patch-tag.com/r/shahn/sfml-audio";
        description = "minimal bindings to the audio module of sfml";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;};
 
   "sfmt" = callPackage
@@ -180111,7 +177536,6 @@ self: {
        homepage = "http://blog.malde.org/";
        description = "Sgrep - grep Fasta files for sequences matching a regular expression";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sha-streams" = callPackage
@@ -180150,7 +177574,6 @@ self: {
        homepage = "http://github.com/karun012/shadower";
        description = "An automated way to run doctests in files that are changing";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shadowsocks" = callPackage
@@ -180194,7 +177617,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/shady";
        description = "Functional GPU programming - DSEL & compiler";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shady-graphics" = callPackage
@@ -180213,7 +177635,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/shady";
        description = "Functional GPU programming - DSEL & compiler";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake_0_14_2" = callPackage
@@ -180458,7 +177879,6 @@ self: {
        homepage = "http://thoughtpolice.github.com/shake-extras";
        description = "Extra utilities for shake build systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake-language-c_0_6_3" = callPackage
@@ -180653,7 +178073,6 @@ self: {
        homepage = "http://github.com/bonnefoa/Shaker";
        description = "simple and interactive command-line build tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shakespeare_2_0_2_1" = callPackage
@@ -181000,7 +178419,6 @@ self: {
        homepage = "http://github.com/jberryman/shapely-data";
        description = "Generics using @(,)@ and @Either@, with algebraic operations and typed conversions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sharc-timbre" = callPackage
@@ -181011,7 +178429,7 @@ self: {
        sha256 = "cbdedf5c24664d362be1b4a285c4c0021c17126e9a9562c17f23eb174249184d";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/anton-k/sharc";
-       description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra";
+       description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -181032,7 +178450,6 @@ self: {
        jailbreak = true;
        description = "A circular buffer built on shared memory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shared-fields" = callPackage
@@ -181090,7 +178507,6 @@ self: {
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she";
        description = "A Haskell preprocessor adding miscellaneous features";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shelduck" = callPackage
@@ -181226,7 +178642,6 @@ self: {
        homepage = "http://gnu.rtin.bz/directory/devel/prog/other/shell-haskell.html";
        description = "Pipe streams through external shell commands";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shellish" = callPackage
@@ -181244,7 +178659,6 @@ self: {
        homepage = "http://repos.mornfall.net/shellish";
        description = "shell-/perl- like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shellmate" = callPackage
@@ -181660,7 +179074,6 @@ self: {
        jailbreak = true;
        description = "A simple gtk based Russian Roulette game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shpider" = callPackage
@@ -181678,7 +179091,6 @@ self: {
        homepage = "http://github.com/ozataman/shpider";
        description = "Web automation library in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shplit" = callPackage
@@ -181761,7 +179173,6 @@ self: {
        homepage = "http://mypage.iu.edu/~gdweber/software/sifflet/";
        description = "A simple, visual, functional programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sifflet-lib" = callPackage
@@ -181781,7 +179192,6 @@ self: {
        homepage = "http://mypage.iu.edu/~gdweber/software/sifflet/";
        description = "Library of modules shared by sifflet and its tests and its exporters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk_x11 = null; gtk_x11 = null;};
 
   "sign" = callPackage
@@ -181833,7 +179243,6 @@ self: {
        ];
        description = "Synchronous signal processing for DSLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "signed-multiset" = callPackage
@@ -181886,7 +179295,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/simd";
        description = "simple interface to GHC's SIMD instructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simgi" = callPackage
@@ -181906,7 +179314,6 @@ self: {
        homepage = "http://simgi.sourceforge.net/";
        description = "stochastic simulation engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple" = callPackage
@@ -181941,7 +179348,6 @@ self: {
        homepage = "http://simple.cx";
        description = "A minimalist web framework for the WAI server interface";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-actors" = callPackage
@@ -181982,7 +179388,6 @@ self: {
        librarySystemDepends = [ bluetooth ];
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {bluetooth = null;};
 
   "simple-c-value" = callPackage
@@ -182006,7 +179411,6 @@ self: {
        homepage = "https://github.com/jfischoff/simple-c-value";
        description = "A simple C value type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-conduit" = callPackage
@@ -182030,7 +179434,6 @@ self: {
        homepage = "http://github.com/jwiegley/simple-conduit";
        description = "A simple streaming I/O library based on monadic folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-config" = callPackage
@@ -182064,7 +179467,6 @@ self: {
        ];
        description = "simple binding of css and html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-eval" = callPackage
@@ -182093,7 +179495,6 @@ self: {
        homepage = "https://github.com/aleator/simple-firewire";
        description = "Simplified interface for firewire cameras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-form" = callPackage
@@ -182111,7 +179512,6 @@ self: {
        homepage = "https://github.com/singpolyma/simple-form-haskell";
        description = "Forms that configure themselves based on type";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-genetic-algorithm" = callPackage
@@ -182207,7 +179607,6 @@ self: {
        homepage = "http://github.com/mvoidex/simple-log-syslog";
        description = "Syslog backend for simple-log";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-neural-networks" = callPackage
@@ -182280,7 +179679,6 @@ self: {
        ];
        description = "Simplified Pascal language to SSVM compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-pipe" = callPackage
@@ -182316,7 +179714,6 @@ self: {
        homepage = "http://simple.cx";
        description = "Connector package for integrating postgresql-orm with the Simple web framework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-reflect" = callPackage
@@ -182432,7 +179829,6 @@ self: {
        homepage = "http://simple.cx";
        description = "Cookie-based session management for the Simple web framework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-sessions" = callPackage
@@ -182526,7 +179922,6 @@ self: {
        homepage = "http://simple.cx";
        description = "A basic template language for the Simple web framework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-vec3" = callPackage
@@ -182540,7 +179935,6 @@ self: {
        homepage = "http://github.com/dzhus/simple-vec3/";
        description = "Three-dimensional vectors of doubles with basic operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simpleargs" = callPackage
@@ -182570,7 +179964,6 @@ self: {
        homepage = "http://github.com/dom96/SimpleIRC";
        description = "Simple IRC Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simpleirc-lens" = callPackage
@@ -182583,7 +179976,6 @@ self: {
        homepage = "https://github.com/relrod/simpleirc-lens";
        description = "Lenses for simpleirc types";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simplenote" = callPackage
@@ -182600,7 +179992,6 @@ self: {
        ];
        description = "Haskell interface for the simplenote API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simpleprelude" = callPackage
@@ -182620,7 +180011,6 @@ self: {
        jailbreak = true;
        description = "A simplified Haskell prelude for teaching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simplesmtpclient" = callPackage
@@ -182647,7 +180037,6 @@ self: {
        homepage = "http://hub.darcs.net/thoferon/simplessh";
        description = "Simple wrapper around libssh2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ssh2 = null;};
 
   "simplest-sqlite" = callPackage
@@ -182716,7 +180105,6 @@ self: {
        homepage = "http://malde.org/~ketil/";
        description = "Simulate sequencing with different models for priming and errors";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simtreelo" = callPackage
@@ -182757,7 +180145,6 @@ self: {
        homepage = "http://sigkill.dk/programs/sindre";
        description = "A programming language for simple GUIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libXft;};
 
   "singleton-nats" = callPackage
@@ -182924,7 +180311,6 @@ self: {
        ];
        description = "Sirkel, a Chord DHT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sitemap" = callPackage
@@ -182954,7 +180340,6 @@ self: {
        jailbreak = true;
        description = "Sized sequence data-types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sized-types" = callPackage
@@ -183053,7 +180438,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/meteficha/skein";
-       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -183076,7 +180461,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/meteficha/skein";
-       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -183097,7 +180482,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/meteficha/skein";
-       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -183118,7 +180503,7 @@ self: {
        ];
        doCheck = false;
        homepage = "https://github.com/meteficha/skein";
-       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -183138,7 +180523,6 @@ self: {
        ];
        description = "a tool to access the OSX keychain";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skeletons" = callPackage
@@ -183194,7 +180578,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/nyorem/skemmtun";
-       description = "A MyAnimeList.net client";
+       description = "A MyAnimeList.net client.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -183214,7 +180598,6 @@ self: {
        homepage = "https://github.com/emonkak/haskell-skype";
        description = "Skype Desktop API binding for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skypelogexport" = callPackage
@@ -183254,7 +180637,6 @@ self: {
        jailbreak = true;
        description = "Haskell API for interacting with Slack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slack-api" = callPackage
@@ -183452,7 +180834,6 @@ self: {
        ];
        description = "ws convert markdown to reveal-js";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sloane" = callPackage
@@ -183505,7 +180886,6 @@ self: {
        libraryHaskellDepends = [ base mtl process ];
        description = "Testing for minimal strictness";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slug_0_1_1" = callPackage
@@ -183560,7 +180940,6 @@ self: {
        homepage = "http://community.haskell.org/~aslatter/code/bytearray";
        description = "low-level unboxed arrays, with minimal features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallcaps" = callPackage
@@ -183657,7 +181036,6 @@ self: {
        homepage = "http://github.com/noteed/smallpt-hs";
        description = "A Haskell port of the smallpt path tracer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallstring" = callPackage
@@ -183675,7 +181053,6 @@ self: {
        homepage = "http://community.haskell.org/~aslatter/code/smallstring/";
        description = "A Unicode text type, optimized for low memory overhead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smaoin" = callPackage
@@ -183706,7 +181083,6 @@ self: {
        homepage = "http://patch-tag.com/r/salazar/smartGroup";
        description = "group strings or bytestrings by words in common";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smartcheck" = callPackage
@@ -183756,7 +181132,6 @@ self: {
        homepage = "http://kyagrd.dyndns.org/~kyagrd/project/smartword/";
        description = "Web based flash card for Word Smart I and II vocabularies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sme" = callPackage
@@ -183768,7 +181143,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for Secure Multi-Execution in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smoothie_0_1_3" = callPackage
@@ -183865,7 +181239,6 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "Parsing and printing SMT-LIB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smtLib" = callPackage
@@ -183935,7 +181308,6 @@ self: {
        homepage = "https://github.com/avieth/smtp-mail-ng";
        description = "An SMTP client EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smtp2mta" = callPackage
@@ -183950,7 +181322,6 @@ self: {
        homepage = "https://github.com/singpolyma/sock2stream";
        description = "Listen for SMTP traffic and send it to an MTA script";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smtps-gmail" = callPackage
@@ -183981,7 +181352,6 @@ self: {
        libraryHaskellDepends = [ base GLUT OpenGL random ];
        description = "Snake Game Using OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap_0_13_3_2" = callPackage
@@ -184205,8 +181575,8 @@ self: {
        pname = "snap";
        version = "0.14.0.6";
        sha256 = "fa9ffc7bf5c6729f7e204daecd50765a220a0ffc2feaf3f6b29977370d8db617";
-       revision = "3";
-       editedCabalFile = "a1c4d4668cc563516ac38acfe5b869eeff5cf98042d960593ab08e1ded09fe1d";
+       revision = "4";
+       editedCabalFile = "52c349a0739869a38a84ebe6822552cca4a8edb90bb9fb3b4848c19bd8b608f9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184237,7 +181607,6 @@ self: {
        homepage = "http://github.com/zimothy/snap-accept";
        description = "Accept header branching for the Snap web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-app" = callPackage
@@ -184526,7 +181895,6 @@ self: {
        ];
        description = "A collection of useful helpers and utilities for Snap web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-language" = callPackage
@@ -184599,7 +181967,6 @@ self: {
        ];
        description = "Declarative routing for Snap";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-server_0_9_4_5" = callPackage
@@ -184729,7 +182096,6 @@ self: {
        homepage = "https://github.com/dbp/snap-testing";
        description = "A library for BDD-style testing with the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-utils" = callPackage
@@ -184748,7 +182114,6 @@ self: {
        homepage = "https://github.com/LukeHoersten/snap-utils";
        description = "Snap Framework utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-web-routes" = callPackage
@@ -184805,7 +182170,6 @@ self: {
        homepage = "https://github.com/soostone/snaplet-actionlog";
        description = "Generic action log snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-amqp" = callPackage
@@ -184880,7 +182244,6 @@ self: {
        homepage = "https://github.com/zmthy/snaplet-css-min";
        description = "A Snaplet for CSS minification";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-environments" = callPackage
@@ -184898,7 +182261,6 @@ self: {
        jailbreak = true;
        description = "DEPRECATED! You should use standard Snap >= 0.9 \"environments\" functionality. It provided ability to easly read configuration based on given app environment given at command line, envs are defined in app configuration file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-fay_0_3_3_8" = callPackage
@@ -185055,7 +182417,6 @@ self: {
        homepage = "https://github.com/mikeplus64/snaplet-hasql";
        description = "A Hasql snaplet";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-haxl" = callPackage
@@ -185073,7 +182434,6 @@ self: {
        homepage = "https://github.com/ChristopherBiscardi/snaplet-haxl";
        description = "Snaplet for Facebook's Haxl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-hdbc" = callPackage
@@ -185096,7 +182456,6 @@ self: {
        homepage = "http://norm2782.com/";
        description = "HDBC snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-hslogger" = callPackage
@@ -185138,7 +182497,6 @@ self: {
        homepage = "https://github.com/HaskellCNOrg/snaplet-i18n";
        description = "snaplet-i18n";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-influxdb" = callPackage
@@ -185158,7 +182516,6 @@ self: {
        homepage = "https://github.com/ixmatus/snaplet-influxdb";
        description = "Snap framework snaplet for the InfluxDB library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-lss" = callPackage
@@ -185214,7 +182571,6 @@ self: {
        jailbreak = true;
        description = "Snap Framework MongoDB support as Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-mongodb-minimalistic" = callPackage
@@ -185231,7 +182587,6 @@ self: {
        homepage = "https://github.com/Palmik/snaplet-mongodb-minimalistic";
        description = "Minimalistic MongoDB Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-mysql-simple" = callPackage
@@ -185253,7 +182608,6 @@ self: {
        homepage = "https://github.com/ibotty/snaplet-mysql-simple";
        description = "mysql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-oauth" = callPackage
@@ -185281,7 +182635,6 @@ self: {
        homepage = "https://github.com/HaskellCNOrg/snaplet-oauth";
        description = "snaplet-oauth";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-persistent" = callPackage
@@ -185416,7 +182769,6 @@ self: {
        homepage = "https://github.com/dzhus/snaplet-redson/";
        description = "CRUD for JSON data with Redis storage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-rest" = callPackage
@@ -185436,7 +182788,6 @@ self: {
        homepage = "http://github.com/zimothy/snaplet-rest";
        description = "REST resources for the Snap web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-riak" = callPackage
@@ -185488,9 +182839,8 @@ self: {
          sednaDBXML snap
        ];
        jailbreak = true;
-       description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc";
+       description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-ses-html" = callPackage
@@ -185536,7 +182886,6 @@ self: {
        homepage = "https://github.com/nurpax/snaplet-sqlite-simple";
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-stripe" = callPackage
@@ -185573,7 +182922,6 @@ self: {
        jailbreak = true;
        description = "Snaplet for Snap Framework enabling developers to administrative tasks akin to Rake tasks from Ruby On Rails framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-typed-sessions" = callPackage
@@ -185592,7 +182940,6 @@ self: {
        jailbreak = true;
        description = "Typed session snaplets and continuation-based programming for the Snap web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-wordpress" = callPackage
@@ -185620,7 +182967,6 @@ self: {
        homepage = "https://github.com/dbp/snaplet-wordpress";
        description = "A snaplet that communicates with wordpress over its api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snappy" = callPackage
@@ -185640,7 +182986,6 @@ self: {
        homepage = "http://github.com/bos/snappy";
        description = "Bindings to the Google Snappy library for fast compression/decompression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) snappy;};
 
   "snappy-conduit" = callPackage
@@ -185654,7 +182999,6 @@ self: {
        homepage = "http://github.com/tatac1/snappy-conduit/";
        description = "Conduit bindings for Snappy (see snappy package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "snappy-framing" = callPackage
@@ -185667,7 +183011,6 @@ self: {
        homepage = "https://github.com/kim/snappy-framing";
        description = "Snappy Framing Format in Haskell";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "snappy-iteratee" = callPackage
@@ -185681,7 +183024,6 @@ self: {
        homepage = "http://github.com/iand675/snappy-iteratee";
        description = "An enumeratee that uses Google's snappy compression library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sndfile-enumerators" = callPackage
@@ -185702,7 +183044,6 @@ self: {
        homepage = "http://www.tiresiaspress.us/haskell/sndfile-enumerators";
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sneakyterm" = callPackage
@@ -185767,7 +183108,6 @@ self: {
        homepage = "http://github.com/elginer/snm";
        description = "The Simple Nice-Looking Manual Generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snmp_0_2_0_0" = callPackage
@@ -185819,7 +183159,6 @@ self: {
        homepage = "http://github.com/nfjinjing/snow-white";
        description = "encode any binary instance to white space";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snowball" = callPackage
@@ -185848,7 +183187,7 @@ self: {
        version = "0.1.1.1";
        sha256 = "f156ca321ae17033fe1cbe7e676fea403136198e1c3a132924a080cd3145cddd";
        libraryHaskellDepends = [ base time ];
-       description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers";
+       description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -185869,7 +183208,6 @@ self: {
        homepage = "http://code.mathr.co.uk/snowglobe";
        description = "randomized fractal snowflakes demo";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap_0_2_2_5" = callPackage
@@ -185972,7 +183310,6 @@ self: {
        homepage = "https://github.com/singpolyma/sock2stream";
        description = "Tunnel a socket over a single datastream (stdin/stdout)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sockaddr" = callPackage
@@ -186073,7 +183410,6 @@ self: {
        homepage = "https://github.com/lpeterse/haskell-socket-sctp";
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {sctp = null;};
 
   "socketio" = callPackage
@@ -186103,7 +183439,6 @@ self: {
        jailbreak = true;
        description = "Socket.IO server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socketson" = callPackage
@@ -186200,7 +183535,6 @@ self: {
        homepage = "http://darcs.k-hornz.de/cgi-bin/darcsweb.cgi?r=sonic-visualiser;a=summary";
        description = "Sonic Visualiser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sophia" = callPackage
@@ -186246,7 +183580,6 @@ self: {
        jailbreak = true;
        description = "Efficient, type-safe sorted sequences";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sorted-list" = callPackage
@@ -186308,7 +183641,6 @@ self: {
        jailbreak = true;
        description = "Approximate a song from other pieces of sound";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sounddelay" = callPackage
@@ -186346,7 +183678,6 @@ self: {
        homepage = "http://github.com/nfjinjing/source-code-server";
        description = "The server backend for the source code iPhone app";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sourcemap_0_1_3_0" = callPackage
@@ -186408,7 +183739,6 @@ self: {
        homepage = "https://github.com/msiegenthaler/SouSiT";
        description = "Source/Sink/Transform: An alternative to lazy IO and iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sox" = callPackage
@@ -186448,7 +183778,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Sox";
        description = "Write, read, convert audio signals using libsox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) sox;};
 
   "soyuz" = callPackage
@@ -186468,7 +183797,6 @@ self: {
        homepage = "https://github.com/amtal/0x10c";
        description = "DCPU-16 architecture utilities for Notch's 0x10c game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spacefill" = callPackage
@@ -186493,7 +183821,7 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        jailbreak = true;
        homepage = "http://code.haskell.org/data-spacepart";
-       description = "Space partition data structures. Currently only a QuadTree";
+       description = "Space partition data structures. Currently only a QuadTree.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -186532,7 +183860,6 @@ self: {
        homepage = "https://github.com/vtan/spanout";
        description = "A breakout clone written in netwire and gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparse" = callPackage
@@ -186560,7 +183887,6 @@ self: {
        homepage = "http://github.com/ekmett/sparse";
        description = "A playground of sparse linear algebra primitives using Morton ordering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparse-lin-alg" = callPackage
@@ -186591,7 +183917,6 @@ self: {
        homepage = "http://kyagrd.dyndns.org/wiki/SparseBitmapsForPatternMatchCoverage";
        description = "Sparse bitmaps for pattern match coverage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparsecheck" = callPackage
@@ -186604,7 +183929,6 @@ self: {
        homepage = "http://www.cs.york.ac.uk/~mfn/sparsecheck/";
        description = "A Logic Programming Library for Test-Data Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparser" = callPackage
@@ -186632,7 +183956,6 @@ self: {
        homepage = "http://github.com/nfjinjing/spata";
        description = "brainless form validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spatial-math" = callPackage
@@ -186718,7 +184041,6 @@ self: {
        jailbreak = true;
        description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "special-keys" = callPackage
@@ -186763,7 +184085,6 @@ self: {
        homepage = "https://github.com/jfischoff/specialize-th";
        description = "Create specialized types from polymorphic ones using TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "species" = callPackage
@@ -186830,7 +184151,7 @@ self: {
        libraryHaskellDepends = [ speculation ];
        doHaddock = false;
        homepage = "http://github.com/ekmett/speculation/";
-       description = "Merged into 'speculation'. Use that instead";
+       description = "Merged into 'speculation'. Use that instead.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -186887,7 +184208,6 @@ self: {
        jailbreak = true;
        description = "Orbotix Sphero client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sphinx" = callPackage
@@ -186918,7 +184238,6 @@ self: {
        executableHaskellDepends = [ base sphinx ];
        description = "Sphinx CLI and demo of Haskell Sphinx library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spice" = callPackage
@@ -186937,7 +184256,6 @@ self: {
        homepage = "http://github.com/crockeo/spice";
        description = "An FRP-based game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "spike" = callPackage
@@ -186960,7 +184278,6 @@ self: {
        homepage = "http://github.com/Tener/spike";
        description = "Experimental web browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) libsoup;};
 
   "spine" = callPackage
@@ -187014,7 +184331,6 @@ self: {
        homepage = "http://github.com/JohnLato/splaytree";
        description = "Provides an annotated splay tree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "splice" = callPackage
@@ -187052,7 +184368,6 @@ self: {
        homepage = "http://michael.orlitzky.com/code/spline3.php";
        description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "splines" = callPackage
@@ -187072,7 +184387,6 @@ self: {
        ];
        description = "B-Splines, other splines, and NURBS";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "split_0_1_4_3" = callPackage
@@ -187123,7 +184437,7 @@ self: {
        version = "0.2.0.1";
        sha256 = "53ed4e9f68972b1d6db98b040b10e512a194d45c7734802adcaef9e2827c5a70";
        libraryHaskellDepends = [ base ];
-       description = "Control.Concurrent.Chan split into sending and receiving halves";
+       description = "Control.Concurrent.Chan split into sending and receiving halves.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -187144,7 +184458,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/split-record/";
        description = "Split a big audio file into pieces at positions of silence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "split-tchan" = callPackage
@@ -187193,7 +184506,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Splot";
        description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spool" = callPackage
@@ -187234,9 +184546,8 @@ self: {
          base directory extensible-exceptions filepath parsec
        ];
        homepage = "http://github.com/elginer/SpoonUtilities";
-       description = "Spoon's utilities. Simple testing and nice looking error reporting";
+       description = "Spoon's utilities. Simple testing and nice looking error reporting.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spoty" = callPackage
@@ -187255,7 +184566,6 @@ self: {
        homepage = "https://github.com/davnils/spoty";
        description = "Spotify web API wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spreadsheet" = callPackage
@@ -187304,7 +184614,6 @@ self: {
        homepage = "https://github.com/yanatan16/haskell-spsa";
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spy" = callPackage
@@ -187331,7 +184640,6 @@ self: {
        homepage = "https://bitbucket.org/ssaasen/spy";
        description = "A compact file system watcher for Mac OS X, Linux and Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple" = callPackage
@@ -187350,7 +184658,6 @@ self: {
        homepage = "https://github.com/philopon/sql-simple";
        description = "common middle-level sql client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple-mysql" = callPackage
@@ -187368,7 +184675,6 @@ self: {
        homepage = "https://github.com/philopon/sql-simple";
        description = "mysql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple-pool" = callPackage
@@ -187387,7 +184693,6 @@ self: {
        homepage = "https://github.com/philopon/sql-simple";
        description = "conection pool for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple-postgresql" = callPackage
@@ -187405,7 +184710,6 @@ self: {
        homepage = "https://github.com/philopon/sql-simple";
        description = "postgresql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple-sqlite" = callPackage
@@ -187419,7 +184723,6 @@ self: {
        homepage = "https://github.com/philopon/sql-simple";
        description = "sqlite backend for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-words" = callPackage
@@ -187512,7 +184815,6 @@ self: {
        homepage = "https://github.com/tolysz/sqlite-simple-typed";
        description = "Typed extension to sqlite simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlvalue-list" = callPackage
@@ -187546,7 +184848,6 @@ self: {
        homepage = "http://functionalley.eu/Squeeze/squeeze.html";
        description = "A file-packing application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sr-extra" = callPackage
@@ -187585,7 +184886,6 @@ self: {
        ];
        description = "Build and install Debian packages completely from source";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "srcloc_0_4_1" = callPackage
@@ -187671,7 +184971,6 @@ self: {
        homepage = "http://hub.darcs.net/ganesh/ssh";
        description = "A pure-Haskell SSH server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sshd-lint" = callPackage
@@ -187742,7 +185041,6 @@ self: {
        homepage = "http://github.com/erudify/sssp/";
        description = "HTTP proxy for S3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sstable" = callPackage
@@ -187761,7 +185059,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "SSTables in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ssv" = callPackage
@@ -187851,7 +185148,6 @@ self: {
        homepage = "https://github.com/tsuraan/stable-tree";
        description = "Trees whose branches are resistant to change";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack_0_1_3_0" = callPackage
@@ -188644,7 +185940,6 @@ self: {
        homepage = "http://github.com/rubik/stack-hpc-coveralls";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-prism" = callPackage
@@ -188663,7 +185958,6 @@ self: {
        homepage = "https://github.com/MedeaMelana/stack-prism";
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-run" = callPackage
@@ -188711,7 +186005,6 @@ self: {
        homepage = "http://github.com/yamadapc/stack-run-auto#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage_0_3_1" = callPackage
@@ -189150,7 +186443,6 @@ self: {
        homepage = "https://github.com/fpco/stackage";
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage-install_0_1_0_3" = callPackage
@@ -189527,7 +186819,6 @@ self: {
        homepage = "http://github.com/anttisalonen/starrover2";
        description = "Space simulation game";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stash" = callPackage
@@ -189617,7 +186908,6 @@ self: {
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stateref" = callPackage
@@ -189701,7 +186991,6 @@ self: {
        homepage = "http://github.com/brendanhay/statgrab";
        description = "Collect system level metrics and statistics";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {statgrab = null;};
 
   "static-canvas" = callPackage
@@ -189744,7 +187033,7 @@ self: {
          base directory hslogger HUnit MissingH mtl old-time syb
          test-framework test-framework-hunit test-framework-quickcheck2 time
        ];
-       description = "JavaScript and Css files concat for http optimization. Now with LESS support";
+       description = "JavaScript and Css files concat for http optimization. Now with LESS support.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -189824,7 +187113,6 @@ self: {
        ];
        description = "Functions for working with Dirichlet densities and mixtures on vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statistics-fusion" = callPackage
@@ -189837,7 +187125,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/statistics-fusion";
        description = "An implementation of high performance, minimal statistics functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statistics-hypergeometric-genvar" = callPackage
@@ -189972,7 +187259,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A wrapper around Sean Barrett's TrueType rasterizer library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stdata" = callPackage
@@ -190068,7 +187354,6 @@ self: {
        homepage = "https://github.com/jonpetterbergman/step-function";
        description = "Step functions, staircase functions or piecewise constant functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stepwise" = callPackage
@@ -190080,7 +187365,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stickyKeysHotKey" = callPackage
@@ -190203,7 +187487,6 @@ self: {
        homepage = "http://github.com/kholdstare/stm-chunked-queues/";
        description = "Chunked Communication Queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-conduit_2_5_2" = callPackage
@@ -190660,7 +187943,6 @@ self: {
        homepage = "http://sulzmann.blogspot.com/2008/12/stm-with-control-communication-for.html";
        description = "Control communication among retrying transactions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stomp-conduit" = callPackage
@@ -190741,7 +188023,6 @@ self: {
        homepage = "https://github.com/debug-ito/stopwatch";
        description = "A simple stopwatch utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "storable" = callPackage
@@ -190818,7 +188099,6 @@ self: {
        jailbreak = true;
        description = "Statically-sized array wrappers with Storable instances for FFI marshaling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "storable-tuple" = callPackage
@@ -190853,7 +188133,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Fast, packed, strict storable arrays with a list interface like ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "storablevector-carray" = callPackage
@@ -190866,7 +188145,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Conversion between storablevector and carray";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "storablevector-streamfusion" = callPackage
@@ -190889,7 +188167,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Conversion between storablevector and stream-fusion lists with fusion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "str" = callPackage
@@ -190928,7 +188205,6 @@ self: {
        ];
        description = "Client for Stratum protocol";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stream-fusion" = callPackage
@@ -190941,7 +188217,6 @@ self: {
        homepage = "http://hackage.haskell.org/trac/ghc/ticket/915";
        description = "Faster Haskell lists using stream fusion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stream-monad" = callPackage
@@ -190977,7 +188252,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Programmatically edit MIDI event streams via ALSA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming" = callPackage
@@ -191374,7 +188648,6 @@ self: {
        homepage = "https://github.com/michaelt/streaming-utils";
        description = "http, attoparsec, pipes and conduit utilities for the streaming libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "streaming-wai" = callPackage
@@ -191502,7 +188775,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/strict-concurrency";
        description = "Strict concurrency abstractions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-ghc-plugin" = callPackage
@@ -191744,7 +189016,6 @@ self: {
        homepage = "https://github.com/selectel/stringlike";
        description = "Transformations to several string-like types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stringprep" = callPackage
@@ -192000,7 +189271,6 @@ self: {
        jailbreak = true;
        description = "Structured MongoDB interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "structures" = callPackage
@@ -192029,7 +189299,6 @@ self: {
        homepage = "http://github.com/ekmett/structures";
        description = "\"Advanced\" Data Structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stunclient" = callPackage
@@ -192073,7 +189342,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "A revival of the classic game Stunts (LambdaCube tech demo)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylish-haskell_0_5_11_0" = callPackage
@@ -192354,7 +189622,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stylish-haskell" = callPackage
+  "stylish-haskell_0_5_15_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
      , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
      , test-framework, test-framework-hunit, yaml
@@ -192381,6 +189649,36 @@ self: {
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "stylish-haskell" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
+     , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
+     , test-framework, test-framework-hunit, yaml
+     }:
+     mkDerivation {
+       pname = "stylish-haskell";
+       version = "0.5.15.2";
+       sha256 = "cf391b582b00aa392a89c15e7542a43ad694661d00500356aa818fac84ebe759";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl syb yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs containers directory filepath
+         haskell-src-exts mtl strict syb yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cmdargs containers directory filepath
+         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
+         yaml
+       ];
+       homepage = "https://github.com/jaspervdj/stylish-haskell";
+       description = "Haskell code prettifier";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "stylized" = callPackage
@@ -192411,7 +189709,6 @@ self: {
        ];
        description = "Get the total, put a single element";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "subhask" = callPackage
@@ -192438,7 +189735,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/subhask";
        description = "Type safe interface for programming in subcategories of Hask";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "subleq-toolchain" = callPackage
@@ -192461,7 +189757,6 @@ self: {
        jailbreak = true;
        description = "Toolchain of subleq computer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "subnet" = callPackage
@@ -192604,7 +189899,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Abstract over the constraints on the parameters to type constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sump" = callPackage
@@ -192652,7 +189946,6 @@ self: {
        homepage = "http://www.github.com/massysett/sunlight";
        description = "Test Cabalized package against multiple dependency versions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sunroof-compiler" = callPackage
@@ -192672,7 +189965,6 @@ self: {
        homepage = "https://github.com/ku-fpg/sunroof-compiler";
        description = "Monadic Javascript Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sunroof-examples" = callPackage
@@ -192695,7 +189987,6 @@ self: {
        homepage = "https://github.com/ku-fpg/sunroof-examples";
        description = "Tests for Sunroof";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sunroof-server" = callPackage
@@ -192719,29 +190010,30 @@ self: {
        homepage = "https://github.com/ku-fpg/sunroof-server";
        description = "Monadic Javascript Compiler - Server Utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "super-user-spark" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
-     , directory, filepath, HTF, HUnit, mtl, optparse-applicative
-     , parsec, process, shelly, text, transformers, unix, zlib
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , filepath, hspec, hspec-core, HUnit, mtl, optparse-applicative
+     , parsec, process, pureMD5, QuickCheck, shelly, text, transformers
+     , unix
      }:
      mkDerivation {
        pname = "super-user-spark";
-       version = "0.2.0.3";
-       sha256 = "0fa3189dcf517a50abab5b83eee5d706ea13cbaaa780e6d14fb38679d924beb7";
-       isLibrary = false;
+       version = "0.3.0.0";
+       sha256 = "772a27569ab8d2bf00c67b2ab07581cd135ee2a5e129fbf9a46ff2e1a222269e";
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [
-         aeson aeson-pretty base binary bytestring directory filepath HTF
-         mtl optparse-applicative parsec process shelly text transformers
-         unix zlib
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring directory filepath mtl
+         optparse-applicative parsec process pureMD5 shelly text
+         transformers unix
        ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         aeson aeson-pretty base binary bytestring directory filepath HTF
-         HUnit mtl optparse-applicative parsec process shelly text
-         transformers unix zlib
+         aeson aeson-pretty base bytestring directory filepath hspec
+         hspec-core HUnit mtl optparse-applicative parsec process pureMD5
+         QuickCheck shelly text transformers unix
        ];
        jailbreak = true;
        description = "Configure your dotfile deployment with a DSL";
@@ -192788,7 +190080,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/SuperCollider";
        description = "Demonstrate how to control SuperCollider via ALSA-MIDI";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "superdoc" = callPackage
@@ -192808,7 +190099,6 @@ self: {
        homepage = "http://www.mathstat.dal.ca/~selinger/superdoc/";
        description = "Additional documentation markup and Unicode support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "supero" = callPackage
@@ -192829,7 +190119,6 @@ self: {
        homepage = "http://community.haskell.org/~ndm/supero/";
        description = "A Supercompiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "supervisor" = callPackage
@@ -192844,7 +190133,6 @@ self: {
        homepage = "http://github.com/agocorona/supervisor";
        description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "suspend" = callPackage
@@ -192982,7 +190270,6 @@ self: {
        homepage = "http://www.informatik.uni-kiel.de/~jgr/svg2q";
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svgcairo" = callPackage
@@ -193057,7 +190344,6 @@ self: {
        homepage = "http://github.com/aleator/Simple-SVM";
        description = "Medium level, simplified, bindings to libsvm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svndump" = callPackage
@@ -193077,7 +190363,6 @@ self: {
        homepage = "http://github.com/jwiegley/svndump/";
        description = "Library for reading Subversion dump files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swagger" = callPackage
@@ -193187,7 +190472,6 @@ self: {
        homepage = "http://github.com/roman-smrz/swapper/";
        description = "Transparently swapping data from in-memory structures to disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) tokyocabinet;};
 
   "swearjure" = callPackage
@@ -193209,7 +190493,6 @@ self: {
        homepage = "http://www.swearjure.com";
        description = "Clojure without alphanumerics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swf" = callPackage
@@ -193222,7 +190505,6 @@ self: {
        homepage = "http://www.n-heptane.com/nhlab";
        description = "A library for creating Shockwave Flash (SWF) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swift-lda" = callPackage
@@ -193239,7 +190521,6 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/colada";
        description = "Online sampler for Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swish" = callPackage
@@ -193288,7 +190569,6 @@ self: {
        jailbreak = true;
        description = "A simple web server for serving directories, similar to weborf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syb_0_4_2" = callPackage
@@ -193372,7 +190652,6 @@ self: {
        homepage = "http://github.com/ekmett/syb-extras/";
        description = "Higher order versions of the Scrap Your Boilerplate classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syb-with-class_0_6_1_5" = callPackage
@@ -193445,7 +190724,6 @@ self: {
        homepage = "https://github.com/lfairy/sylvia";
        description = "Lambda calculus visualization";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sym" = callPackage
@@ -193473,7 +190751,6 @@ self: {
        homepage = "http://github.com/akc/sym-plot";
        description = "Plot permutations; an addition to the sym package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "symbol" = callPackage
@@ -193499,7 +190776,6 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A fast implementation of synchronous channels with a CML-like API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sync-mht" = callPackage
@@ -193574,7 +190850,6 @@ self: {
        homepage = "https://github.com/jetho/syncthing-hs";
        description = "Haskell bindings for the Syncthing REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synt" = callPackage
@@ -193611,8 +190886,8 @@ self: {
      }:
      mkDerivation {
        pname = "syntactic";
-       version = "3.4";
-       sha256 = "93490ba1c33c4580187f6bf739ce43bae9dce3abee539deffc6d351769111a6e";
+       version = "3.5";
+       sha256 = "6bb80992cee979b5c15f57c0f92aef6fedc76e510e39ba399fbc43bbc1ef9eb9";
        libraryHaskellDepends = [
          base constraints containers data-hash deepseq mtl syb
          template-haskell tree-view
@@ -193624,7 +190899,6 @@ self: {
        homepage = "https://github.com/emilaxelsson/syntactic";
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "syntactical" = callPackage
@@ -193653,7 +190927,6 @@ self: {
        ];
        description = "Reversible parsing and pretty-printing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-attoparsec" = callPackage
@@ -193669,7 +190942,6 @@ self: {
        ];
        description = "Syntax instances for Attoparsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-example" = callPackage
@@ -193688,7 +190960,6 @@ self: {
        ];
        description = "Example application using syntax, a library for abstract syntax descriptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-example-json" = callPackage
@@ -193707,7 +190978,6 @@ self: {
        ];
        description = "Example JSON parser/pretty-printer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-pretty" = callPackage
@@ -193722,7 +190992,6 @@ self: {
        ];
        description = "Syntax instance for pretty, the pretty printing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-printer" = callPackage
@@ -193740,7 +191009,6 @@ self: {
        jailbreak = true;
        description = "Text and ByteString printers for 'syntax'";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-trees" = callPackage
@@ -193756,7 +191024,6 @@ self: {
        ];
        description = "Convert between different Haskell syntax trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-trees-fork-bairyn" = callPackage
@@ -193770,9 +191037,8 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
-       description = "Convert between different Haskell syntax trees. Bairyn's fork";
+       description = "Convert between different Haskell syntax trees. Bairyn's fork.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer" = callPackage
@@ -193798,7 +191064,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-alsa" = callPackage
@@ -193823,7 +191088,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Control synthesizer effects via ALSA/MIDI";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-core" = callPackage
@@ -193851,7 +191115,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell: Low level part";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-dimensional" = callPackage
@@ -193873,7 +191136,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing with static physical dimensions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-filter" = callPackage
@@ -193891,7 +191153,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell: Filter networks";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-inference" = callPackage
@@ -193942,7 +191203,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Efficient signal processing using runtime compilation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-midi" = callPackage
@@ -193968,7 +191228,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Render audio signals from MIDI files or realtime messages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sys-auth-smbclient" = callPackage
@@ -194001,7 +191260,7 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/sys-process";
-       description = "A replacement for System.Exit and System.Process";
+       description = "A replacement for System.Exit and System.Process.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -194067,7 +191326,6 @@ self: {
        homepage = "https://github.com/d12frosted/CanonicalPath";
        description = "Abstract data type for canonical paths with some utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-command" = callPackage
@@ -194362,7 +191620,6 @@ self: {
        homepage = "https://github.com/jcristovao/system-lifted";
        description = "Lifted versions of System functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-posix-redirect" = callPackage
@@ -194399,7 +191656,6 @@ self: {
        homepage = "https://github.com/wowus/system-random-effect";
        description = "Random number generation for extensible effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-time-monotonic" = callPackage
@@ -194412,7 +191668,6 @@ self: {
        homepage = "https://github.com/joeyadams/haskell-system-time-monotonic";
        description = "Simple library for using the system's monotonic clock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "system-util" = callPackage
@@ -194524,7 +191779,6 @@ self: {
        homepage = "not available";
        description = "Transito Abierto: convenience library when using Takusen and Oracle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "table" = callPackage
@@ -194596,7 +191850,6 @@ self: {
        homepage = "http://github.com/ekmett/tables/";
        description = "In-memory storage with multiple keys using lenses and traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tablestorage" = callPackage
@@ -194617,7 +191870,6 @@ self: {
        homepage = "http://github.com/paf31/tablestorage";
        description = "Azure Table Storage REST API Wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tabloid" = callPackage
@@ -194636,7 +191888,6 @@ self: {
        ];
        description = "View the output of shell commands in a table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tabular_0_2_2_5" = callPackage
@@ -194841,7 +192092,6 @@ self: {
        jailbreak = true;
        description = "Lists tagged with a type-level natural number representing their length";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-th" = callPackage
@@ -194856,7 +192106,6 @@ self: {
        jailbreak = true;
        description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-transformer" = callPackage
@@ -195090,7 +192339,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/tagsoup-ht/";
        description = "alternative parser for the tagsoup package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagsoup-parsec" = callPackage
@@ -195103,7 +192351,6 @@ self: {
        homepage = "http://www.killersmurf.com";
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagstream-conduit" = callPackage
@@ -195157,7 +192404,6 @@ self: {
        homepage = "https://github.com/paulrzcz/takusen-oracle.git";
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {clntsh = null; sqlplus = null;};
 
   "tamarin-prover" = callPackage
@@ -195188,7 +192434,6 @@ self: {
        homepage = "http://www.infsec.ethz.ch/research/software/tamarin";
        description = "The Tamarin prover for security protocol analysis";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tamarin-prover-term" = callPackage
@@ -195209,7 +192454,6 @@ self: {
        homepage = "http://www.infsec.ethz.ch/research/software/tamarin";
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tamarin-prover-theory" = callPackage
@@ -195233,7 +192477,6 @@ self: {
        homepage = "http://www.infsec.ethz.ch/research/software/tamarin";
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tamarin-prover-utils" = callPackage
@@ -195253,7 +192496,6 @@ self: {
        homepage = "http://www.infsec.ethz.ch/research/software/tamarin";
        description = "Utility library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tamper" = callPackage
@@ -195282,7 +192524,7 @@ self: {
          base bytestring directory filepath old-time time
        ];
        jailbreak = true;
-       description = "Reading, writing and manipulating \".tar\" archive files";
+       description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -195296,7 +192538,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring directory filepath time
        ];
-       description = "Reading, writing and manipulating \".tar\" archive files";
+       description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -195319,7 +192561,7 @@ self: {
          tasty-quickcheck time
        ];
        jailbreak = true;
-       description = "Reading, writing and manipulating \".tar\" archive files";
+       description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -195343,7 +192585,7 @@ self: {
          QuickCheck tasty tasty-quickcheck time
        ];
        doCheck = false;
-       description = "Reading, writing and manipulating \".tar\" archive files";
+       description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -195364,7 +192606,7 @@ self: {
          array base bytestring bytestring-handle containers deepseq
          directory filepath QuickCheck tasty tasty-quickcheck time
        ];
-       description = "Reading, writing and manipulating \".tar\" archive files";
+       description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -195430,7 +192672,6 @@ self: {
        jailbreak = true;
        description = "A command line tool for keeping track of tasks you worked on";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "taskpool" = callPackage
@@ -195825,7 +193066,6 @@ self: {
        jailbreak = true;
        description = "automated integration of QuickCheck properties into tasty suites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-kat_0_0_1" = callPackage
@@ -196172,7 +193412,6 @@ self: {
        homepage = "http://darcs.monoid.at/tbox";
        description = "Transactional variables and data structures with IO hooks";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tcache-AWS" = callPackage
@@ -196206,7 +193445,6 @@ self: {
        homepage = "http://bitcheese.net/wiki/code/tccli";
        description = "TokyoCabinet CLI interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tce-conf" = callPackage
@@ -196243,7 +193481,6 @@ self: {
        homepage = "http://www.cl.cam.ac.uk/~pes20/Netsem/";
        description = "A purely functional TCP implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tdd-util" = callPackage
@@ -196271,7 +193508,6 @@ self: {
        ];
        description = "Test framework wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tdoc" = callPackage
@@ -196299,7 +193535,6 @@ self: {
        libraryHaskellDepends = [ base containers fgl graphviz ];
        description = "Graphical modeling tools for sequential teams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "teeth" = callPackage
@@ -196330,7 +193565,6 @@ self: {
        ];
        description = "Telegram API client";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "telegram-api" = callPackage
@@ -196350,7 +193584,6 @@ self: {
        homepage = "http://github.com/klappvisor/haskell-telegram-api#readme";
        description = "Telegram Bot API bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "teleport" = callPackage
@@ -196438,7 +193671,6 @@ self: {
        homepage = "https://github.com/haskell-pkg-janitors/template-default";
        description = "declaring Default instances just got even easier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template-haskell_2_10_0_0" = callPackage
@@ -196465,7 +193697,6 @@ self: {
        homepage = "https://github.com/HaskellZhangSong/TemplateHaskellUtils";
        description = "Some utilities for template Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template-hsml" = callPackage
@@ -196487,7 +193718,6 @@ self: {
        jailbreak = true;
        description = "Haskell's Simple Markup Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template-yj" = callPackage
@@ -196501,7 +193731,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/template/wiki";
        description = "Process template file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "templatepg" = callPackage
@@ -196556,7 +193785,6 @@ self: {
        homepage = "https://github.com/ixmatus/hs-tempodb";
        description = "A small Haskell wrapper around the TempoDB api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "temporal-csound" = callPackage
@@ -196575,7 +193803,6 @@ self: {
        homepage = "https://github.com/anton-k/temporal-csound";
        description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "temporal-media" = callPackage
@@ -196719,7 +193946,6 @@ self: {
        jailbreak = true;
        description = "Interpreter for the FRP language Tempus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tempus-fugit" = callPackage
@@ -196749,7 +193975,6 @@ self: {
        homepage = "http://noaxiom.org/tensor";
        description = "A completely type-safe library for linear algebra";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "term-rewriting" = callPackage
@@ -196769,7 +193994,6 @@ self: {
        homepage = "http://cl-informatik.uibk.ac.at/software/haskell-rewriting/";
        description = "Term Rewriting Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "termbox-bindings" = callPackage
@@ -196786,7 +194010,6 @@ self: {
        homepage = "https://github.com/luciferous/termbox-bindings";
        description = "Bindings to the Termbox library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terminal-progress-bar" = callPackage
@@ -196939,7 +194162,6 @@ self: {
        ];
        description = "a ternary library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terrahs" = callPackage
@@ -196954,7 +194176,6 @@ self: {
        homepage = "http://lucc.ess.inpe.br/doku.php?id=terrahs";
        description = "A Haskell GIS Programming Environment";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {terralib4c = null; translib = null;};
 
   "tersmu" = callPackage
@@ -197053,7 +194274,6 @@ self: {
        jailbreak = true;
        description = "Test.Framework wrapper for DocTest";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework-golden" = callPackage
@@ -197132,7 +194352,6 @@ self: {
        homepage = "http://batterseapower.github.com/test-framework/";
        description = "QuickCheck support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework-quickcheck2" = callPackage
@@ -197409,7 +194628,6 @@ self: {
        jailbreak = true;
        description = "Small test package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testing-feat" = callPackage
@@ -197455,7 +194673,6 @@ self: {
        homepage = "http://github.com/roman/testloop";
        description = "Quick feedback loop for test suites";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testpack" = callPackage
@@ -197474,7 +194691,6 @@ self: {
        homepage = "https://github.com/jgoerzen/testpack";
        description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testpattern" = callPackage
@@ -197489,7 +194705,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/testpattern";
        description = "Display a monitor test pattern";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testrunner" = callPackage
@@ -197504,7 +194719,6 @@ self: {
        ];
        description = "Easy unit test driver framework";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tetris" = callPackage
@@ -197519,7 +194733,6 @@ self: {
        homepage = "http://d.hatena.ne.jp/mokehehe/20080921/tetris";
        description = "A 2-D clone of Tetris";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tex2txt" = callPackage
@@ -197536,7 +194749,6 @@ self: {
        homepage = "http://textmining.lt/tex2txt/";
        description = "LaTeX to plain-text conversion";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texmath_0_8" = callPackage
@@ -197810,7 +195022,6 @@ self: {
        ];
        description = "Functions for running Tex from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text_1_1_1_3" = callPackage
@@ -197986,7 +195197,7 @@ self: {
          unordered-containers
        ];
        homepage = "https://github.com/andersjel/haskell-text-and-plots";
-       description = "EDSL to create HTML documents with plots based on the C3.js library";
+       description = "EDSL to create HTML documents with plots based on the C3.js library.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -198124,7 +195335,6 @@ self: {
        homepage = "http://github.com/finnsson/text-json-qq";
        description = "Json Quasiquatation for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-latin1" = callPackage
@@ -198220,7 +195430,6 @@ self: {
        homepage = "https://github.com/joelteon/text-normal.git";
        description = "Unicode-normalized text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-position" = callPackage
@@ -198320,7 +195529,6 @@ self: {
        homepage = "https://github.com/acfoltzer/text-register-machine";
        description = "A Haskell implementation of the 1# Text Register Machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-render" = callPackage
@@ -198505,7 +195713,6 @@ self: {
        homepage = "http://github.com/finnsson/Text.XML.Generic";
        description = "Serialize Data to XML (strings)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-xml-qq" = callPackage
@@ -198516,9 +195723,8 @@ self: {
        sha256 = "a56515d6c2ea2e94ef3f0ee4cdf6f387d0b5367d3879f25c982b213b888d210c";
        libraryHaskellDepends = [ base parsec template-haskell xml ];
        homepage = "http://www.github.com/finnsson/text-xml-qq";
-       description = "Quasiquoter for xml. XML DSL in Haskell";
+       description = "Quasiquoter for xml. XML DSL in Haskell.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-zipper" = callPackage
@@ -198545,7 +195751,7 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/text1";
-       description = "Non-empty values of `Data.Text`";
+       description = "Non-empty values of `Data.Text`.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -198572,7 +195778,6 @@ self: {
        homepage = "https://github.com/spockz/Haskell-Code-Completion-for-TextMate";
        description = "A simple Haskell program to provide tags for Haskell code completion in TextMate";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "textocat-api" = callPackage
@@ -198656,7 +195861,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic";
        description = "Template-Haskell code for tfp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tftp" = callPackage
@@ -198683,7 +195887,6 @@ self: {
        homepage = "http://github.com/sheyll/tftp";
        description = "A library for building tftp servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tga" = callPackage
@@ -198767,7 +195970,6 @@ self: {
        homepage = "https://github.com/seereason/th-context";
        description = "Test instance context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-desugar_1_4_2" = callPackage
@@ -199026,7 +196228,6 @@ self: {
        ];
        description = "A place to collect orphan instances for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-kinds" = callPackage
@@ -199039,7 +196240,6 @@ self: {
        jailbreak = true;
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-kinds-fork" = callPackage
@@ -199370,7 +196570,6 @@ self: {
        homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "themplate" = callPackage
@@ -199419,7 +196618,6 @@ self: {
        jailbreak = true;
        description = "A simple client for the TheoremQuest theorem proving game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "these_0_6_2_0" = callPackage
@@ -199509,7 +196707,6 @@ self: {
        homepage = "http://web.cecs.pdx.edu/~mpj/thih/";
        description = "Typing Haskell In Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thimk" = callPackage
@@ -199528,7 +196725,6 @@ self: {
        homepage = "http://wiki.cs.pdx.edu/bartforge/thimk";
        description = "Command-line spelling word suggestion tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thorn" = callPackage
@@ -199647,8 +196843,8 @@ self: {
      }:
      mkDerivation {
        pname = "threads-supervisor";
-       version = "1.0.4.1";
-       sha256 = "d58d14711cabfb9e594d5e930e09a831aeb5ef4a428b2ebf09edc24d88d46cda";
+       version = "1.1.0.0";
+       sha256 = "2297578d072548bcc59bbc81268dcc18fbe6216c8634831991db41f87836ce6e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -199661,7 +196857,6 @@ self: {
        ];
        description = "Simple, IO-based library for Erlang-style thread supervision";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threadscope" = callPackage
@@ -199877,7 +197072,6 @@ self: {
        homepage = "http://ecks.homeunix.net";
        description = "Useful if reading \"Why FP matters\" by John Hughes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tickle" = callPackage
@@ -199899,7 +197093,6 @@ self: {
        homepage = "https://github.com/NICTA/tickle";
        description = "A port of @Data.Binary@";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tictactoe3d" = callPackage
@@ -199950,7 +197143,6 @@ self: {
        homepage = "http://tidal.lurk.org/";
        description = "MIDI support for tidal";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tidal-vis" = callPackage
@@ -200005,7 +197197,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        description = "Tiger Compiler of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tight-apply" = callPackage
@@ -200052,7 +197243,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/tighttp/wiki";
        description = "Tiny and Incrementally-Growing HTTP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tilings" = callPackage
@@ -200084,7 +197274,6 @@ self: {
        homepage = "http://www.timber-lang.org";
        description = "The Timber Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time_1_6" = callPackage
@@ -200132,7 +197321,6 @@ self: {
        homepage = "http://semantic.org/TimeLib/";
        description = "Data instances for the time package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-exts" = callPackage
@@ -200159,7 +197347,6 @@ self: {
        homepage = "https://github.com/enzoh/time-exts";
        description = "Efficient Timestamps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "time-http" = callPackage
@@ -200185,7 +197372,6 @@ self: {
        homepage = "http://cielonegro.org/HTTPDateTime.html";
        description = "Parse and format HTTP/1.1 Date and Time strings";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-interval" = callPackage
@@ -200311,7 +197497,6 @@ self: {
        homepage = "https://github.com/christian-marie/time-qq";
        description = "Quasi-quoter for UTCTime times";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "time-recurrence" = callPackage
@@ -200333,7 +197518,6 @@ self: {
        homepage = "http://github.com/hellertime/time-recurrence";
        description = "Generate recurring dates";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-series" = callPackage
@@ -200348,7 +197532,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Time series analysis";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-units" = callPackage
@@ -200376,7 +197559,6 @@ self: {
        homepage = "http://cielonegro.org/W3CDateTime.html";
        description = "Parse, format and convert W3C Date and Time";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timecalc" = callPackage
@@ -200390,7 +197572,6 @@ self: {
        executableHaskellDepends = [ base haskeline uu-parsinglib ];
        homepage = "https://github.com/chriseidhof/TimeCalc";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeconsole" = callPackage
@@ -200499,7 +197680,6 @@ self: {
        homepage = "https://github.com/lambda-llama/timeout";
        description = "Generalized sleep and timeout functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeout-control" = callPackage
@@ -200544,7 +197724,6 @@ self: {
        jailbreak = true;
        description = "Attoparsec parsers for various Date/Time formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeplot" = callPackage
@@ -200566,7 +197745,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Timeplot";
        description = "A tool for visualizing time series from log files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timerep" = callPackage
@@ -200586,7 +197764,6 @@ self: {
        homepage = "https://github.com/HugoDaniel/timerep";
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers" = callPackage
@@ -200632,7 +197809,6 @@ self: {
        homepage = "https://github.com/Peaker/timestamp-subprocess-lines";
        description = "Run a command and timestamp its stdout/stderr lines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timestamper" = callPackage
@@ -200811,7 +197987,6 @@ self: {
        homepage = "http://tip-org.github.io";
        description = "Convert from Haskell to Tip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tip-lib" = callPackage
@@ -200893,7 +198068,6 @@ self: {
        homepage = "http://patch-tag.com/r/nonowarn/tkhs/snapshot/current/content/pretty/README";
        description = "Simple Presentation Utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tkyprof" = callPackage
@@ -200922,7 +198096,6 @@ self: {
        homepage = "https://github.com/maoe/tkyprof";
        description = "A web-based visualizer for GHC Profiling Reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tld" = callPackage
@@ -201253,7 +198426,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-tls";
        description = "TLS extra default values and helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tmpl" = callPackage
@@ -201314,7 +198486,6 @@ self: {
        homepage = "https://github.com/conal/to-haskell";
        description = "A type class and some utilities for generating Haskell code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "to-string-class" = callPackage
@@ -201326,7 +198497,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Converting string-like types to Strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "to-string-instances" = callPackage
@@ -201338,7 +198508,6 @@ self: {
        libraryHaskellDepends = [ to-string-class ];
        description = "Instances for the ToString class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "todos" = callPackage
@@ -201365,7 +198534,6 @@ self: {
        homepage = "http://gitorious.org/todos";
        description = "Easy-to-use TODOs manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tofromxml" = callPackage
@@ -201403,7 +198571,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/toilet/";
        description = "Manage the toilet queue at the IMO";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "token-bucket" = callPackage
@@ -201461,7 +198628,6 @@ self: {
          QuickCheck
        ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tokyocabinet-haskell" = callPackage
@@ -201475,7 +198641,6 @@ self: {
        homepage = "http://tom-lpsd.github.com/tokyocabinet-haskell/";
        description = "Haskell binding of Tokyo Cabinet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) tokyocabinet;};
 
   "tokyotyrant-haskell" = callPackage
@@ -201490,7 +198655,6 @@ self: {
        homepage = "http://www.polarmobile.com/";
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
   "tomato-rubato-openal" = callPackage
@@ -201503,7 +198667,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/tomato-rubato";
        description = "Easy to use library for audio programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "toml" = callPackage
@@ -201519,7 +198682,6 @@ self: {
        ];
        jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toolshed" = callPackage
@@ -201555,7 +198717,6 @@ self: {
        homepage = "http://home.arcor.de/chr_bauer/topkata.html";
        description = "OpenGL Arcade Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "torch" = callPackage
@@ -201568,7 +198729,6 @@ self: {
        homepage = "http://patch-tag.com/repo/torch/home";
        description = "Simple unit test library (or framework)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "torrent" = callPackage
@@ -201797,7 +198957,6 @@ self: {
        libraryHaskellDepends = [ base containers glib ];
        description = "Client library for Tracker metadata database, indexer and search tool";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tracy" = callPackage
@@ -201833,7 +198992,6 @@ self: {
        homepage = "https://github.com/mike-burns/trajectory";
        description = "Tools and a library for working with Trajectory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transactional-events" = callPackage
@@ -201845,7 +199003,6 @@ self: {
        libraryHaskellDepends = [ base ListZipper MonadPrompt stm ];
        description = "Transactional events, based on Concurrent ML semantics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transf" = callPackage
@@ -201971,7 +199128,7 @@ self: {
        jailbreak = true;
        doCheck = false;
        homepage = "http://github.com/ekmett/transformers-compat/";
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -201985,7 +199142,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/transformers-compat/";
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -201999,7 +199156,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        doHaddock = false;
        homepage = "http://github.com/ekmett/transformers-compat/";
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -202012,7 +199169,7 @@ self: {
        sha256 = "d881ef4ec164b631591b222efe7ff555af6d5397c9d86475b309ba9402a8ca9f";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        homepage = "http://github.com/ekmett/transformers-compat/";
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -202047,7 +199204,6 @@ self: {
        homepage = "https://github.com/jcristovao/transformers-convert";
        description = "Sensible conversions between some of the monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transformers-free" = callPackage
@@ -202083,7 +199239,6 @@ self: {
        homepage = "https://github.com/JanBessai/transformers-runnable";
        description = "A unified interface for the run operation of monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transformers-supply" = callPackage
@@ -202115,7 +199270,6 @@ self: {
        homepage = "http://www.fpcomplete.com/user/agocorona";
        description = "Making composable programs with multithreading, events and distributed computing";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "translatable-intset" = callPackage
@@ -202142,7 +199296,6 @@ self: {
        homepage = "http://github.com/nfjinjing/translate";
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "traverse-with-class" = callPackage
@@ -202235,7 +199388,6 @@ self: {
        homepage = "http://projects.haskell.org/traypoweroff";
        description = "Tray Icon application to PowerOff / Reboot computer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tree-fun" = callPackage
@@ -202353,7 +199505,6 @@ self: {
        ];
        description = "Library for polling Tremulous servers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trhsx" = callPackage
@@ -202364,7 +199515,6 @@ self: {
        sha256 = "631601c5345599e08535221df4415c7676e3e307bfa6a13d32e3c46d9c145d86";
        description = "Deprecated";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "triangulation" = callPackage
@@ -202381,7 +199531,6 @@ self: {
        homepage = "http://www.dinkla.net/";
        description = "triangulation of polygons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tries" = callPackage
@@ -202476,7 +199625,6 @@ self: {
        jailbreak = true;
        description = "Search for, annotate and trim poly-A tail";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tripLL" = callPackage
@@ -202617,7 +199765,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl time transformers ];
        description = "A Transaction Framework for Web Applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tsession-happstack" = callPackage
@@ -202631,7 +199778,6 @@ self: {
        ];
        description = "A Transaction Framework for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tskiplist" = callPackage
@@ -202644,7 +199790,27 @@ self: {
        homepage = "https://github.com/thaldyron/tskiplist";
        description = "A Skip List Implementation in Software Transactional Memory (STM)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tslib" = callPackage
+    ({ mkDerivation, base, containers, hspec, HUnit, hybrid-vectors
+     , lens, QuickCheck, statistics, time, vector
+     }:
+     mkDerivation {
+       pname = "tslib";
+       version = "0.1.4";
+       sha256 = "f1d52846d2f7b4897fb8447699d9f0e7f73c8671ea0079f4e89a171479d2c626";
+       revision = "4";
+       editedCabalFile = "5a53d0da4871b896d49eadfc408d258e2b9b1bbfa04bba1ce128ca587608547e";
+       libraryHaskellDepends = [
+         base containers hybrid-vectors lens statistics time vector
+       ];
+       testHaskellDepends = [
+         base containers hspec HUnit lens QuickCheck time vector
+       ];
+       jailbreak = true;
+       description = "-";
+       license = "unknown";
      }) {};
 
   "tslogger" = callPackage
@@ -202672,7 +199838,6 @@ self: {
        homepage = "https://github.com/davnils/tsp-viz";
        description = "Real time TSP tour visualization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tsparse" = callPackage
@@ -202911,7 +200076,6 @@ self: {
        jailbreak = true;
        description = "Interface to TUN/TAP drivers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tup-functor" = callPackage
@@ -202950,7 +200114,6 @@ self: {
        jailbreak = true;
        description = "Enum instances for tuples where the digits increase with the same speed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuple-generic" = callPackage
@@ -203001,7 +200164,6 @@ self: {
        libraryHaskellDepends = [ base HList template-haskell ];
        description = "Morph between tuples, or convert them from and to HLists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuple-th" = callPackage
@@ -203026,7 +200188,6 @@ self: {
        homepage = "http://github.com/diegoeche/tupleinstances";
        description = "Functor, Applicative and Monad for n-ary tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuples-homogenous-h98" = callPackage
@@ -203065,7 +200226,6 @@ self: {
        executableHaskellDepends = [ ALUT base ];
        description = "Plays music generated by Turing machines with 5 states and 2 symbols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "turkish-deasciifier" = callPackage
@@ -203242,6 +200402,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle-options_0_1_0_3" = callPackage
+    ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
+     }:
+     mkDerivation {
+       pname = "turtle-options";
+       version = "0.1.0.3";
+       sha256 = "d77e55a1a0b3ae2a5117e20780e5b98aab183ff65e9f532a03040d6b050a14d8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base optional-args parsec text turtle ];
+       executableHaskellDepends = [ base turtle ];
+       testHaskellDepends = [ base HUnit parsec ];
+       homepage = "https://github.com/elaye/turtle-options#readme";
+       description = "Collection of command line options and parsers for these options";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tweak" = callPackage
     ({ mkDerivation, base, containers, lens, stm, transformers }:
      mkDerivation {
@@ -203255,6 +200433,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "twee" = callPackage
+    ({ mkDerivation, array, base, containers, dlist, ghc-prim, heaps
+     , jukebox, pretty, primitive, reflection, split, transformers
+     }:
+     mkDerivation {
+       pname = "twee";
+       version = "0.1";
+       sha256 = "e80cd75b0fb2972e114bfb1a03e13970122647f6f1a7cb8314d6e27d2dd77e2d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers dlist ghc-prim heaps pretty primitive
+         reflection transformers
+       ];
+       executableHaskellDepends = [
+         array base containers jukebox pretty reflection split transformers
+       ];
+       homepage = "http://github.com/nick8325/twee";
+       description = "An equational theorem prover";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "twentefp" = callPackage
     ({ mkDerivation, base, gloss, parsec, time }:
      mkDerivation {
@@ -203264,7 +200464,6 @@ self: {
        libraryHaskellDepends = [ base gloss parsec time ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "twentefp-eventloop-graphics" = callPackage
@@ -203294,7 +200493,6 @@ self: {
        libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twentefp-graphs" = callPackage
@@ -203332,7 +200530,6 @@ self: {
        jailbreak = true;
        description = "RoseTree type and show functions for lab assignment of University of Twente";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twentefp-trees" = callPackage
@@ -203361,7 +200558,7 @@ self: {
          network random SHA text
        ];
        jailbreak = true;
-       description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell";
+       description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -203395,7 +200592,6 @@ self: {
        homepage = "https://github.com/suzuki-shin/twhs";
        description = "CLI twitter client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twidge" = callPackage
@@ -203418,7 +200614,6 @@ self: {
        homepage = "http://software.complete.org/twidge";
        description = "Unix Command-Line Twitter and Identica Client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twilight-stm" = callPackage
@@ -203431,7 +200626,6 @@ self: {
        homepage = "http://proglang.informatik.uni-freiburg.de/projects/twilight/";
        description = "STM library with safe irrevocable I/O and inconsistency repair";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twilio" = callPackage
@@ -203457,7 +200651,6 @@ self: {
        homepage = "https://github.com/markandrus/twilio-haskell";
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twill" = callPackage
@@ -203477,7 +200670,6 @@ self: {
        jailbreak = true;
        description = "Twilio API interaction";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twiml" = callPackage
@@ -203501,7 +200693,6 @@ self: {
        homepage = "https://github.com/markandrus/twiml-haskell";
        description = "TwiML library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twine" = callPackage
@@ -203518,7 +200709,6 @@ self: {
        homepage = "http://twine.james-sanders.com";
        description = "very simple template language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twisty" = callPackage
@@ -203535,7 +200725,6 @@ self: {
        jailbreak = true;
        description = "Simulator of twisty puzzles à la Rubik's Cube";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitch" = callPackage
@@ -203557,7 +200746,6 @@ self: {
        homepage = "https://github.com/jfischoff/twitch";
        description = "A high level file watcher DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter" = callPackage
@@ -203575,7 +200763,6 @@ self: {
        ];
        description = "A Haskell-based CLI Twitter client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-conduit" = callPackage
@@ -203610,7 +200797,6 @@ self: {
        homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -203631,7 +200817,6 @@ self: {
        homepage = "https://github.com/himura/twitter-enumerator";
        description = "Twitter API package with enumerator interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-feed_0_2_0_2" = callPackage
@@ -203741,7 +200926,6 @@ self: {
        homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -203758,7 +200942,6 @@ self: {
        homepage = "https://github.com/himura/twitter-types-lens";
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tx" = callPackage
@@ -203776,7 +200959,6 @@ self: {
        homepage = "https://github.com/mcschroeder/tx";
        description = "Persistent transactions on top of STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "txt-sushi" = callPackage
@@ -203851,7 +201033,6 @@ self: {
        homepage = "http://www.decidable.org/haskell/typalyze";
        description = "Analyzes Haskell source files for easy reference";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-aligned" = callPackage
@@ -203889,7 +201070,7 @@ self: {
          base containers lens lens-utils template-haskell
        ];
        homepage = "https://github.com/wdanilo/type-cache";
-       description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation";
+       description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -203907,7 +201088,6 @@ self: {
        ];
        description = "Type-level serialization of type constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-combinators" = callPackage
@@ -203947,7 +201127,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell type-spine ];
        description = "Arbitrary-base type-level digits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-eq_0_4_2" = callPackage
@@ -204000,7 +201179,6 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-equality-check";
        description = "Type equality check";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-fun" = callPackage
@@ -204050,7 +201228,6 @@ self: {
        homepage = "http://github.com/ekmett/type-int";
        description = "Type Level 2s- and 16s- Complement Integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-iso" = callPackage
@@ -204077,7 +201254,6 @@ self: {
        homepage = "http://code.haskell.org/type-level";
        description = "Type-level programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-level-bst" = callPackage
@@ -204090,7 +201266,6 @@ self: {
        homepage = "https://github.com/Kinokkory/type-level-bst";
        description = "type-level binary search trees in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-level-natural-number" = callPackage
@@ -204151,7 +201326,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets and finite maps (with value-level counterparts)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-level-tf" = callPackage
@@ -204244,7 +201418,6 @@ self: {
        ];
        description = "Type-level comparison operator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-ord-spine-cereal" = callPackage
@@ -204260,7 +201433,6 @@ self: {
        ];
        description = "Generic type-level comparison of types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-prelude" = callPackage
@@ -204271,9 +201443,8 @@ self: {
        sha256 = "30d24fa550e380ea4a76367d261362532c0cee703a5356497a612b204328eff9";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "http://code.atnnn.com/projects/type-prelude";
-       description = "Partial port of prelude to the type level. Requires GHC 7.6.1";
+       description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-settheory" = callPackage
@@ -204289,7 +201460,6 @@ self: {
        ];
        description = "Sets and functions-as-relations in the type system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-spine" = callPackage
@@ -204301,7 +201471,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "A spine-view on types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-structure" = callPackage
@@ -204330,7 +201499,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/type-structure";
        description = "Type structure analysis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-sub-th" = callPackage
@@ -204356,7 +201524,6 @@ self: {
        homepage = "http://github.com/jfischoff/type-sub-th";
        description = "Substitute types for other types with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-unary" = callPackage
@@ -204387,7 +201554,6 @@ self: {
        homepage = "http://github.com/bennofs/typeable-th";
        description = "Automatic deriving of TypeableN instances with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typed-spreadsheet" = callPackage
@@ -204435,7 +201601,6 @@ self: {
        homepage = "http://github.com/typed-wire/typed-wire#readme";
        description = "Language idependent type-safe communication";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typed-wire-utils" = callPackage
@@ -204469,7 +201634,6 @@ self: {
        homepage = "https://github.com/tolysz/typedquery";
        description = "Parser for SQL augmented with types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typehash" = callPackage
@@ -204482,7 +201646,6 @@ self: {
        jailbreak = true;
        description = "Create a unique hash value for a type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typelevel" = callPackage
@@ -204513,7 +201676,6 @@ self: {
        homepage = "https://github.com/nushio3/typelevel-tensor";
        description = "Tensors whose ranks and dimensions type-inferred and type-checked";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typelits-witnesses_0_1_1_0" = callPackage
@@ -204569,7 +201731,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/typeparams/";
        description = "Lens-like interface for type level parameters; allows unboxed unboxed vectors and supercompilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "types-compat" = callPackage
@@ -204582,7 +201743,7 @@ self: {
        editedCabalFile = "8fbb17ec66d4bf5f2fffdb2327647b44292253822c9623a06b489ff547a71041";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/philopon/types-compat";
-       description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy";
+       description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -204616,7 +201777,6 @@ self: {
        homepage = "http://github.com/paf31/typescript-docs";
        description = "A documentation generator for TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typical" = callPackage
@@ -204626,7 +201786,7 @@ self: {
        version = "0.0.1";
        sha256 = "98c0f7dd56285e4dde732aa0d49ea12dd1233adceae101b2a58bc1752faf8637";
        libraryHaskellDepends = [ base ];
-       description = "Type level numbers, vectors, list. This lib needs to be extended";
+       description = "Type level numbers, vectors, list. This lib needs to be extended.";
        license = "GPL";
      }) {};
 
@@ -204669,7 +201829,6 @@ self: {
        homepage = "https://github.com/nilcons/haskell-tz";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tzdata" = callPackage
@@ -204710,7 +201869,6 @@ self: {
        jailbreak = true;
        description = "A simplistic dependently-typed language with parametricity";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ua-parser" = callPackage
@@ -204720,8 +201878,8 @@ self: {
      }:
      mkDerivation {
        pname = "ua-parser";
-       version = "0.7";
-       sha256 = "586ae0c948af8a2c671331aeebe85c663a24e5d40c8a71a943ee2520b4d4aa57";
+       version = "0.7.1";
+       sha256 = "bfcfe7ea0cbeade0053dbdbbc8f4593283d17403058d754b00430edb1a0444b4";
        libraryHaskellDepends = [
          aeson base bytestring data-default file-embed pcre-light text yaml
        ];
@@ -204729,7 +201887,6 @@ self: {
          aeson base bytestring data-default derive file-embed filepath HUnit
          pcre-light tasty tasty-hunit tasty-quickcheck text yaml
        ];
-       jailbreak = true;
        description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204764,7 +201921,6 @@ self: {
        homepage = "https:/github.com/fumieval/uberlast";
        description = "Generate overloaded lenses from plain data declaration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uconv" = callPackage
@@ -204777,7 +201933,6 @@ self: {
        librarySystemDepends = [ icu ];
        description = "String encoding conversion with ICU";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) icu;};
 
   "udbus" = callPackage
@@ -204797,7 +201952,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Small DBus implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "udbus-model" = callPackage
@@ -204812,7 +201966,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Model API for udbus introspection and definitions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "udcode" = callPackage
@@ -204842,7 +201995,6 @@ self: {
        homepage = "https://github.com/pxqr/udev";
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libudev = null;};
 
   "uglymemo" = callPackage
@@ -204880,7 +202032,6 @@ self: {
        homepage = "https://github.com/UU-ComputerScience/uhc";
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uhc-util" = callPackage
@@ -204950,7 +202101,6 @@ self: {
        libraryHaskellDepends = [ base data-default mtl old-locale time ];
        description = "A framework for friendly commandline programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uid" = callPackage
@@ -205038,7 +202188,6 @@ self: {
        homepage = "http://github.com/luqui/unamb-custom";
        description = "Functional concurrency with unamb using a custom scheduler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbound" = callPackage
@@ -205180,7 +202329,6 @@ self: {
        homepage = "https://github.com/jcristovao/unbouded-delays-units";
        description = "Thread delays and timeouts using proper time units";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unboxed-containers" = callPackage
@@ -205193,7 +202341,6 @@ self: {
        homepage = "http://github.com/ekmett/unboxed-containers";
        description = "Self-optimizing unboxed sets using view patterns and data families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbreak" = callPackage
@@ -205405,7 +202552,6 @@ self: {
        homepage = "http://sloompie.reinier.de/unicode-normalization/";
        description = "Unicode normalization using the ICU library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) icu;};
 
   "unicode-prelude" = callPackage
@@ -205475,7 +202621,6 @@ self: {
        homepage = "https://github.com/Zankoku-Okuno/unicoder";
        description = "Make writing in unicode easy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unification-fd" = callPackage
@@ -205509,7 +202654,6 @@ self: {
        homepage = "https://sealgram.com/git/haskell/uniform-io";
        description = "Uniform IO over files, network, anything";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "uniform-pair" = callPackage
@@ -205558,7 +202702,6 @@ self: {
        homepage = "http://github.com/minpou/union-map";
        description = "Heterogeneous map by open unions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uniplate" = callPackage
@@ -205638,7 +202781,6 @@ self: {
        homepage = "http://github.com/sebfisch/uniqueid/wikis";
        description = "Splittable Unique Identifier Supply";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unit" = callPackage
@@ -205734,7 +202876,6 @@ self: {
        homepage = "https://bitbucket.org/xnyhps/haskell-unittyped/";
        description = "An extendable library for type-safe computations including units";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "universal-binary" = callPackage
@@ -205861,7 +203002,6 @@ self: {
        homepage = "http://github.com/jfishcoff/universe-th";
        description = "Construct a Dec's ancestor list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix_2_7_1_0" = callPackage
@@ -205993,7 +203133,6 @@ self: {
        homepage = "https://github.com/snoyberg/conduit";
        description = "Run processes on Unix systems, with a conduit interface (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix-pty-light" = callPackage
@@ -206088,7 +203227,6 @@ self: {
        executableHaskellDepends = [ base directory text ];
        description = "Tool to convert literate code between styles or to code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unm-hip" = callPackage
@@ -206165,7 +203303,6 @@ self: {
        homepage = "http://github.com/tcrayford/rematch";
        description = "Rematch support for unordered containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unordered-graphs" = callPackage
@@ -206196,7 +203333,6 @@ self: {
        ];
        description = "Monad transformers that mirror worker-wrapper transformations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unroll-ghc-plugin" = callPackage
@@ -206278,7 +203414,6 @@ self: {
        ];
        description = "Solve Boggle-like word games";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unusable-pkg" = callPackage
@@ -206331,7 +203466,6 @@ self: {
        homepage = "https://github.com/thomaseding/up";
        description = "Command line tool to generate pathnames to facilitate moving upward in a file system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "up-grade" = callPackage
@@ -206363,7 +203497,6 @@ self: {
        jailbreak = true;
        description = "Haskell client for Uploadcare";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "upskirt" = callPackage
@@ -206375,7 +203508,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to upskirt";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ureader" = callPackage
@@ -206401,7 +203533,6 @@ self: {
        homepage = "https://github.com/pxqr/ureader";
        description = "Minimalistic CLI RSS reader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urembed" = callPackage
@@ -206423,7 +203554,6 @@ self: {
        homepage = "http://github.com/grwlf/urembed";
        description = "Ur/Web static content generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri" = callPackage
@@ -206613,7 +203743,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-encode_1_5_0_3" = callPackage
@@ -206668,7 +203797,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-enumerator-file" = callPackage
@@ -206689,7 +203817,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "uri-enumerator backend for the file scheme (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-template" = callPackage
@@ -206750,7 +203877,6 @@ self: {
        libraryHaskellDepends = [ base mtl syb ];
        description = "Parse/format generic key/value URLs from record data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urlcheck" = callPackage
@@ -206769,7 +203895,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/urlcheck";
        description = "Parallel link checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urldecode" = callPackage
@@ -206784,7 +203909,6 @@ self: {
        homepage = "https://github.com/beastaugh/urldecode";
        description = "Decode percent-encoded strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urldisp-happstack" = callPackage
@@ -206796,7 +203920,6 @@ self: {
        libraryHaskellDepends = [ base bytestring happstack-server mtl ];
        description = "Simple, declarative, expressive URL routing -- on happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urlencoded" = callPackage
@@ -206883,7 +204006,6 @@ self: {
        homepage = "http://github.com/grwlf/urxml";
        description = "XML parser-printer supporting Ur/Web syntax extensions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "usb" = callPackage
@@ -206918,7 +204040,6 @@ self: {
        jailbreak = true;
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "usb-hid" = callPackage
@@ -206971,7 +204092,6 @@ self: {
        homepage = "https://github.com/basvandijk/usb-iteratee";
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "usb-safe" = callPackage
@@ -206990,7 +204110,6 @@ self: {
        homepage = "https://github.com/basvandijk/usb-safe/";
        description = "Type-safe communication with USB devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "userid_0_1_2_3" = callPackage
@@ -207349,7 +204468,6 @@ self: {
        jailbreak = true;
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "utf8-string_0_3_8" = callPackage
@@ -207592,7 +204710,6 @@ self: {
        jailbreak = true;
        description = "Utility for drawing attribute grammar pictures with the diagrams package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uuagd" = callPackage
@@ -207916,7 +205033,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/uvector";
        description = "Fast unboxed arrays with a flexible interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uvector-algorithms" = callPackage
@@ -207929,7 +205045,6 @@ self: {
        homepage = "http://code.haskell.org/~dolio/";
        description = "Efficient algorithms for uvector unboxed arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uxadt" = callPackage
@@ -207970,7 +205085,6 @@ self: {
        homepage = "https://gitorious.org/hsv4l2";
        description = "interface to Video For Linux Two (V4L2)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "v4l2-examples" = callPackage
@@ -207986,7 +205100,6 @@ self: {
        homepage = "https://gitorious.org/hsv4l2";
        description = "video for linux two examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vacuum" = callPackage
@@ -207999,7 +205112,6 @@ self: {
        homepage = "http://thoughtpolice.github.com/vacuum";
        description = "Graph representation of the GHC heap";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vacuum-cairo" = callPackage
@@ -208017,7 +205129,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/vacuum-cairo";
        description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vacuum-graphviz" = callPackage
@@ -208030,7 +205141,6 @@ self: {
        jailbreak = true;
        description = "A library for transforming vacuum graphs into GraphViz output";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vacuum-opengl" = callPackage
@@ -208051,7 +205161,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vacuum-ubigraph" = callPackage
@@ -208064,7 +205173,6 @@ self: {
        jailbreak = true;
        description = "Visualize Haskell data structures using vacuum and Ubigraph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vado" = callPackage
@@ -208238,7 +205346,6 @@ self: {
        homepage = "https://github.com/benzrf/vampire";
        description = "Analyze and visualize expression trees";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "var" = callPackage
@@ -208256,7 +205363,6 @@ self: {
        homepage = "http://github.com/sonyandy/var";
        description = "Mutable variables and tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "varan" = callPackage
@@ -208410,7 +205516,6 @@ self: {
        ];
        description = "Common types and instances for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vcache" = callPackage
@@ -208428,7 +205533,6 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-vcache";
        description = "semi-transparent persistence for Haskell using LMDB, STM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "vcache-trie" = callPackage
@@ -208445,7 +205549,6 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-vcache-trie";
        description = "patricia tries modeled above VCache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "vcard" = callPackage
@@ -208460,7 +205563,6 @@ self: {
        homepage = "http://github.com/mboes/vCard";
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vcd" = callPackage
@@ -208592,7 +205694,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector_0_10_9_3" = callPackage
@@ -208830,7 +205931,6 @@ self: {
        homepage = "https://github.com/basvandijk/vector-bytestring";
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-clock" = callPackage
@@ -208850,7 +205950,6 @@ self: {
        homepage = "https://github.com/scvalex/vector-clock";
        description = "Vector clocks for versioning message flows";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-conduit" = callPackage
@@ -208870,7 +205969,6 @@ self: {
        jailbreak = true;
        description = "Conduit utilities for vectors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-fftw" = callPackage
@@ -208899,7 +205997,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/vector-functorlazy/";
        description = "vectors that perform the fmap operation in constant time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-heterogenous" = callPackage
@@ -208981,7 +206078,6 @@ self: {
        homepage = "http://github.com/kreuzschlitzschraubenzieher/vector-instances-collections";
        description = "Instances of the Data.Collections classes for Data.Vector.*";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-mmap" = callPackage
@@ -209006,7 +206102,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/vector-random";
        description = "Generate vectors filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-read-instances" = callPackage
@@ -209019,7 +206114,18 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "(deprecated) Read instances for 'Data.Vector'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "vector-sized" = callPackage
+    ({ mkDerivation, base, deepseq, vector }:
+     mkDerivation {
+       pname = "vector-sized";
+       version = "0.2.0.0";
+       sha256 = "bbdf2d23e3edd5bb059181415368bc95b97d2bd09e642e500f1f9a0acb0a4933";
+       libraryHaskellDepends = [ base deepseq vector ];
+       homepage = "http://github.com/expipiplus1/vector-sized#readme";
+       description = "Size tagged vectors";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "vector-space_0_8_7" = callPackage
@@ -209097,7 +206203,6 @@ self: {
        ];
        description = "Instances of vector-space classes for OpenGL types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-space-points_0_2" = callPackage
@@ -209148,7 +206253,6 @@ self: {
        homepage = "http://github.com/geezusfreeek/vector-static";
        description = "Statically checked sizes on Data.Vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-strategies" = callPackage
@@ -209295,7 +206399,6 @@ self: {
        homepage = "http://github.com/tomahawkins/verilog";
        description = "Verilog preprocessor, parser, and AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "versions" = callPackage
@@ -209312,7 +206415,6 @@ self: {
        ];
        description = "Types and parsers for software version numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vhd" = callPackage
@@ -209403,7 +206505,6 @@ self: {
        homepage = "http://github.com/michaelxavier/vigilance";
        description = "An extensible dead-man's switch system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vimeta" = callPackage
@@ -209430,7 +206531,6 @@ self: {
        homepage = "http://github.com/pjones/vimeta";
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vimus" = callPackage
@@ -209478,7 +206578,6 @@ self: {
        homepage = "http://www.vintage-basic.net";
        description = "Interpreter for microcomputer-era BASIC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl_0_5_1" = callPackage
@@ -209527,7 +206626,6 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and vinyl records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-json" = callPackage
@@ -209545,7 +206643,6 @@ self: {
        jailbreak = true;
        description = "Provide json instances automagically to vinyl types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-utils" = callPackage
@@ -209578,7 +206675,6 @@ self: {
        homepage = "http://github.com/andrewthad/vinyl-vectors";
        description = "Vectors for vinyl vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "virthualenv" = callPackage
@@ -209599,7 +206695,6 @@ self: {
        homepage = "https://github.com/Paczesiowa/virthualenv";
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "visibility" = callPackage
@@ -209632,7 +206727,6 @@ self: {
        ];
        description = "An XMMS2 client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "visual-graphrewrite" = callPackage
@@ -209661,7 +206755,6 @@ self: {
        homepage = "http://github.com/zsol/visual-graphrewrite/";
        description = "Visualize the graph-rewrite steps of a Haskell program";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "visual-prof" = callPackage
@@ -209682,7 +206775,6 @@ self: {
        homepage = "http://github.com/djv/VisualProf";
        description = "Create a visual profile of a program's source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vivid" = callPackage
@@ -209701,7 +206793,6 @@ self: {
        ];
        description = "Sound synthesis with SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vk-aws-route53" = callPackage
@@ -209719,7 +206810,6 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vk-posix-pty" = callPackage
@@ -209793,7 +206883,6 @@ self: {
        ];
        description = "Reading of Vorbis comments from Ogg Vorbis files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vowpal-utils" = callPackage
@@ -209807,7 +206896,6 @@ self: {
        homepage = "https://github.com/cartazio/Vowpal-Utils";
        description = "Vowpal Wabbit utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "voyeur" = callPackage
@@ -209821,7 +206909,6 @@ self: {
        homepage = "https://github.com/sethfowler/hslibvoyeur";
        description = "Haskell bindings for libvoyeur";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vrpn" = callPackage
@@ -209854,7 +206941,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) vte;};
 
   "vtegtk3" = callPackage
@@ -209870,7 +206956,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) vte;};
 
   "vty" = callPackage
@@ -209925,7 +207010,6 @@ self: {
        homepage = "https://github.com/coreyoconnor/vty";
        description = "Examples programs using the vty library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-menu" = callPackage
@@ -209940,7 +207024,6 @@ self: {
        jailbreak = true;
        description = "A lib for displaying a menu and getting a selection using VTY";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-ui" = callPackage
@@ -209977,22 +207060,46 @@ self: {
        jailbreak = true;
        description = "Extra vty-ui functionality not included in the core library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vulkan" = callPackage
-    ({ mkDerivation, base, fixed-vector }:
+    ({ mkDerivation, base, vector-sized }:
      mkDerivation {
        pname = "vulkan";
-       version = "1.0.0.0";
-       sha256 = "9449a0ae1ba4d3d322e35b2948a5dae576bd6e59bdcb75917d79ab1436d432c4";
-       libraryHaskellDepends = [ base fixed-vector ];
+       version = "1.5.0.0";
+       sha256 = "8df7d3f179cef9f47a6866abd14a5ae4f4a961a63d9e91d3b0898c55b47bcc13";
+       libraryHaskellDepends = [ base vector-sized ];
        jailbreak = true;
        homepage = "http://github.com/expipiplus1/vulkan#readme";
        description = "Bindings to the Vulkan graphics API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wacom-daemon" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, Glob, libnotify, process, select, text, udev
+     , unordered-containers, vector, X11, yaml
+     }:
+     mkDerivation {
+       pname = "wacom-daemon";
+       version = "0.1.0.0";
+       sha256 = "08bd693ea56a93ec81308ebeff1e190f52752cf877c47c18cc9485bf8db98f7c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath Glob libnotify
+         process select text udev unordered-containers vector X11 yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory filepath Glob libnotify
+         process select text udev unordered-containers vector X11 yaml
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/portnov/wacom-intuos-pro-scripts";
+       description = "Manage Wacom tablet settings profiles, including Intuos Pro ring modes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "waddle" = callPackage
     ({ mkDerivation, base, binary, bytestring, case-insensitive
      , containers, directory, JuicyPixels
@@ -211322,7 +208429,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-extra" = callPackage
+  "wai-extra_3_0_14" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -211349,6 +208456,36 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-extra" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, fast-logger, hspec
+     , http-types, HUnit, iproute, lifted-base, network, old-locale
+     , resourcet, streaming-commons, stringsearch, text, time
+     , transformers, unix, unix-compat, vault, void, wai, wai-logger
+     , word8, zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.0.14.1";
+       sha256 = "3c76f41acf9a4351ebf51908acd3febbef1cf66481933e1e34dc99642d6054dd";
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring blaze-builder bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         directory fast-logger http-types iproute lifted-base network
+         old-locale resourcet streaming-commons stringsearch text time
+         transformers unix unix-compat vault void wai wai-logger word8 zlib
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring case-insensitive cookie fast-logger
+         hspec http-types HUnit resourcet text time transformers wai zlib
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -211378,7 +208515,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/wai-graceful";
        description = "Graceful shutdown for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-handler-devel" = callPackage
@@ -211401,7 +208537,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "WAI server that automatically reloads code after modification. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-handler-fastcgi" = callPackage
@@ -211498,7 +208633,6 @@ self: {
        homepage = "http://github.com/snoyberg/wai-handler-snap";
        description = "Web Application Interface handler using snap-server. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-handler-webkit" = callPackage
@@ -211512,7 +208646,6 @@ self: {
        homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit";
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {QtWebKit = null;};
 
   "wai-hastache" = callPackage
@@ -211529,7 +208662,6 @@ self: {
        homepage = "https://github.com/singpolyma/wai-hastache";
        description = "Nice wrapper around hastache for use with WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-hmac-auth" = callPackage
@@ -211587,7 +208719,6 @@ self: {
        jailbreak = true;
        description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-logger_2_2_3" = callPackage
@@ -211688,7 +208819,6 @@ self: {
        ];
        description = "A logging system for preforked WAI apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-cache" = callPackage
@@ -211712,7 +208842,6 @@ self: {
        homepage = "https://github.com/akaspin/wai-middleware-cache";
        description = "Caching middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-cache-redis" = callPackage
@@ -211733,7 +208862,6 @@ self: {
        homepage = "https://github.com/akaspin/wai-middleware-cache-redis";
        description = "Redis backend for wai-middleware-cache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-caching" = callPackage
@@ -211801,7 +208929,6 @@ self: {
        homepage = "https://github.com/akaspin/wai-middleware-catch";
        description = "Wai error catching middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-consul" = callPackage
@@ -212012,7 +209139,6 @@ self: {
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "wai-middleware-etag" = callPackage
@@ -212060,7 +209186,6 @@ self: {
        homepage = "http://github.com/seanhess/wai-middleware-headers";
        description = "cors and addHeaders for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-hmac" = callPackage
@@ -212108,7 +209233,6 @@ self: {
        ];
        description = "WAI HMAC Authentication Middleware Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-metrics" = callPackage
@@ -212148,7 +209272,6 @@ self: {
        homepage = "https://github.com/taktoa/wai-middleware-preprocessor";
        description = "WAI middleware for preprocessing static files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-prometheus" = callPackage
@@ -212165,7 +209288,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest prometheus-client ];
        homepage = "https://github.com/fimad/prometheus-haskell";
-       description = "WAI middlware for exposing http://prometheus.io metrics";
+       description = "WAI middlware for exposing http://prometheus.io metrics.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -212189,7 +209312,6 @@ self: {
        homepage = "https://github.com/akaspin/wai-middleware-route";
        description = "Wai dispatch middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-static_0_6_0_1" = callPackage
@@ -212270,7 +209392,6 @@ self: {
        homepage = "https://github.com/agrafix/wai-middleware-static";
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-throttle_0_2_0_1" = callPackage
@@ -212806,7 +209927,6 @@ self: {
        homepage = "https://github.com/singpolyma/wai-session-tokyocabinet";
        description = "Session store based on Tokyo Cabinet";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-static-cache" = callPackage
@@ -212826,7 +209946,6 @@ self: {
        ];
        description = "A simple cache for serving static files in a WAI middleware";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-static-pages" = callPackage
@@ -212889,7 +210008,6 @@ self: {
        jailbreak = true;
        description = "Wai middleware for request throttling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-transformers" = callPackage
@@ -213979,7 +211097,6 @@ self: {
        homepage = "http://tanakh.jp";
        description = "Dynamic configurable warp HTTP server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-static" = callPackage
@@ -214002,7 +211119,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Static file server based on Warp and wai-app-static (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-tls_3_0_1" = callPackage
@@ -214365,7 +211481,6 @@ self: {
        jailbreak = true;
        description = "set group and user id before running server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "watchdog" = callPackage
@@ -214378,7 +211493,6 @@ self: {
        jailbreak = true;
        description = "Simple control structure to re-try an action with exponential backoff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "watcher" = callPackage
@@ -214396,7 +211510,6 @@ self: {
        jailbreak = true;
        description = "Opinionated filesystem watcher";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "watchit" = callPackage
@@ -214425,7 +211538,6 @@ self: {
        ];
        description = "File change watching utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wavconvert" = callPackage
@@ -214473,7 +211585,6 @@ self: {
        homepage = "http://code.haskell.org/~StefanKersten/code/wavesurfer";
        description = "Parse WaveSurfer files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wavy" = callPackage
@@ -214532,7 +211643,6 @@ self: {
        homepage = "https://github.com/cvb/hs-weather-api.git";
        description = "Weather api implemented in haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-browser-in-haskell" = callPackage
@@ -214544,7 +211654,6 @@ self: {
        libraryHaskellDepends = [ base gtk webkit ];
        description = "Web Browser In Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-css" = callPackage
@@ -214576,7 +211685,6 @@ self: {
        homepage = "http://github.com/snoyberg/web-encodings/tree/master";
        description = "Encapsulate multiple web encoding in a single package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-fpco" = callPackage
@@ -214612,7 +211720,6 @@ self: {
        homepage = "http://github.com/cmoore/web-mongrel2";
        description = "Bindings for the Mongrel2 web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-page" = callPackage
@@ -214729,7 +211836,6 @@ self: {
        homepage = "http://docs.yesodweb.com/web-routes-quasi/";
        description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes-regular" = callPackage
@@ -214769,7 +211875,6 @@ self: {
        jailbreak = true;
        description = "Extends web-routes with some transformers instances for RouteT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes-wai" = callPackage
@@ -214831,7 +211936,6 @@ self: {
        homepage = "http://byteally.github.io/webapi/";
        description = "WAI based library for web api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webapp" = callPackage
@@ -214854,7 +211958,6 @@ self: {
        homepage = "https://github.com/fhsjaagshs/webapp";
        description = "Haskell web app framework based on WAI & Warp";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webcrank" = callPackage
@@ -214900,7 +212003,6 @@ self: {
        homepage = "https://github.com/webcrank/webcrank-dispatch.hs";
        description = "A simple request dispatcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webcrank-wai" = callPackage
@@ -214919,7 +212021,6 @@ self: {
        homepage = "https://github.com/webcrank/webcrank-wai";
        description = "Build a WAI Application from Webcrank Resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver_0_6_0_3" = callPackage
@@ -215216,7 +212317,6 @@ self: {
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webfinger-client" = callPackage
@@ -215279,7 +212379,6 @@ self: {
        homepage = "http://github.com/ananthakumaran/webify";
        description = "webfont generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webkit" = callPackage
@@ -215310,7 +212409,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webkitgtk3" = callPackage
@@ -215403,7 +212501,6 @@ self: {
        ];
        description = "HTTP server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websnap" = callPackage
@@ -215418,7 +212515,6 @@ self: {
        homepage = "https://github.com/jrb/websnap";
        description = "Transforms URLs to PNGs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websockets_0_9_2_1" = callPackage
@@ -215688,7 +212784,6 @@ self: {
        ];
        description = "Functional reactive web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wedding-announcement" = callPackage
@@ -215724,7 +212819,6 @@ self: {
        jailbreak = true;
        description = "Wedged postcard generator";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weighted-regexp" = callPackage
@@ -215741,7 +212835,6 @@ self: {
        homepage = "http://sebfisch.github.com/haskell-regexp";
        description = "Weighted Regular Expression Matcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weighted-search" = callPackage
@@ -215775,7 +212868,6 @@ self: {
        homepage = "https://github.com/mcschroeder/welshy";
        description = "Haskell web framework (because Scotty had trouble yodeling)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "werewolf" = callPackage
@@ -215818,7 +212910,6 @@ self: {
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "MongoDB plugin for Wheb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wheb-redis" = callPackage
@@ -215832,7 +212923,6 @@ self: {
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "Redis connection for Wheb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wheb-strapped" = callPackage
@@ -215846,7 +212936,6 @@ self: {
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "Strapped templates for Wheb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "while-lang-parser" = callPackage
@@ -215878,7 +212967,6 @@ self: {
        homepage = "http://neugierig.org/software/darcs/whim/";
        description = "A Haskell window manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "whiskers" = callPackage
@@ -215905,7 +212993,6 @@ self: {
        homepage = "https://github.com/haroldl/whitespace-nd";
        description = "Whitespace, an esoteric programming language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "whois" = callPackage
@@ -215972,7 +213059,6 @@ self: {
        homepage = "http://rampa.sk/static/wikipedia4epub.html";
        description = "Wikipedia EPUB E-Book construction from Firefox history";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "win-hp-path" = callPackage
@@ -216007,7 +213093,6 @@ self: {
        homepage = "http://patch-tag.com/repo/windowslive";
        description = "Implements Windows Live Web Authentication and Delegated Authentication";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "winerror" = callPackage
@@ -216019,7 +213104,6 @@ self: {
        doHaddock = false;
        description = "Error handling for foreign calls to the Windows API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "winio" = callPackage
@@ -216037,7 +213121,6 @@ self: {
        homepage = "http://github.com/felixmar/winio";
        description = "I/O library for Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {kernel32 = null; ws2_32 = null;};
 
   "wiring" = callPackage
@@ -216088,7 +213171,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "witherable" = callPackage
+  "witherable_0_1_3_2" = callPackage
     ({ mkDerivation, base, base-orphans, containers, hashable
      , transformers, unordered-containers, vector
      }:
@@ -216103,6 +213186,24 @@ self: {
        homepage = "https://github.com/fumieval/witherable";
        description = "Generalization of filter and catMaybes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "witherable" = callPackage
+    ({ mkDerivation, base, base-orphans, containers, hashable
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "witherable";
+       version = "0.1.3.3";
+       sha256 = "6fdfd607e71b442d17b48ab7e00fe3d8dda2c39cf041134d01d49da83421cf6c";
+       libraryHaskellDepends = [
+         base base-orphans containers hashable transformers
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/fumieval/witherable";
+       description = "Generalization of filter and catMaybes";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "witness" = callPackage
@@ -216355,7 +213456,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) wlc;};
 
   "wobsurv" = callPackage
@@ -216393,7 +213493,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/wobsurv";
        description = "A simple and highly performant HTTP file server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "woffex" = callPackage
@@ -216410,7 +213509,6 @@ self: {
        jailbreak = true;
        description = "Web Open Font Format (WOFF) unpacker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wol" = callPackage
@@ -216461,7 +213559,6 @@ self: {
        homepage = "https://github.com/swift-nav/wolf";
        description = "Amazon Simple Workflow Service Wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "woot" = callPackage
@@ -216508,7 +213605,6 @@ self: {
        homepage = "http://www.tiresiaspress.us/haskell/word24";
        description = "24-bit word and int types for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "word8_0_1_1" = callPackage
@@ -216655,7 +213751,6 @@ self: {
        executableHaskellDepends = [ base containers fclabels ];
        description = "A word search solver library and executable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wordsetdiff" = callPackage
@@ -216696,7 +213791,6 @@ self: {
        homepage = "https://github.com/sboosali/workflow-osx#readme";
        description = "a \"Desktop Workflow\" monad with Objective-C bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wp-archivebot" = callPackage
@@ -216713,7 +213807,6 @@ self: {
        jailbreak = true;
        description = "Subscribe to a wiki's RSS feed and archive external links";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wrap" = callPackage
@@ -216759,7 +213852,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/wraxml/";
        description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wreq_0_3_0_1" = callPackage
@@ -216933,7 +214025,6 @@ self: {
        jailbreak = true;
        description = "Colour space transformations and metrics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wsdl" = callPackage
@@ -216953,7 +214044,6 @@ self: {
        ];
        description = "WSDL parsing in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wsedit" = callPackage
@@ -216983,7 +214073,6 @@ self: {
        libraryHaskellDepends = [ base old-locale time transformers ];
        description = "Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wtk-gtk" = callPackage
@@ -216999,7 +214088,6 @@ self: {
        ];
        description = "GTK tools within Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wumpus-basic" = callPackage
@@ -217016,7 +214104,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Basic objects and system code built on Wumpus-Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wumpus-core" = callPackage
@@ -217032,7 +214119,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Pure Haskell PostScript and SVG generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wumpus-drawing" = callPackage
@@ -217049,7 +214135,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "High-level drawing objects built on Wumpus-Basic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wumpus-microprint" = callPackage
@@ -217067,7 +214152,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Microprints - \"greek-text\" pictures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wumpus-tree" = callPackage
@@ -217085,7 +214169,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Drawing trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wuss" = callPackage
@@ -217115,7 +214198,6 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "wxAsteroids" = callPackage
@@ -217146,7 +214228,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/WxFruit";
        description = "An implementation of Fruit using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wxc" = callPackage
@@ -217164,7 +214245,6 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell C++ wrapper";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; 
          inherit (pkgs) wxGTK;};
 
@@ -217184,7 +214264,6 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell core";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) wxGTK;};
 
   "wxdirect" = callPackage
@@ -217218,7 +214297,6 @@ self: {
        homepage = "http://github.com/elbrujohalcon/wxhnotepad";
        description = "An example of how to implement a basic notepad with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wxturtle" = callPackage
@@ -217234,7 +214312,6 @@ self: {
        ];
        description = "turtle like LOGO with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wybor" = callPackage
@@ -217277,7 +214354,6 @@ self: {
        homepage = "http://dmwit.com/wyvern";
        description = "An autoresponder for Dragon Go Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x-dsp" = callPackage
@@ -217296,7 +214372,6 @@ self: {
        homepage = "http://jwlato.webfactional.com/haskell/x-dsp";
        description = "A embedded DSL for manipulating DSP languages in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x11-xim" = callPackage
@@ -217325,7 +214400,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/x11-xinput";
        description = "Haskell FFI bindings for X11 XInput library (-lXi)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libXi;};
 
   "x509_1_5_0_1" = callPackage
@@ -217728,7 +214802,6 @@ self: {
        ];
        description = "Haskell extended file attributes interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) attr;};
 
   "xbattbar" = callPackage
@@ -217743,7 +214816,6 @@ self: {
        homepage = "https://github.com/polachok/xbattbar";
        description = "Simple battery indicator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xcb-types" = callPackage
@@ -217801,7 +214873,6 @@ self: {
        ];
        description = "XChat";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xcp" = callPackage
@@ -217895,7 +214966,6 @@ self: {
        homepage = "http://patch-tag.com/r/obbele/xfconf/home";
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libxfconf-0 = null;};
 
   "xformat" = callPackage
@@ -217926,7 +214996,6 @@ self: {
        homepage = "http://code.google.com/p/xhaskell-library/";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xhb" = callPackage
@@ -217979,7 +215048,6 @@ self: {
        homepage = "http://github.com/jotrk/xhb-ewmh/";
        description = "EWMH utilities for XHB";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xhtml_3000_2_1" = callPackage
@@ -218039,7 +215107,6 @@ self: {
        homepage = "http://github.com/joachifm/hxine";
        description = "Bindings to xine-lib";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libxine = null; xine = null;};
 
   "xing-api" = callPackage
@@ -218065,7 +215132,6 @@ self: {
        homepage = "http://github.com/JanAhrens/xing-api-haskell";
        description = "Wrapper for the XING API, v1";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xinput-conduit" = callPackage
@@ -218100,7 +215166,6 @@ self: {
        testHaskellDepends = [ base unix ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
@@ -218119,7 +215184,6 @@ self: {
        homepage = "http://github.com/sellweek/xkcd";
        description = "Downloads the most recent xkcd comic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsior" = callPackage
@@ -218341,7 +215405,6 @@ self: {
        homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-templater" = callPackage
@@ -218362,7 +215425,6 @@ self: {
        homepage = "https://github.com/qrilka/xlsx-templater";
        description = "Simple and incomplete Excel file templater";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml_1_3_13" = callPackage
@@ -218422,7 +215484,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Parse XML catalog files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit_1_2_3" = callPackage
@@ -218677,6 +215738,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "xml-conduit_1_3_4" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, conduit, conduit-extra, containers
+     , data-default, deepseq, hspec, HUnit, monad-control, resourcet
+     , text, transformers, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit";
+       version = "1.3.4";
+       sha256 = "1613ad696d4385a74f646e752ecd3ef576350427961e638d00fa58e01215f46d";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         conduit conduit-extra containers data-default deepseq monad-control
+         resourcet text transformers xml-types
+       ];
+       testHaskellDepends = [
+         base blaze-markup bytestring conduit containers hspec HUnit
+         resourcet text transformers xml-types
+       ];
+       homepage = "http://github.com/snoyberg/xml";
+       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xml-conduit-parse" = callPackage
     ({ mkDerivation, base, conduit, conduit-parse, containers
      , data-default, exceptions, hlint, parsers, resourcet, tasty
@@ -218739,7 +215825,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-enumerator-combinators" = callPackage
@@ -218758,7 +215843,6 @@ self: {
        jailbreak = true;
        description = "Parser combinators for xml-enumerator and compatible XML parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-extractors" = callPackage
@@ -218918,7 +216002,6 @@ self: {
        homepage = "http://sep07.mroot.net/";
        description = "Parsing XML with Parsec";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-picklers" = callPackage
@@ -218948,7 +216031,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/xml-pipe/wiki";
        description = "XML parser which uses simple-pipe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-prettify" = callPackage
@@ -218964,7 +216046,6 @@ self: {
        homepage = "http://github.com/rosenbergdm/xml-prettify";
        description = "Pretty print XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-push" = callPackage
@@ -218986,7 +216067,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/xml-push/wiki";
        description = "Push XML from/to client to/from server over XMPP or HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-query" = callPackage
@@ -219018,7 +216098,6 @@ self: {
        homepage = "https://github.com/sannsyn/xml-query-xml-conduit";
        description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-query-xml-types" = callPackage
@@ -219044,7 +216123,6 @@ self: {
        homepage = "https://github.com/sannsyn/xml-query-xml-types";
        description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-to-json" = callPackage
@@ -219165,7 +216243,6 @@ self: {
        homepage = "http://github.com/yihuang/xml2json";
        description = "translate xml to json";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml2x" = callPackage
@@ -219184,7 +216261,6 @@ self: {
        jailbreak = true;
        description = "Convert BLAST output in XML format to CSV or HTML";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmlgen" = callPackage
@@ -219266,7 +216342,6 @@ self: {
        homepage = "http://github.com/dagle/hs-xmltv";
        description = "Show tv channels in the terminal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmms2-client" = callPackage
@@ -219283,7 +216358,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmms2-client-glib" = callPackage
@@ -219296,7 +216370,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library — GLib integration";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmobar" = callPackage
@@ -219325,7 +216398,6 @@ self: {
        homepage = "http://xmobar.org";
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {Xrender = null; inherit (pkgs.xorg) libXpm; 
          inherit (pkgs.xorg) libXrandr; inherit (pkgs) wirelesstools;};
 
@@ -219376,7 +216448,6 @@ self: {
        homepage = "http://xmonad.org";
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-contrib" = callPackage
@@ -219418,7 +216489,6 @@ self: {
        homepage = "http://xmonad.org/";
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-contrib-gpl" = callPackage
@@ -219466,7 +216536,6 @@ self: {
        homepage = "http://xmonad.org/";
        description = "Module for evaluation Haskell expressions in the running xmonad instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-extras" = callPackage
@@ -219515,7 +216584,6 @@ self: {
        homepage = "https://github.com/LeifW/xmonad-utils";
        description = "A small collection of X utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xmonad-wallpaper" = callPackage
@@ -219562,7 +216630,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/xmpipe/wiki";
        description = "XMPP implementation using simple-PIPE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xorshift" = callPackage
@@ -219587,7 +216654,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/xosd";
        description = "A binding to the X on-screen display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) xosd;};
 
   "xournal-builder" = callPackage
@@ -219605,7 +216671,6 @@ self: {
        jailbreak = true;
        description = "text builder for xournal file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xournal-convert" = callPackage
@@ -219628,7 +216693,6 @@ self: {
        homepage = "http://ianwookim.org/hxournal";
        description = "convert utility for xoj files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xournal-parser" = callPackage
@@ -219649,7 +216713,6 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Xournal file parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xournal-render" = callPackage
@@ -219667,7 +216730,6 @@ self: {
        jailbreak = true;
        description = "Xournal file renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xournal-types" = callPackage
@@ -219685,7 +216747,6 @@ self: {
        ];
        description = "Data types for programs for xournal file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xsact" = callPackage
@@ -219705,7 +216766,6 @@ self: {
        homepage = "http://malde.org/~ketil/";
        description = "Cluster EST sequences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xsd" = callPackage
@@ -219746,7 +216806,6 @@ self: {
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {xslt = null;};
 
   "xss-sanitize_0_3_5_4" = callPackage
@@ -219825,7 +216884,6 @@ self: {
        homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xtest" = callPackage
@@ -219892,7 +216950,6 @@ self: {
        jailbreak = true;
        description = "#plaimi's all-encompassing bot";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yabi" = callPackage
@@ -220074,7 +217131,6 @@ self: {
        homepage = "http://www.people.fas.harvard.edu/~stewart5/code/yahoo-web-search";
        description = "Yahoo Web Search Services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yajl" = callPackage
@@ -220089,7 +217145,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-yajl/";
        description = "Bindings for YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) yajl;};
 
   "yajl-enumerator" = callPackage
@@ -220107,7 +217162,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-yajl/";
        description = "Enumerator-based interface to YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yall" = callPackage
@@ -220467,7 +217521,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/yaml-rpc";
        description = "Simple library for network (HTTP REST-like) YAML RPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-rpc-scotty" = callPackage
@@ -220485,7 +217538,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/yaml-rpc";
        description = "Scotty server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-rpc-snap" = callPackage
@@ -220503,7 +217555,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/yaml-rpc";
        description = "Snap server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-union" = callPackage
@@ -220524,7 +217575,6 @@ self: {
        homepage = "https://github.com/michelk/yaml-overrides.hs";
        description = "Read multiple yaml-files and override fields recursively";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml2owl" = callPackage
@@ -220543,7 +217593,6 @@ self: {
        homepage = "http://github.com/leifw/yaml2owl";
        description = "Generate OWL schema from YAML syntax, and an RDFa template";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yamlkeysdiff" = callPackage
@@ -220577,7 +217626,6 @@ self: {
        executableHaskellDepends = [ base blank-canvas text Yampa ];
        description = "blank-canvas frontend for Yampa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa-glfw" = callPackage
@@ -220597,7 +217645,6 @@ self: {
        homepage = "https://github.com/deepfire/yampa-glfw";
        description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa-glut" = callPackage
@@ -220620,7 +217667,6 @@ self: {
        homepage = "https://github.com/ony/yampa-glut";
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa2048" = callPackage
@@ -220636,7 +217682,6 @@ self: {
        homepage = "https://github.com/ksaveljev/yampa-2048";
        description = "2048 game clone using Yampa/Gloss";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "yaop" = callPackage
@@ -220651,7 +217696,6 @@ self: {
        homepage = "https://github.com/esmolanka/yaop";
        description = "Yet another option parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yap" = callPackage
@@ -220702,7 +217746,6 @@ self: {
        jailbreak = true;
        description = "Yet another array library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yarr-image-io" = callPackage
@@ -220716,7 +217759,6 @@ self: {
        jailbreak = true;
        description = "Image IO for Yarr library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libdevil;};
 
   "yate" = callPackage
@@ -220737,7 +217779,6 @@ self: {
        jailbreak = true;
        description = "Yet Another Template Engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yavie" = callPackage
@@ -220756,7 +217797,6 @@ self: {
        executableHaskellDepends = [ base Cabal directory process ];
        description = "yet another visual editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ycextra" = callPackage
@@ -220771,7 +217811,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Additional utilities to work with Yhc Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yeganesh" = callPackage
@@ -221020,7 +218059,6 @@ self: {
        homepage = "https://github.com/tolysz/yesod-angular-ui";
        description = "Angular Helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth_1_4_1" = callPackage
@@ -221610,7 +218648,7 @@ self: {
          yesod-auth yesod-core
        ];
        homepage = "https://github.com/prowdsponsor/yesod-auth-deskcom";
-       description = "Desk.com remote authentication support for Yesod apps";
+       description = "Desk.com remote authentication support for Yesod apps.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -221790,7 +218828,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "LDAP Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-ldap-mediocre" = callPackage
@@ -221824,7 +218861,6 @@ self: {
        homepage = "http://github.com/mulderr/yesod-auth-ldap-native";
        description = "Yesod LDAP authentication plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-oauth_1_4_0_1" = callPackage
@@ -221845,7 +218881,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-auth-oauth" = callPackage
+  "yesod-auth-oauth_1_4_0_2" = callPackage
     ({ mkDerivation, authenticate-oauth, base, bytestring, lifted-base
      , text, transformers, yesod-auth, yesod-core, yesod-form
      }:
@@ -221860,6 +218896,24 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "OAuth Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-auth-oauth" = callPackage
+    ({ mkDerivation, authenticate-oauth, base, bytestring, lifted-base
+     , text, transformers, yesod-auth, yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-auth-oauth";
+       version = "1.4.1";
+       sha256 = "6046eceb32cbd852c9737a8f09e25c0609296373bd4974bb256ba9dc2e7b48c8";
+       libraryHaskellDepends = [
+         authenticate-oauth base bytestring lifted-base text transformers
+         yesod-auth yesod-core yesod-form
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "OAuth Authentication for Yesod";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "yesod-auth-oauth2_0_0_11" = callPackage
@@ -221878,7 +218932,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/scan/yesod-auth-oauth2";
-       description = "Library to authenticate with OAuth 2.0 for Yesod web applications";
+       description = "Library to authenticate with OAuth 2.0 for Yesod web applications.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -221899,7 +218953,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/scan/yesod-auth-oauth2";
-       description = "Library to authenticate with OAuth 2.0 for Yesod web applications";
+       description = "Library to authenticate with OAuth 2.0 for Yesod web applications.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -222052,7 +219106,6 @@ self: {
        ];
        description = "Provides PAM authentication module";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-smbclient" = callPackage
@@ -222070,7 +219123,6 @@ self: {
        homepage = "https://github.com/kkazuo/yesod-auth-smbclient.git";
        description = "Authentication plugin for Yesod using smbclient";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-zendesk" = callPackage
@@ -223188,7 +220240,6 @@ self: {
        homepage = "http://github.com/pbrisbin/yesod-comments";
        description = "A generic comments interface for a Yesod application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-content-pdf" = callPackage
@@ -223211,7 +220262,6 @@ self: {
        homepage = "https://github.com/alexkyllo/yesod-content-pdf#readme";
        description = "PDF Content Type for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-continuations" = callPackage
@@ -223231,7 +220281,6 @@ self: {
        homepage = "https://github.com/softmechanics/yesod-continuations/";
        description = "Continuations for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-core_1_4_6" = callPackage
@@ -224168,7 +221217,6 @@ self: {
        homepage = "http://github.com/tlaitinen/yesod-datatables";
        description = "Yesod plugin for DataTables (jQuery grid plugin)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-default" = callPackage
@@ -224265,7 +221313,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Example programs using the Yesod Web Framework. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) sqlite;};
 
   "yesod-fay_0_7_0" = callPackage
@@ -224578,7 +221625,6 @@ self: {
        homepage = "http://github.com/pbrisbin/yesod-goodies";
        description = "A collection of various small helpers useful in any yesod application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-json" = callPackage
@@ -224604,7 +221650,6 @@ self: {
        homepage = "http://github.com/pbrisbin/yesod-goodies/yesod-links";
        description = "A typeclass which simplifies creating link widgets throughout your site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-lucid" = callPackage
@@ -224722,7 +221767,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-markdown" = callPackage
@@ -224841,7 +221885,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell yesod ];
        description = "Pagination for Yesod sites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-pagination" = callPackage
@@ -224861,7 +221904,6 @@ self: {
        homepage = "https://github.com/joelteon/yesod-pagination";
        description = "Pagination in Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-paginator" = callPackage
@@ -225027,8 +222069,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-pnotify";
-       version = "1.1.2";
-       sha256 = "9a128a35e68da0de09bb7d603cbc24f9b21942b673540b8812d5f072a1ec60c9";
+       version = "1.1.3.1";
+       sha256 = "67c2c9e808a963213f7a9b48472758b26a64c058ff2dfd8edd8f0c8ad053d407";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -225054,7 +222096,6 @@ self: {
        homepage = "https://github.com/snoyberg/yesod-pure";
        description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-purescript" = callPackage
@@ -225076,7 +222117,6 @@ self: {
        homepage = "https://github.com/mpietrzak/yesod-purescript";
        description = "PureScript integration for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-raml" = callPackage
@@ -225122,7 +222162,6 @@ self: {
        ];
        description = "The raml helper executable";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-raml-docs" = callPackage
@@ -225162,7 +222201,6 @@ self: {
        ];
        description = "A mock-handler generator library from RAML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-recaptcha" = callPackage
@@ -225239,7 +222277,6 @@ self: {
        homepage = "https://github.com/docmunch/yesod-routes-typescript";
        description = "generate TypeScript routes for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-rst" = callPackage
@@ -225258,7 +222295,6 @@ self: {
        homepage = "http://github.com/pSub/yesod-rst";
        description = "Tools for using reStructuredText (RST) in a yesod application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-s3" = callPackage
@@ -225276,7 +222312,6 @@ self: {
        homepage = "https://github.com/tvh/yesod-s3";
        description = "Simple Helper Library for using Amazon's Simple Storage Service (S3) with Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-sass" = callPackage
@@ -225312,7 +222347,6 @@ self: {
        homepage = "https://github.com/ollieh/yesod-session-redis";
        description = "Redis-Powered Sessions for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-sitemap_1_4_0" = callPackage
@@ -225656,7 +222690,6 @@ self: {
        libraryHaskellDepends = [ base hamlet persistent yesod ];
        description = "Table view for Yesod applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test_1_4_2" = callPackage
@@ -225864,7 +222897,6 @@ self: {
        homepage = "https://github.com/bogiebro/yesod-test-json";
        description = "Utility functions for testing JSON web services written in Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-text-markdown_0_1_7" = callPackage
@@ -225880,7 +222912,7 @@ self: {
          yesod-form yesod-persistent
        ];
        jailbreak = true;
-       description = "Yesod support for Text.Markdown";
+       description = "Yesod support for Text.Markdown.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -225897,7 +222929,7 @@ self: {
          aeson base markdown persistent shakespeare text yesod-core
          yesod-form yesod-persistent
        ];
-       description = "Yesod support for Text.Markdown";
+       description = "Yesod support for Text.Markdown.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -225916,7 +222948,6 @@ self: {
        homepage = "http://github.com/netom/yesod-tls";
        description = "Provides main functions using warp-tls for yesod projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-transloadit" = callPackage
@@ -225963,7 +222994,6 @@ self: {
        homepage = "https://github.com/Tener/yesod-vend";
        description = "Simple CRUD classes for easy view creation for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-websockets_0_2_0" = callPackage
@@ -226090,7 +223120,6 @@ self: {
        homepage = "https://github.com/jamesdabbs/yesod-worker";
        description = "Drop-in(ish) background worker system for Yesod apps";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yet-another-logger" = callPackage
@@ -226137,7 +223166,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Yhc's Internal Core language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi" = callPackage
@@ -226194,7 +223222,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Yi";
        description = "Add-ons to Yi, the Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-emacs-colours" = callPackage
@@ -226295,7 +223322,6 @@ self: {
        ];
        description = "A rope data structure used by Yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "yi-snippet" = callPackage
@@ -226356,7 +223382,6 @@ self: {
        libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yices-easy" = callPackage
@@ -226410,7 +223435,6 @@ self: {
        homepage = "http://homepage3.nifty.com/salamander/second/projects/yjftp/index.xhtml";
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yjftp-libs" = callPackage
@@ -226498,7 +223522,6 @@ self: {
        ];
        description = "Generic Programming with Disbanded Data Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "york-lava" = callPackage
@@ -226511,7 +223534,6 @@ self: {
        homepage = "http://www.cs.york.ac.uk/fp/reduceron/";
        description = "A library for digital circuit description";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "youtube" = callPackage
@@ -226553,7 +223575,6 @@ self: {
        homepage = "https://github.com/fabianbergmark/YQL";
        description = "A YQL engine to execute Open Data Tables";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yst" = callPackage
@@ -226587,7 +223608,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Grids defined by layout hints and implemented on top of Yahoo grids";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yuuko" = callPackage
@@ -226611,7 +223631,6 @@ self: {
        homepage = "http://github.com/nfjinjing/yuuko";
        description = "A transcendental HTML parser gently wrapping the HXT library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yxdb-utils" = callPackage
@@ -226650,7 +223669,6 @@ self: {
        ];
        description = "Utilities for reading and writing Alteryx .yxdb files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "z3" = callPackage
@@ -226668,7 +223686,6 @@ self: {
        homepage = "http://bitbucket.org/iago/z3-haskell";
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gomp = null; inherit (pkgs) z3;};
 
   "zalgo" = callPackage
@@ -226700,7 +223717,6 @@ self: {
        homepage = "https://github.com/briansniffen/zampolit";
        description = "A tool for checking how much work is done on group projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zasni-gerna" = callPackage
@@ -226713,7 +223729,6 @@ self: {
        homepage = "https://skami.iocikun.jp/haskell/packages/zasni-gerna";
        description = "lojban parser (zasni gerna)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zcache" = callPackage
@@ -226762,7 +223777,6 @@ self: {
        homepage = "https://github.com/VictorDenisov/zendesk-api";
        description = "Zendesk API for Haskell programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zeno" = callPackage
@@ -226781,7 +223795,6 @@ self: {
        ];
        description = "An automated proof system for Haskell programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zero_0_1_2" = callPackage
@@ -226830,8 +223843,8 @@ self: {
      }:
      mkDerivation {
        pname = "zerobin";
-       version = "1.5.0";
-       sha256 = "f2ad48725b473c417f1b4c607b5e1f46e3d6fdfa50aaf15a576e86c8a020f318";
+       version = "1.5.1";
+       sha256 = "e0f3487d1c51344c76d4d24420c1ff74512a1e3add7425acca185657bf9c8e9a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -226844,7 +223857,6 @@ self: {
        jailbreak = true;
        description = "Post to 0bin services";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zeromq-haskell" = callPackage
@@ -226864,7 +223876,6 @@ self: {
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 2.1.x";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq3-conduit" = callPackage
@@ -226882,7 +223893,6 @@ self: {
        homepage = "https://github.com/NicolasT/zeromq3-conduit";
        description = "Conduit bindings for zeromq3-haskell";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zeromq3-haskell" = callPackage
@@ -226906,7 +223916,6 @@ self: {
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 3.x";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq4-haskell_0_6_2" = callPackage
@@ -226998,7 +224007,6 @@ self: {
        jailbreak = true;
        description = "ZeroTH - remove unnecessary TH dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zigbee-znet25" = callPackage
@@ -227150,7 +224158,6 @@ self: {
        homepage = "http://code.haskell.org/~byorgey/code/zipedit";
        description = "Create simple list editor interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zipkin" = callPackage
@@ -227376,7 +224383,6 @@ self: {
        homepage = "https://github.com/lucasdicioccio/zmcat";
        description = "Command-line tool for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zmidi-core" = callPackage
@@ -227425,7 +224431,6 @@ self: {
        ];
        description = "A socat-like tool for zeromq library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zoneinfo" = callPackage
@@ -227438,7 +224443,6 @@ self: {
        jailbreak = true;
        description = "ZoneInfo library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zoom" = callPackage
@@ -227459,7 +224463,6 @@ self: {
        homepage = "http://github.com/iand675/Zoom";
        description = "A rake/thor-like task runner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zoom-cache" = callPackage
@@ -227492,7 +224495,6 @@ self: {
        jailbreak = true;
        description = "A streamable, seekable, zoomable cache file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zoom-cache-pcm" = callPackage
@@ -227510,7 +224512,6 @@ self: {
        jailbreak = true;
        description = "Library for zoom-cache PCM audio codecs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zoom-cache-sndfile" = callPackage
@@ -227531,7 +224532,6 @@ self: {
        jailbreak = true;
        description = "Tools for generating zoom-cache-pcm files";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zoom-refs" = callPackage
@@ -227558,7 +224558,6 @@ self: {
        executableHaskellDepends = [ base monads-tf ];
        description = "Zot language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zsh-battery" = callPackage
@@ -227573,7 +224572,6 @@ self: {
        homepage = "https://github.com/MasseR/zsh-battery";
        description = "Ascii bars representing battery status";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ztail" = callPackage
@@ -227592,7 +224590,6 @@ self: {
        ];
        description = "Multi-file, colored, filtered log tailer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
 }

From 86c6d59f95e57ccea7b45bc00134f80140919f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 4 Mar 2016 06:43:11 -0300
Subject: [PATCH 258/338] font-manager: init at git-2016-03-02

---
 .../misc/font-manager/default.nix             | 69 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/applications/misc/font-manager/default.nix

diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
new file mode 100644
index 00000000000..a71e9c7ff92
--- /dev/null
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,
+  pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
+  vala, gnome3
+}:
+
+stdenv.mkDerivation rec {
+  name = "font-manager-${version}";
+  version = "git-2016-03-02";
+
+  src = fetchFromGitHub {
+    owner  = "FontManager";
+    repo   = "master";
+    rev    = "743fb83558c86bfbbec898106072f84422c175d6";
+    sha256 = "1sakss6irfr3d8k39x1rf72fmnpq47akhyrv3g45a3l6v6xfqp3k";
+    };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    makeWrapper
+    pkgconfig
+    automake autoconf libtool
+    file
+    intltool
+    libxml2
+    json_glib
+    sqlite
+    itstool
+    vala
+    gnome3.gtk
+    gnome3.gucharmap
+    gnome3.libgee
+    gnome3.file-roller
+    gnome3.yelp_tools
+  ];
+
+  preConfigure = ''
+    NOCONFIGURE=true ./autogen.sh
+    chmod +x configure;
+    substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file"
+  '';
+
+  configureFlags = "--disable-pycompile";
+
+  preFixup = ''
+    for prog in "$out/bin/"* "$out/libexec/font-manager/"*; do
+      wrapProgram "$prog" \
+        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = {
+    homepage = https://fontmanager.github.io/;
+    description = "Simple font management for GTK+ desktop environments";
+    longDescription = ''
+      Font Manager is intended to provide a way for average users to
+      easily manage desktop fonts, without having to resort to command
+      line tools or editing configuration files by hand. While designed
+      primarily with the Gnome Desktop Environment in mind, it should
+      work well with other Gtk+ desktop environments.
+
+      Font Manager is NOT a professional-grade font management solution.
+    '';
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+    repositories.git = https://github.com/FontManager/master;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eac026add04..184b16c2617 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12102,6 +12102,10 @@ let
 
   focuswriter = callPackage ../applications/editors/focuswriter { };
 
+  font-manager = callPackage ../applications/misc/font-manager {
+    vala = vala_0_28;
+  };
+
   foo-yc20 = callPackage ../applications/audio/foo-yc20 { };
 
   fossil = callPackage ../applications/version-management/fossil { };

From 9477c248fa1c8119f11cb809e17ce4414039abd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 4 Mar 2016 07:42:08 -0300
Subject: [PATCH 259/338] gsimplecal: init at 2.1

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

diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix
new file mode 100644
index 00000000000..975bc3b358d
--- /dev/null
+++ b/pkgs/applications/misc/gsimplecal/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "gsimplecal-${version}";
+  version = "2.1";
+
+  src = fetchurl {
+    url = "https://github.com/dmedvinsky/gsimplecal/archive/v${version}.tar.gz";
+    sha256 = "1sa05ifjp41xipfspk5n6l3wzpzmp3i45q88l01p4l6k6drsq336";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ pkgconfig automake autoconf gtk3 ];
+
+  preConfigure = "./autogen.sh";
+
+  meta = {
+    homepage = http://dmedvinsky.github.io/gsimplecal/;
+    description = "Lightweight calendar application written in C++ using GTK";
+    longDescription = ''
+      gsimplecal was intentionally made for use with tint2 panel in the
+      openbox environment to be launched upon clock click, but of course it
+      will work without it. In fact, binding the gsimplecal to some hotkey in
+      you window manager will probably make you happy. The thing is that when
+      it is started it first shows up, when you run it again it closes the
+      running instance. In that way it is very easy to integrate anywhere. No
+      need to write some wrapper scripts or whatever.
+
+      Also, you can configure it to not only show the calendar, but also
+      display multiple clocks for different world time zones.
+    '';
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eac026add04..8da003ec51f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12150,6 +12150,8 @@ let
     inherit (gnome) libgnome libgnomeui vte;
   };
 
+  gsimplecal = callPackage ../applications/misc/gsimplecal { };
+
   gtimelog = pythonPackages.gtimelog;
 
   inherit (gnome3) gucharmap;

From 15c4167d28a543b53b5f8021a0e22bf8bd4c4947 Mon Sep 17 00:00:00 2001
From: "Bruno Bzeznik Bruno.Bzeznik@imag.fr" <Bruno.Bzeznik@imag.fr>
Date: Fri, 4 Mar 2016 12:02:28 +0100
Subject: [PATCH 260/338] kanif: init at 1.2.2

---
 .../networking/cluster/kanif/default.nix      | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/kanif/default.nix

diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix
new file mode 100644
index 00000000000..bac0cc37af3
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kanif/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, perl , taktuk}:
+
+stdenv.mkDerivation rec {
+  version = "1.2.2";
+  name = "kanif-${version}";
+
+  propagateBuildInputs = [ perl taktuk ];
+
+  src = fetchurl {
+    url = "http://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz";
+    sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879";
+  };
+
+  preBuild = ''
+      substituteInPlace ./kanif --replace "/usr/bin/perl" "${perl}/bin/perl"
+      substituteInPlace ./kanif --replace '$taktuk_command = "taktuk";' '$taktuk_command = "${taktuk}/bin/taktuk";'
+  '';
+
+  meta = {
+    description = "Cluster management and administration swiss army knife";
+    longDescription = ''
+      Kanif is a tool for high performance computing clusters management and
+      administration. It combines the main functionalities of well-known cluster
+      management tools such as c3, pdsh and dsh, and mimics their syntax. It
+      provides three tools to run the same command on several nodes ("parallel
+      ssh", using the 'kash' command), to broadcast the copy of files or
+      directories to several nodes ('kaput' command), and to gather several
+      remote files or directories locally ('kaget' command). It relies on TakTuk
+      for efficiency and scalability.'';
+    homepage = http://taktuk.gforge.inria.fr/kanif;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.bzizou ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eac026add04..c47b434a1dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5338,6 +5338,8 @@ let
 
   davmail = callPackage ../applications/networking/davmail {};
 
+  kanif = callPackage ../applications/networking/cluster/kanif { };
+
   lxappearance = callPackage ../applications/misc/lxappearance {};
 
   kona = callPackage ../development/interpreters/kona {};

From 8dd642b688e72392f536f428a7f4e856010d8c5f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 14:16:38 +0300
Subject: [PATCH 261/338] octoprint-plugins.m3d-fio: 0.27.1 -> 0.29

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

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 39384e15a36..ba31d3fb342 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -8,13 +8,13 @@ in {
 
   m3d-fio = buildPlugin rec {
     name = "M3D-Fio-${version}";
-    version = "0.27.1";
+    version = "0.29";
 
     src = fetchFromGitHub {
       owner = "donovan6000";
       repo = "M3D-Fio";
       rev = "V${version}";
-      sha256 = "0jfb417wgdq6fzpxwq6xrrlpkndjwq69h4cdm0ixbyqkp7a3kcm2";
+      sha256 = "1ifbq7yibq42jjvqvklnx3qzr6vk2ngsxh3xhlbdrhqrg54gky4r";
     };
 
     patches = [

From 0077abe128bf08be982241b364481bb839748583 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 14:25:51 +0300
Subject: [PATCH 262/338] cppzmq: 20151203 -> 2016-01-20

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

diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index c8ab48288a1..62563cfb968 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "cppzmq-20151203";
+  name = "cppzmq-${version}";
+  version = "2016-01-20";
 
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "cppzmq";
-    rev = "7f7c83411d83eafe57ae6ffc2972ad9455ac258e";
-    sha256 = "1h6fl7mgkv98gz0csbp525a4bp1w9nwm059gwmmv1wqc1l741pv7";
+    rev = "68a7b09cfce01c4c279fba2cf91686fcfc566848";
+    sha256 = "00dsqqlm8mxhm8kfdspxfln0wzwkyywscnf264afw02k6xf28ndm";
   };
 
   installPhase = ''

From 750e6f0b63ef5a787d1fd3e7cd89b63585a1ef86 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 14:33:17 +0300
Subject: [PATCH 263/338] vc: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index c96c2c47cb9..f73f35a2376 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.0";
+  version = "1.2.0";
   name = "Vc-${version}";
 
   src = fetchFromGitHub {
     owner = "VcDevel";
     repo = "Vc";
     rev = version;
-    sha256 = "1i27zpwcpsfabvf1vpyx5rlzkkgqfd55c3c0jq5fghywyj6743j8";
+    sha256 = "0qlfvcxv3nmf5drz5bc9kynaljr513pbn7snwgvghm150skmkpfl";
   };
 
   nativeBuildInputs = [ cmake ];

From c0e310f4ebcff1687e68a5717cbdc29ef73b50dc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 14:36:27 +0300
Subject: [PATCH 264/338] libvdpau-va-gl: 0.3.4 -> 0.3.6

---
 .../libraries/libvdpau-va-gl/default.nix           | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix
index 51fb858d8be..0cbac567a45 100644
--- a/pkgs/development/libraries/libvdpau-va-gl/default.nix
+++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libvdpau, glib
-, libva, ffmpeg, mesa_glu }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp
+, libXext, libvdpau, glib, libva, ffmpeg, mesa_glu }:
 
-let
-  version = "0.3.4";
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "libvdpau-va-gl-${version}";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "i-rinat";
     repo = "libvdpau-va-gl";
     rev = "v${version}";
-    sha256 = "1909f3srm2iy2hv4m6jxg1nxrh9xgsnjs07wfzw3ais1fww0i2nn";
+    sha256 = "06lcg6zfj6mn17svz7s0y6ijdah55l9rnp9r440lcbixivjbgyn5";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ libX11 libpthreadstubs libvdpau glib libva ffmpeg mesa_glu ];
+  buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg mesa_glu ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/i-rinat/libvdpau-va-gl;

From 224c24f0302f38c0d0c816c3b20d3f54c907d70d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 14:58:13 +0300
Subject: [PATCH 265/338] dwarf-fortress-packages.dwarf-fortress-original:
 0.42.05 -> 0.42.06

---
 pkgs/games/dwarf-fortress/game.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 7e0c1b34af7..0665075356c 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -4,7 +4,7 @@
 
 let
   baseVersion = "42";
-  patchVersion = "05";
+  patchVersion = "06";
   dfVersion = "0.${baseVersion}.${patchVersion}";
   libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2";
-    sha256 = "0g7r0v2lsqj9ryxh12q8yrk96bgs00rf2ncw228cwwqgmps3xcws";
+    sha256 = "17y9zq9xn1g0a501w4vkinb0n2yjiczsi2g7r6zggr41pxrqxpq3";
   };
 
   installPhase = ''
@@ -43,6 +43,7 @@ stdenv.mkDerivation {
     description = "A single-player fantasy game with a randomly generated adventure world";
     homepage = http://www.bay12games.com/dwarves;
     license = lib.licenses.unfreeRedistributable;
+    platforms = [ "i686-linux" ];
     maintainers = with lib.maintainers; [ a1russell robbinch roconnor the-kenny abbradar ];
   };
 }

From 9ec2fda2c2e67ffc5720b7fadd99aadbead76c7a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:01:52 +0300
Subject: [PATCH 266/338] dwarf-fortress-packages.dwarf-fortress-unfuck:
 0.42.05 -> 0.42.06

---
 pkgs/games/dwarf-fortress/unfuck.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 92f4a954330..d4e637a7caf 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchgit, cmake
+{ stdenv, fetchFromGitHub, cmake
 , mesa, SDL, SDL_image, SDL_ttf, glew, openalSoft
 , ncurses, glib, gtk2, libsndfile
 }:
 
 stdenv.mkDerivation {
-  name = "dwarf_fortress_unfuck-20160118";
+  name = "dwarf_fortress_unfuck-2016-02-11";
 
-  src = fetchgit {
-    url = "https://github.com/svenstaro/dwarf_fortress_unfuck";
-    rev = "9a796c6d3cd7d41784e9d1d22a837a1ee0ff8553";
-    sha256 = "0ibxdn684zpk3v2gigardq6z9mydc2s9hns8hlxjyyyhnk1ar61g";
+  src = fetchFromGitHub {
+    owner = "svenstaro";
+    repo = "dwarf_fortress_unfuck";
+    rev = "2ba59c87bb63bea598825a73bdc896b0e041e2d5";
+    sha256 = "0q2rhigvaabdknmb2c84gg71qz7xncmx04npzx4bki9avyxsrpcl";
   };
 
   cmakeFlags = [
@@ -29,7 +30,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  passthru.dfVersion = "0.42.05";
+  passthru.dfVersion = "0.42.06";
 
   meta = with stdenv.lib; {
     description = "Unfucked multimedia layer for Dwarf Fortress";

From 414dbc6dd99ad21d2925d67d415c4404a1c76990 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:02:21 +0300
Subject: [PATCH 267/338] dwarf-fortress-packages.dwarf-therapist: 36.0.0 ->
 37.0.0

---
 pkgs/games/dwarf-fortress/default.nix                 |  2 +-
 pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index bc0b97b139b..deb7f1709fb 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -20,7 +20,7 @@ let
       };
     };
 
-    dwarf-therapist-original = callPackage ./dwarf-therapist {
+    dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist {
       texlive = pkgs.texlive.combine {
         inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
       };
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 07714168e0e..9f0d5196b6d 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, coreutils, qt4, texlive }:
+{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, texlive }:
 
 let
-  version = "36.0.0";
+  version = "37.0.0";
 in
 stdenv.mkDerivation {
   name = "dwarf-therapist-original-${version}";
@@ -10,11 +10,11 @@ stdenv.mkDerivation {
     owner = "splintermind";
     repo = "Dwarf-Therapist";
     rev = "v${version}";
-    sha256 = "08xjawb25sibkkfqwd4mlq73dgmgc6lxbbd673rx7yhrsjh4z4h3";
+    sha256 = "0dw86b4x5hjhb7h4ynvwjgcinpqywfc5l48ljb5sahz08rfnx63d";
   };
 
   outputs = [ "out" "layouts" ];
-  buildInputs = [ qt4 ];
+  buildInputs = [ qtbase qtdeclarative ];
   nativeBuildInputs = [ texlive ];
 
   enableParallelBuilding = false;
@@ -35,6 +35,6 @@ stdenv.mkDerivation {
     maintainers = with stdenv.lib.maintainers; [ the-kenny abbradar ];
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
-    homepage = https://code.google.com/r/splintermind-attributes/;
+    homepage = "https://github.com/splintermind/Dwarf-Therapist";
   };
 }

From 973d31196ce9a97fe8c42d4d2a4998e5e8776d82 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:02:36 +0300
Subject: [PATCH 268/338] dwarf-fortress-packages.cla-theme: bump dfVersion

---
 pkgs/games/dwarf-fortress/themes/cla.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix
index 09b2cc8b647..39b7e5d2a4c 100644
--- a/pkgs/games/dwarf-fortress/themes/cla.nix
+++ b/pkgs/games/dwarf-fortress/themes/cla.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp -r data raw $out
   '';
 
-  passthru.dfVersion = "0.42.05";
+  passthru.dfVersion = "0.42.06";
 
   preferLocalBuild = true;
 

From 415c2edbbe30013607f2a886515891b05650a7d9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:02:42 +0300
Subject: [PATCH 269/338] dwarf-fortress-packages.phoebus-theme: bump dfVersion

---
 pkgs/games/dwarf-fortress/themes/phoebus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix
index ca459c6ef76..8fd9a7dbf04 100644
--- a/pkgs/games/dwarf-fortress/themes/phoebus.nix
+++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp -r data raw $out
   '';
 
-  passthru.dfVersion = "0.42.05";
+  passthru.dfVersion = "0.42.06";
 
   preferLocalBuild = true;
 

From e3d9bdf8f8c571510fce1733e8b5b885b1a42eb5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:13:26 +0300
Subject: [PATCH 270/338] ioquake3: 20151228 -> 2016-02-18

---
 pkgs/games/quake3/ioquake/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index f9f4b21546f..8988c391824 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -1,14 +1,16 @@
-{ lib, stdenv, fetchgit, xlibsWrapper, SDL2, mesa, openalSoft
+{ lib, stdenv, fetchFromGitHub, xlibsWrapper, SDL2, mesa, openalSoft
 , curl, speex, opusfile, libogg, libopus, libjpeg, mumble, freetype
 }:
 
-stdenv.mkDerivation {
-  name = "ioquake3-git-20151228";
+stdenv.mkDerivation rec {
+  name = "ioquake3-git-${version}";
+  version = "2016-02-18";
 
-  src = fetchgit {
-    url = "https://github.com/ioquake/ioq3";
-    rev = "fe619680f8fa9794906fc82a9c8c6113770696e6";
-    sha256 = "5462441df63eebee6f8ed19a8326de5f874dad31e124d37f73d3bab1cd656a87";
+  src = fetchFromGitHub {
+    owner = "ioquake";
+    repo = "ioq3";
+    rev = "a331637745fb82266f3627fb438f2d58d53e366c";
+    sha256 = "0l9ppv1msd73bhqmdiv5lsvkr5i6khqgi6gi322gbnndr20arn4n";
   };
 
   buildInputs = [ xlibsWrapper SDL2 mesa openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ];

From 5b4de73b8faade520c8dff4bd6733e1730a80be4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:28:28 +0300
Subject: [PATCH 271/338] steamPackages.steam-original: 1.0.0.49 -> 1.0.0.51

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

diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index b41847c25ba..b8e1982a989 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -2,14 +2,14 @@
 
 let
   traceLog = "/tmp/steam-trace-dependencies.log";
-  version = "1.0.0.49";
+  version = "1.0.0.51";
 
 in stdenv.mkDerivation rec {
   name = "steam-original-${version}";
 
   src = fetchurl {
     url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
-    sha256 = "1c1gl5pwvb5gnnnqf5d9hpcjnfjjgmn4lgx8v0fbx1am5xf3p2gx";
+    sha256 = "1ghrfznm9rckm8v87zvh7hx820r5pp7sq575wxwq0fncbyq6sxmz";
   };
 
   makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];

From d8ed77d96d630dce02bc3703790b942c495ffd41 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:33:13 +0300
Subject: [PATCH 272/338] dwarf-fortress-packages.dfhack: 20160118 ->
 2016-03-03

---
 pkgs/games/dwarf-fortress/dfhack/default.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 92b9d57da42..aaed6b8fd2d 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -5,28 +5,36 @@
 }:
 
 let
-  rev = "f61ff9147e00f3c379ac0458e79eb556a5de1b68";
-  dfVersion = "0.42.05";
+  rev = "5e2fc5662115499c10bfcd8a6105a1efe4de081c";
+  xmlRev = "f371e293002f8f6d1e4704cc5869ca07ccf6c4d5";
+  dfVersion = "0.42.06";
 
   fakegit = writeScriptBin "git" ''
     #! ${stdenv.shell}
     if [ "$*" = "describe --tags --long" ]; then
       echo "${dfVersion}-unknown"
     elif [ "$*" = "rev-parse HEAD" ]; then
-      echo "${rev}"
+      if [ "$(dirname "$(pwd)")" = "xml" ]; then
+        echo "${xmlRev}"
+      else
+        echo "${rev}"
+      fi
+    elif [ "$*" = "rev-parse HEAD:library/xml" ]; then
+      echo "${xmlRev}"
     else
       exit 1
     fi
   '';
 
-in stdenv.mkDerivation {
-  name = "dfhack-20160118";
+in stdenv.mkDerivation rec {
+  name = "dfhack-${version}";
+  version = "2016-03-03";
 
   # Beware of submodules
   src = fetchgit {
     url = "https://github.com/DFHack/dfhack";
     inherit rev;
-    sha256 = "1ah3cplp4mb9pq7rm1cmn8klfjxw3y2xfzy7734i81b3iwiwlpi4";
+    sha256 = "143zkx6hqpqxjhjd1bllg2kfia215x63zifkhgzycg49kw4wkxi5";
   };
 
   patches = [ ./use-system-libraries.patch ];

From 7482f131ed2ada1edf9b74a7b413b1821d7e65f9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:37:12 +0300
Subject: [PATCH 273/338] android-udev-rules: 20151209 -> 2016-03-03

---
 pkgs/os-specific/linux/android-udev-rules/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index d4acceb5262..5e3fb1c2ba0 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation {
-  name = "android-udev-rules-20151209";
+stdenv.mkDerivation rec {
+  name = "android-udev-rules-${version}";
+  version = "2016-03-03";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
-    rev = "b22717d2337f991787ab687f6d0258207c6ad288";
-    sha256 = "1z03nlqj68bxs163jmn66j3n0ywwar5bihpsz5ag8ak3nn2d3fp2";
+    rev = "a6ec1239173bfbe2082211261528e834af9fbb64";
+    sha256 = "11g7m8jjxxzyrbsd9g7cbk6bwy3c4f76pdy4lvdx68xrbsl2rvmj";
   };
 
   installPhase = ''

From d7a98cb693b259e8e9cfa5271a4183f388083092 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:39:50 +0300
Subject: [PATCH 274/338] postsrsd: 1.3 -> 1.4

---
 pkgs/servers/mail/postsrsd/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix
index 18c21ffc815..4eeb8009558 100644
--- a/pkgs/servers/mail/postsrsd/default.nix
+++ b/pkgs/servers/mail/postsrsd/default.nix
@@ -1,16 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, help2man }:
 
-let
-  version = "1.3";
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "postsrsd-${version}";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "roehling";
     repo = "postsrsd";
     rev = version;
-    sha256 = "1z89qh2bnypgb4i2vs0zdzzpqlf445jixwa1acd955hryww50npv";
+    sha256 = "09yzb0fvnbfy534maqlqk79c41p1yz8r9f73n7bahm5lwd0livk9";
   };
 
   cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ];

From 01a3b6c0591ee3bf4966658d29d4c149a5f94d34 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:42:12 +0300
Subject: [PATCH 275/338] uwsgi: 2.0.11.2 -> 2.0.12

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

diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 2d447d3c82a..181518c2d7a 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -32,11 +32,12 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else
 in
 
 stdenv.mkDerivation rec {
-  name = "uwsgi-2.0.11.2";
+  name = "uwsgi-${version}";
+  version = "2.0.12";
 
   src = fetchurl {
     url = "http://projects.unbit.it/downloads/${name}.tar.gz";
-    sha256 = "0p482j4yi48bmpgx1qpdfk86hjn4dswb137jbmigdlrd9l5rp20b";
+    sha256 = "02g46dnw5j1iw8fsq392bxbk8d21b9pdgb3ypcinv3b4jzdm2srh";
   };
 
   nativeBuildInputs = [ python3 pkgconfig ];

From 2a7f56bc8fd19e30516e083b42a820e4cc9c3a87 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:55:55 +0300
Subject: [PATCH 276/338] virtualgl: 2.4.1 -> 2.5

---
 pkgs/tools/X11/virtualgl/default.nix | 19 ++++++++-----------
 pkgs/tools/X11/virtualgl/lib.nix     | 10 +++++-----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix
index 7203229c47b..e30badd0a85 100644
--- a/pkgs/tools/X11/virtualgl/default.nix
+++ b/pkgs/tools/X11/virtualgl/default.nix
@@ -1,22 +1,19 @@
-{ lib, buildEnv
+{ stdenv, lib
 , virtualglLib
 , virtualglLib_i686 ? null
 }:
 
-buildEnv {
+stdenv.mkDerivation {
   name = "virtualgl-${lib.getVersion virtualglLib}";
 
   paths = [ virtualglLib ];
 
-  postBuild = lib.optionalString (virtualglLib_i686 != null) ''
-    rm $out/fakelib
-    # workaround for #4621
-    rm $out/bin
-    mkdir $out/bin
-    for i in ${virtualglLib}/bin/*; do
-      ln -s $i $out/bin
+  buildCommand = ''
+    mkdir -p $out/bin
+    for i in ${virtualglLib}/bin/* ${virtualglLib}/bin/.vglrun*; do
+      ln -s "$i" $out/bin
     done
-    ln -s ${virtualglLib}/bin/.vglrun.vars64 $out/bin
-    ln -s ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin
+  '' + lib.optionalString (virtualglLib_i686 != null) ''
+    ln -sf ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin
   '';
 }
diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index 5c4456f6348..2df037229ea 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -1,14 +1,12 @@
 { stdenv, fetchurl, cmake, mesa, libX11, libXv, libjpeg_turbo, fltk }:
 
-let
-  version = "2.4.1";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "virtualgl-lib-${version}";
+  version = "2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz";
-    sha256 = "0bngb4hrl0kn19qb3sa6mg6dbaahfk09gx2ng18l00xm6pmwd298";
+    sha256 = "1mnpljmx8nxnmpbx4ja430b3y535wkz185qknsxmk27yz4dbmm8l";
   };
 
   cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ];
@@ -19,6 +17,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ libjpeg_turbo mesa fltk libX11 libXv ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://www.virtualgl.org/;
     description = "X11 GL rendering in a remote computer with full 3D hw acceleration";

From 364423f38c4f2804fb4cc51a95e1aa6c08afcd7b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 17:00:54 +0300
Subject: [PATCH 277/338] ejabberd: 16.01 -> 16.02

---
 pkgs/servers/xmpp/ejabberd/default.nix | 207 ++++++++++++-------------
 1 file changed, 103 insertions(+), 104 deletions(-)

diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index f1fa6bed00c..1f3f85e8276 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -8,7 +8,6 @@
 , withRiak ? false
 , withElixir ? false, elixir
 , withIconv ? true
-, withLager ? true
 , withTools ? false
 , withRedis ? false
 }:
@@ -27,90 +26,109 @@ let
   # Some dependencies are from another packages. Try commenting them out; then during build
   # you'll get necessary revision information.
   ejdeps = {
-    cache_tab = fetchFromGitHub {
-      owner = "processone";
-      repo = "cache_tab";
-      rev = "1.0.1";
-      sha256 = "1mq5vgqskb0v2pdn6i3610hzd9iyjznh8143pdbz8z57rrhxpxg4";
+    lager = fetchFromGitHub {
+      owner = "basho";
+      repo = "lager";
+      rev = "3.0.2";
+      sha256 = "04l40dlqpl2y6ddpbpknmnjf537bjvrmg8r0jnmw1h60dgyb2ydk";
     };
-    p1_tls = fetchFromGitHub {
-      owner = "processone";
-      repo = "tls";
-      rev = "1.0.0";
-      sha256 = "1q6l5drgmwj4fp4nfh0075lczplia4n40sirk9pd5x76d59qcmnj";
-    };
-    p1_stringprep = fetchFromGitHub {
-      owner = "processone";
-      repo = "stringprep";
-      rev = "1.0.0";
-      sha256 = "105xc0af61xrd4vjxrg49gxbij8x0fq4yribywa8qly303d1nwwa";
-    };
-    p1_xml = fetchFromGitHub {
-      owner = "processone";
-      repo = "xml";
-      rev = "1.1.1";
-      sha256 = "07zxc8ky78sd2mcbhhrxha68arbbk8vyayn9gwi402avnqcic7cx";
-    };
-    esip = fetchFromGitHub {
-      owner = "processone";
-      repo = "p1_sip";
-      rev = "1.0.0";
-      sha256 = "02k920995b0js6srarx0rabavs428rl0dp7zz90x74l8b589zq9a";
-    };
-    p1_stun = fetchFromGitHub {
-      owner = "processone";
-      repo = "stun";
-      rev = "0.9.0";
-      sha256 = "0ghf2p6z1m55f5pm4pv5gj7h7fdcwcsyqz1wzax4w8bgs9id06dm";
-    };
-    p1_yaml = fetchFromGitHub {
-      owner = "processone";
-      repo = "p1_yaml";
-      rev = "1.0.0";
-      sha256 = "0is0vr8ygh3fbiyf0jb85cfpfakxmx31fqk6s4j90gmfhlbm16f8";
+    # dependency of lager
+    goldrush = fetchFromGitHub {
+      owner = "DeadZen";
+      repo = "goldrush";
+      rev = "0.1.7";
+      sha256 = "1104j8v86hdavxf08yjyjkpi5vf95rfvsywdx29c69x3z33i4z3m";
     };
     p1_utils = fetchFromGitHub {
       owner = "processone";
       repo = "p1_utils";
+      rev = "1.0.3";
+      sha256 = "0bw163wx0ji2sz7yb3nzvm1mnnljsdji606xzk33za8c4sgrb4nj";
+    };
+    cache_tab = fetchFromGitHub {
+      owner = "processone";
+      repo = "cache_tab";
       rev = "1.0.2";
-      sha256 = "11b71bnc90riy1qplkpwx6l1yr9849jai3ckri35cavfsk35j687";
+      sha256 = "1krgn6y95jgc8pc0vkj36p0wcazsb8b6h1x4f0r1936jff2vqk33";
+    };
+    fast_tls = fetchFromGitHub {
+      owner = "processone";
+      repo = "fast_tls";
+      rev = "1.0.1";
+      sha256 = "08lh6935k590hix3z69kjjd75w68vmmjcx7gi4zh8j7li4v9k9l2";
+    };
+    stringprep = fetchFromGitHub {
+      owner = "processone";
+      repo = "stringprep";
+      rev = "1.0.2";
+      sha256 = "1wrisajyll45wf6cz1rb2q70sz83i6nfnfiijsbzhy0xk51436sa";
+    };
+    fast_xml = fetchFromGitHub {
+      owner = "processone";
+      repo = "fast_xml";
+      rev = "1.1.3";
+      sha256 = "1a2k21fqz8rp4laz7wn0hsxy58i1gdwc3qhw3k2kar8lgw4m3wqp";
+    };
+    stun = fetchFromGitHub {
+      owner = "processone";
+      repo = "stun";
+      rev = "1.0.1";
+      sha256 = "0bq0qkc7h3nhqxa6ff2nf6bi4kiax4208716hxfz6l1vxrh7f3p2";
+    };
+    esip = fetchFromGitHub {
+      owner = "processone";
+      repo = "esip";
+      rev = "1.0.2";
+      sha256 = "0ibvb85wkqw81y154bagp0kgf1jmdscmfq8yk73j1k986dmiqfn2";
+    };
+    fast_yaml = fetchFromGitHub {
+      owner = "processone";
+      repo = "fast_yaml";
+      rev = "1.0.2";
+      sha256 = "019imn255bkkvilg4nrcidl8w6dn2jrb2nyrs2nixsgcbmvkdl5k";
     };
     jiffy = fetchFromGitHub {
       owner = "davisp";
       repo = "jiffy";
-      rev = "0.14.5";
-      sha256 = "1xs01cl4gq1x6sjj7d1qgg4iq9iwzv3cjqjrj0kr7rqrbfqx2nq3";
+      rev = "0.14.7";
+      sha256 = "1w55vwz4a94v0aajm3lg6nlhpw2w0zdddiw36f2n4sfhbqn0v0jr";
     };
-    oauth2 = fetchFromGitHub {
-      owner = "kivra";
-      repo = "oauth2";
-      rev = "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8";
-      sha256 = "0mbmw6668l945iqppba991793nmmkyvvf18zxgdahxcwgxg1majn";
+    p1_oauth2 = fetchFromGitHub {
+      owner = "processone";
+      repo = "p1_oauth2";
+      rev = "0.6.1";
+      sha256 = "1wvmi3fj05hlbi3sbqpakznq70n76a7nbvbrjhr8k79bmvsh6lyl";
     };
-    xmlrpc = fetchFromGitHub {
-      owner = "rds13";
-      repo = "xmlrpc";
-      rev = "1.15";
-      sha256 = "0ihwag2hgw9rswxygallc4w1yipgpd6arw3xpr799ib7ybsn8x81";
+    p1_xmlrpc = fetchFromGitHub {
+      owner = "processone";
+      repo = "p1_xmlrpc";
+      rev = "1.15.1";
+      sha256 = "12pfvb3k9alzg7qbph3bc1sw7wk86psm3jrdrfclq90zlpwqa0w3";
+    };
+    luerl = fetchFromGitHub {
+      owner = "rvirding";
+      repo = "luerl";
+      rev = "9524d0309a88b7c62ae93da0b632b185de3ba9db";
+      sha256 = "15yplmv2xybnz3nby940752jw672vj99l1j61rrfy686hgrfnc42";
     };
 
     p1_mysql = fetchFromGitHub {
       owner = "processone";
-      repo = "mysql";
-      rev = "1.0.0";
-      sha256 = "1v3g75hhfpv5bnrar23y7lsk3pd02xl5cy4mj13j0qxl6bc4dgss";
+      repo = "p1_mysql";
+      rev = "1.0.1";
+      sha256 = "17122xhc420kqfsv4c4g0jcllpdbhg84wdlwd3227w4q729jg6bk";
     };
     p1_pgsql = fetchFromGitHub {
       owner = "processone";
-      repo = "pgsql";
-      rev = "1.0.0";
-      sha256 = "1r7dkjzxhwplmhvgvdx990xn98gpslckah5jpkx8c2gm9nj3xi33";
+      repo = "p1_pgsql";
+      rev = "1.0.1";
+      sha256 = "1ca0hhxyfmwjp49zjga1fdhrbaqnxdpmcvs2i6nz6jmapik788nr";
     };
     sqlite3 = fetchFromGitHub {
-      owner = "alexeyr";
+      owner = "processone";
       repo = "erlang-sqlite3";
-      rev = "cbc3505f7a131254265d3ef56191b2581b8cc172";
-      sha256 = "1xrvygv0zhslsqf8044m5ml1zr6di7znvv2zycg3amsz190w0w2g";
+      rev = "1.1.5";
+      sha256 = "17n4clysg540nx9g8k8mi9l7vkz8wigycgxmzzn0wmgxdf6mhxlb";
     };
     p1_pam = fetchFromGitHub {
       owner = "processone";
@@ -118,11 +136,11 @@ let
       rev = "1.0.0";
       sha256 = "0dlbmfwndhyg855vnhwyccxcjqzf2wcgc7522mjb9q38cva50rpr";
     };
-    p1_zlib = fetchFromGitHub {
+    ezlib = fetchFromGitHub {
       owner = "processone";
-      repo = "zlib";
-      rev = "1.0.0";
-      sha256 = "1a6m7wz6cbb8526fwhmgm7mva62absmvyjm8cjnq7cs0mzp18r0m";
+      repo = "ezlib";
+      rev = "1.0.1";
+      sha256 = "1asp7s2q72iql870igc827dvi9iqyd6lhs0q3jbjj2w7xfz4x4kk";
     };
     hamcrest = fetchFromGitHub {
       owner = "hyperthunk";
@@ -150,42 +168,23 @@ let
       rev = "0.8.2";
       sha256 = "0w4jmsnc9x2ykqh1q6b12pl8a9973dxdhqk3y0ph17n83q5xz3h7";
     };
-    rebar_elixir_plugin = fetchFromGitHub {
-      owner = "processone";
-      repo = "rebar_elixir_plugin";
-      rev = "0.1.0";
-      sha256 = "0x04ff53mxwd9va8nl4m70dbamp6p4dpxs646c168iqpnpadk3sk";
-    };
     elixir = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "elixir";
       rev = "v1.1.0";
       sha256 = "0r5673x2qdvfbwmvyvj8ddvzgxnkl3cv9jsf1yzsxgdifjbrzwx7";
     };
-    p1_iconv = fetchFromGitHub {
+    rebar_elixir_plugin = fetchFromGitHub {
       owner = "processone";
-      repo = "eiconv";
-      rev = "0.9.0";
-      sha256 = "1ikccpj3aq6mip6slrq8c7w3kilpb82dr1jdy8kwajmiy9cmsq97";
+      repo = "rebar_elixir_plugin";
+      rev = "0.1.0";
+      sha256 = "0x04ff53mxwd9va8nl4m70dbamp6p4dpxs646c168iqpnpadk3sk";
     };
-    lager = fetchFromGitHub {
-      owner = "basho";
-      repo = "lager";
-      rev = "3.0.2";
-      sha256 = "04l40dlqpl2y6ddpbpknmnjf537bjvrmg8r0jnmw1h60dgyb2ydk";
-    };
-    # dependency of lager
-    goldrush = fetchFromGitHub {
-      owner = "DeadZen";
-      repo = "goldrush";
-      rev = "0.1.7";
-      sha256 = "1104j8v86hdavxf08yjyjkpi5vf95rfvsywdx29c69x3z33i4z3m";
-    };
-    p1_logger = fetchFromGitHub {
+    iconv = fetchFromGitHub {
       owner = "processone";
-      repo = "p1_logger";
+      repo = "iconv";
       rev = "1.0.0";
-      sha256 = "0z11xsr139a75w09syjws4sja6ky2l9rsrwkjr6wcl7p1jz02h4r";
+      sha256 = "0dfc23m2lqilj8ixn23wpj5xp1mgajb9b5ch95riigxzxmx97ri9";
     };
     meck = fetchFromGitHub {
       owner = "eproxus";
@@ -203,12 +202,12 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  version = "16.01";
+  version = "16.02";
   name = "ejabberd-${version}";
 
   src = fetchurl {
     url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
-    sha256 = "10fnsw52gxybw731yka63ma8mj39g4i0nsancwp9nlvhb2flgk72";
+    sha256 = "0yiai7zyjdcp0ppc5l5p56bxhg273hwfbv41qlbkg32dhr880f4q";
   };
 
   nativeBuildInputs = [ fakegit ];
@@ -224,17 +223,17 @@ in stdenv.mkDerivation rec {
   LANG = "en_US.UTF-8";
 
   depsNames =
-    [ "cache_tab" "p1_tls" "p1_stringprep" "p1_xml" "esip" "p1_stun" "p1_yaml" "p1_utils" "jiffy" "oauth2" "xmlrpc" ]
+    [ "lager" "goldrush" "p1_utils" "cache_tab" "fast_tls" "stringprep" "fast_xml" "stun" "esip" "fast_yaml"
+      "jiffy" "p1_oauth2" "p1_xmlrpc" "luerl"
+    ]
     ++ lib.optional withMysql "p1_mysql"
     ++ lib.optional withPgsql "p1_pgsql"
     ++ lib.optional withSqlite "sqlite3"
     ++ lib.optional withPam "p1_pam"
-    ++ lib.optional withZlib "p1_zlib"
+    ++ lib.optional withZlib "ezlib"
     ++ lib.optionals withRiak [ "hamcrest" "riakc" "riak_pb" "protobuffs" ]
-    ++ lib.optionals withElixir [ "rebar_elixir_plugin" "elixir" ]
-    ++ lib.optional withIconv "p1_iconv"
-    ++ lib.optionals withLager [ "lager" "goldrush" ]
-    ++ lib.optional (!withLager) "p1_logger"
+    ++ lib.optionals withElixir [ "elixir" "rebar_elixir_plugin" ]
+    ++ lib.optional withIconv "iconv"
     ++ lib.optional withTools "meck"
     ++ lib.optional withRedis "eredis"
   ;
@@ -248,7 +247,6 @@ in stdenv.mkDerivation rec {
       (lib.enableFeature withRiak "riak")
       (lib.enableFeature withElixir "elixir")
       (lib.enableFeature withIconv "iconv")
-      (lib.enableFeature withLager "lager")
       (lib.enableFeature withTools "tools")
       (lib.enableFeature withRedis "redis")
     ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite}";
@@ -288,8 +286,9 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "Open-source XMPP application server written in Erlang";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     homepage = http://www.ejabberd.im;
-    maintainers = [ lib.maintainers.sander ];
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.sander lib.maintainers.abbradar ];
   };
 }

From 2f07ae9136110a0209243f99b2e1fa93ba2f1eb0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 17:04:17 +0300
Subject: [PATCH 278/338] steamPackages.steam-runtime: 2016-02-18 -> 2016-03-03

---
 pkgs/games/steam/runtime-generated.nix | 36 +++++++++++++-------------
 pkgs/games/steam/runtime.nix           |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix
index 9b94f56c796..854796cac3e 100644
--- a/pkgs/games/steam/runtime-generated.nix
+++ b/pkgs/games/steam/runtime-generated.nix
@@ -85,18 +85,18 @@
       };
     }
     rec {
-      name = "libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_amd64";
-      md5 = "11add9186e7d6a171a95fea6b0d15a01";
-      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_amd64.deb";
+      name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64";
+      md5 = "9e32b15b95be699bc9270dac78fd384c";
+      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url md5;
         name = "libasound2.deb";
       };
     }
     rec {
-      name = "libasound2-plugins_1.0.25-1ubuntu1+srt4_amd64";
-      md5 = "d4c4fad47ef8f25a8f521f4af9b7fa59";
-      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.0.25-1ubuntu1+srt4_amd64.deb";
+      name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64";
+      md5 = "82b9f608c4e02ae70542466690ddb904";
+      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64.deb";
       source = fetchurl {
         inherit url md5;
         name = "libasound2-plugins.deb";
@@ -967,9 +967,9 @@
       };
     }
     rec {
-      name = "libsdl2_2.0.4+steamrt1+srt1_amd64";
-      md5 = "95ea5d6fb188e0ef66881e699cbf95b2";
-      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt1+srt1_amd64.deb";
+      name = "libsdl2_2.0.4+steamrt2+srt1_amd64";
+      md5 = "b648fbaea74b0d76b020c6abb78b46ce";
+      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_amd64.deb";
       source = fetchurl {
         inherit url md5;
         name = "libsdl2.deb";
@@ -1824,18 +1824,18 @@
       };
     }
     rec {
-      name = "libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_i386";
-      md5 = "306ee9c004c5677442661dfdc1617911";
-      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_i386.deb";
+      name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386";
+      md5 = "b9712e5765c6dc66683e4c7f62090a71";
+      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url md5;
         name = "libasound2.deb";
       };
     }
     rec {
-      name = "libasound2-plugins_1.0.25-1ubuntu1+srt4_i386";
-      md5 = "8afcb694c51af22d48366d8d0ee11738";
-      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.0.25-1ubuntu1+srt4_i386.deb";
+      name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_i386";
+      md5 = "eee45bd08e763a5e702707a87b2ee127";
+      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_i386.deb";
       source = fetchurl {
         inherit url md5;
         name = "libasound2-plugins.deb";
@@ -2706,9 +2706,9 @@
       };
     }
     rec {
-      name = "libsdl2_2.0.4+steamrt1+srt1_i386";
-      md5 = "b88ec76ac0c55871648c51749ba2e661";
-      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt1+srt1_i386.deb";
+      name = "libsdl2_2.0.4+steamrt2+srt1_i386";
+      md5 = "e56c66c0719d067589f7f13e01815274";
+      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_i386.deb";
       source = fetchurl {
         inherit url md5;
         name = "libsdl2.deb";
diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix
index 1de2dd9f24c..9236243427a 100644
--- a/pkgs/games/steam/runtime.nix
+++ b/pkgs/games/steam/runtime.nix
@@ -9,7 +9,7 @@ let arch = if stdenv.system == "x86_64-linux" then "amd64"
     inputFile = writeText "steam-runtime.json" (builtins.toJSON input);
 
 in stdenv.mkDerivation {
-  name = "steam-runtime-2016-02-18";
+  name = "steam-runtime-2016-03-03";
 
   nativeBuildInputs = [ python2 dpkg binutils ];
 

From 1e51364dd585c2cbc8b1a33b98965feb4ca066bd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 27 Feb 2016 14:09:44 +0300
Subject: [PATCH 279/338] spin: 6.4.3 -> 6.4.5

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

diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index f1295060d3c..29559bf8b0e 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -2,13 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "spin-${version}";
-  version = "6.4.3";
+  version = "6.4.5";
   url-version = stdenv.lib.replaceChars ["."] [""] version;
 
   src = fetchurl {
-    url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz";
-    curlOpts = "--user-agent 'Mozilla/5.0'";
-    sha256 = "0cldhxvfw6llh4spcx0x0535pffx89pvvxpdi0bpqy9a6da85ln1";
+    # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL.
+    # Dropbox mirror from developers:
+    # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa
+    url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AAANRpxsSyWC7iHZB-XgBwJFa/spin645.tar.gz?raw=1";
+    sha256 = "0x8qnwm2xa8f176c52mzpvnfzglxs6xgig7bcgvrvkb3xf114224";
   };
 
   buildInputs = [ yacc ];
@@ -20,7 +22,8 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Formal verification tool for distributed software systems";
     homepage = http://spinroot.com/;
-    license = stdenv.lib.licenses.free;
+    license = licenses.free;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ mornfall pSub ];
   };
 }

From 26bf9b28d87ea505e7bfd27d79d0b1d482b8342b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 4 Mar 2016 14:51:13 +0300
Subject: [PATCH 280/338] opendkim service: improve `domains` documentation

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

diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix
index 1cdae9cb654..af996758f41 100644
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixos/modules/services/mail/opendkim.nix
@@ -49,7 +49,12 @@ in {
 
       domains = mkOption {
         type = types.str;
-        description = "Local domains set; messages from them are signed, not verified.";
+        default = "csl:${config.networking.hostName}";
+        example = "csl:example.com,mydomain.net";
+        description = ''
+          Local domains set (see <literal>opendkim(8)</literal> for more information on datasets).
+          Messages from them are signed, not verified.
+        '';
       };
 
       keyFile = mkOption {
@@ -77,8 +82,6 @@ in {
 
   config = mkIf cfg.enable {
 
-    services.opendkim.domains = mkDefault "csl:${config.networking.hostName}";
-
     users.extraUsers = optionalAttrs (cfg.user == "opendkim") (singleton
       { name = "opendkim";
         group = cfg.group;

From 630ab80bd469737f44fb72aca40ae65094b847ea Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 14:10:48 +0300
Subject: [PATCH 281/338] deadbeef: 1.6.2 -> 1.7.0

---
 pkgs/applications/audio/deadbeef/default.nix | 25 ++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 1a2b4b7cc87..b8942033976 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch
+{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson
 # deadbeef can use either gtk2 or gtk3
-, gtk2Support ? true, gtk2 ? null
-, gtk3Support ? false, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null
+, gtk2Support ? false, gtk2 ? null
+, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null
 # input plugins
 , vorbisSupport ? true, libvorbis ? null
 , mp123Support ? true, libmad ? null
@@ -52,21 +52,22 @@ assert wavpackSupport -> wavpack != null;
 assert remoteSupport -> curl != null;
 
 stdenv.mkDerivation rec {
-  name = "deadbeef-0.6.2";
+  name = "deadbeef-${version}";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/deadbeef/${name}.tar.bz2";
-    sha256 = "06jfsqyakpvq0xhah7dlyvdzh5ym3hhb4yfczczw11ijd1kbjcrl";
+    sha256 = "0s6qip1zs83pig75pnd30ayiv1dbbj7s72px9mr31f4m0v86kaqx";
   };
 
-  buildInputs = with stdenv.lib;
-       optional gtk2Support gtk2
-    ++ optionals gtk3Support [gtk3 gsettings_desktop_schemas]
+  buildInputs = with stdenv.lib; [ jansson ]
+    ++ optional gtk2Support gtk2
+    ++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ]
     ++ optional vorbisSupport libvorbis
     ++ optional mp123Support libmad
     ++ optional flacSupport flac
     ++ optional wavSupport libsndfile
-    ++ optionals cdaSupport [libcdio libcddb]
+    ++ optionals cdaSupport [ libcdio libcddb ]
     ++ optional aacSupport faad2
     ++ optional zipSupport libzip
     ++ optional ffmpegSupport ffmpeg
@@ -88,12 +89,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patches = [ (fetchpatch {
-                url = "https://github.com/Alexey-Yakovenko/deadbeef/commit/e7725ea73fa1bd279a3651704870156bca8efea8.patch";
-                sha256 = "1530w968zyvcm9c8k57889n125k7a1kk3ydinjm398n07gypd599";
-              })
-            ];
-
   postInstall = if !gtk3Support then "" else ''
     wrapProgram "$out/bin/deadbeef" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

From d07d94b97c953228b41d3f3edf54be03d7dc48a3 Mon Sep 17 00:00:00 2001
From: Emery <emery@v36.space>
Date: Fri, 4 Mar 2016 13:26:07 +0100
Subject: [PATCH 282/338] amtterm: initial package at 1.4

https://www.kraxel.org/cgit/amtterm/
---
 pkgs/tools/system/amtterm/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/system/amtterm/default.nix

diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix
new file mode 100644
index 00000000000..3fe85be35f7
--- /dev/null
+++ b/pkgs/tools/system/amtterm/default.nix
@@ -0,0 +1,27 @@
+{ fetchurl, stdenv, makeWrapper, perl, perlPackages }:
+
+let version = "1.4"; in
+stdenv.mkDerivation {
+  name = "amtterm-"+version;
+
+  buildInputs = with perlPackages; [ perl SOAPLite ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  src = fetchurl {
+    url = "https://www.kraxel.org/cgit/amtterm/snapshot/amtterm-a75e48e010e92dc5540e2142efc445ccb0ab1a42.tar.gz";
+    sha256 = "0i4ny5dyf3fy3sd65zw9v4xxw3rc3qyn8r8y8gwwgankj6iqkqp4";
+  };
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  postInstall =
+    "wrapProgram $out/bin/amttool --prefix PERL5LIB : $PERL5LIB";
+
+  meta = with stdenv.lib;
+    { description = "Intel AMT® SoL client + tools";
+      homepage = "https://www.kraxel.org/cgit/amtterm/";
+      license = licenses.gpl2;
+      maintainers = [ maintainers.ehmry ];
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 460145f8b08..af88f0e5192 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -536,6 +536,8 @@ let
 
   albert = qt5.callPackage ../applications/misc/albert {};
 
+  amtterm = callPackage ../tools/system/amtterm {};
+
   analog = callPackage ../tools/admin/analog {};
 
   apktool = callPackage ../development/tools/apktool {

From e2372a4183409920050771e7dc527ca031f05144 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 3 Mar 2016 16:55:17 +0000
Subject: [PATCH 283/338] ceph: fix for zip timestamps

---
 pkgs/tools/filesystems/ceph/generic.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 1673e69679b..19457e13655 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -1,4 +1,5 @@
-{ stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which, git
+{ stdenv, ensureNewerSourcesHook, autoconf, automake, makeWrapper, pkgconfig
+, libtool, which, git
 , boost, python, pythonPackages, libxml2, zlib
 
 # Optional Dependencies
@@ -111,7 +112,10 @@ stdenv.mkDerivation {
     ./0001-Makefile-env-Don-t-force-sbin.patch
   ];
 
-  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which git ]
+  nativeBuildInputs = [
+    autoconf automake makeWrapper pkgconfig libtool which git
+    (ensureNewerSourcesHook { year = "1980"; })
+  ]
     ++ optionals (versionAtLeast version "9.0.2") [
       pythonPackages.setuptools pythonPackages.argparse
     ];

From 7c4c151a9422d6bb6790b1c8c76e37caa5b1d5d0 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 4 Mar 2016 00:45:20 +0000
Subject: [PATCH 284/338] ruby: only keep the latest tiny per major.minor

Tiny versions are just for bug-fixes and should be upgraded. I think that the
list has grown a bit too much organically and should be trimmed.
---
 .../development/interpreters/ruby/default.nix | 77 ----------------
 .../interpreters/ruby/patchsets.nix           | 87 -------------------
 pkgs/top-level/all-packages.nix               | 14 +--
 3 files changed, 7 insertions(+), 171 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 4ffef385a0d..2a22cc74e75 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -157,61 +157,6 @@ in {
     };
   };
 
-  ruby_2_1_0 = generic {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "0";
-    patchLevel = "0";
-    sha256 = {
-      src = "17fhfbw8sr13rxfn58wvrhk2f5i88lkna2afn3gdjvprd8gyqf1m";
-      git = "12sn532yvznqfz85378ys0b9ggmj7w8ddhzc1pnnlx7mbyy7r2hx";
-    };
-  };
-
-  ruby_2_1_1 = generic {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "1";
-    patchLevel = "0";
-    sha256 = {
-      src = "0hc9x3mazyvnk94gs19q8mbnanlzk8mv0hii77slkvc8mqqxyhy8";
-      git = "1v2ffvyd0xx1h1qd70431zczhvsdiyyw5kjxih4rszd5avzh5grl";
-    };
-  };
-
-  ruby_2_1_2 = generic {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "2";
-    patchLevel = "353";
-    sha256 = {
-      src = "0db6krc2bd7yha8p96lcqrahjpsz7g7abhni134g708sh53n8apj";
-      git = "14f8w3zwngnxsgigffh6h9z3ng53xq8mk126xmwrsmz9n3ypm6l0";
-    };
-  };
-
-  ruby_2_1_3 = generic {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "3";
-    patchLevel = "0";
-    sha256 = {
-      src = "00bz6jcbxgnllplk4b9lnyc3w8yd3pz5rn11rmca1s8cn6vvw608";
-      git = "1pnam9jry2l2mbji3gvrbb7jyisxl99xjz6l1qrccwnfinxxbmhv";
-    };
-  };
-
-  ruby_2_1_6 = generic {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "6";
-    patchLevel = "0";
-    sha256 = {
-      src = "1r4bs8lfwsypbcf8j2lpv3by40729vp5mh697njizj97fjp644qy";
-      git = "18kbjsbmgv6l3p1qxgmjnhh4jl7xdk3c20ycjpp62vrhq7pyzjsm";
-    };
-  };
-
   ruby_2_1_7 = generic {
     majorVersion = "2";
     minorVersion = "1";
@@ -223,28 +168,6 @@ in {
     };
   };
 
-  ruby_2_2_0 = generic {
-    majorVersion = "2";
-    minorVersion = "2";
-    teenyVersion = "0";
-    patchLevel = "0";
-    sha256 = {
-      src = "1z2092fbpc2qkv1j3yj7jdz7qwvqpxqpmcnkphpjcpgvmfaf6wbn";
-      git = "1w7rr2nq1bbw6aiagddzlrr3rl95kk33x4pv6570nm072g55ybpi";
-    };
-  };
-
-  ruby_2_2_2 = generic {
-    majorVersion = "2";
-    minorVersion = "2";
-    teenyVersion = "2";
-    patchLevel = "0";
-    sha256 = {
-      src = "0i4v7l8pnam0by2cza12zldlhrffqchwb2m9shlnp7j2gqqhzz2z";
-      git = "08mw1ql2ghy483cp8xzzm78q17simn4l6phgm2gah7kjh9y3vbrn";
-    };
-  };
-
   ruby_2_2_3 = generic {
     majorVersion = "2";
     minorVersion = "2";
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 18e2ab9231a..ded72b8695e 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -34,76 +34,6 @@ rec {
     "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch"
     "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
   ];
-  "2.1.0" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/01-current-2.1.1-fixes.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/02-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/03-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/04-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/05-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/06-fix-missing-c-return-event.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/07-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/08-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/09-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/10-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
-  ];
-  "2.1.1" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/05-fix-missing-c-return-event.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/07-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/08-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/09-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/10-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
-  ];
-  "2.1.2" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/05-fix-missing-c-return-event.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/06-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/07-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/08-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/09-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/10-funny-falcon-method-cache.patch"
-  ];
-  "2.1.3" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/05-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/07-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/08-funny-falcon-method-cache.patch"
-  ];
-  "2.1.6" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/05-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/07-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/08-funny-falcon-method-cache.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/09-heap-dump-support.patch"
-  ];
   "2.1.7" = [
     ./ssl_v3.patch
   ] ++ ops useRailsExpress [
@@ -117,23 +47,6 @@ rec {
     "${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch"
     "${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch"
   ];
-  "2.2.0" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/04-backport-401c8bb.patch"
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/05-fix-packed-bitfield-compat-warning-for-older-gccs.patch"
-  ];
-  "2.2.2" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.2.2/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.2.2/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.2.2/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.2.2/railsexpress/04-backported-bugfixes-222.patch"
-  ];
   "2.2.3" = [
     ./ssl_v3.patch
   ] ++ ops useRailsExpress [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c971f3157b9..06e09f7c8f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -277,7 +277,7 @@ let
 
   chrootFHSEnv = callPackage ../build-support/build-fhs-chrootenv { };
   userFHSEnv = callPackage ../build-support/build-fhs-userenv {
-   ruby = ruby_2_1_3;
+   ruby = ruby_2_1;
   };
 
   buildFHSChrootEnv = args: chrootFHSEnv {
@@ -5540,7 +5540,7 @@ let
   };
 
   bundix = callPackage ../development/interpreters/ruby/bundix {
-    ruby = ruby_2_1_3;
+    ruby = ruby_2_1;
   };
   bundler = callPackage ../development/interpreters/ruby/bundler.nix { };
   bundler_HEAD = bundler;
@@ -5551,8 +5551,8 @@ let
   inherit (callPackage ../development/interpreters/ruby {})
     ruby_1_9_3
     ruby_2_0_0
-    ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6 ruby_2_1_7
-    ruby_2_2_0 ruby_2_2_2 ruby_2_2_3
+    ruby_2_1_7
+    ruby_2_2_3
     ruby_2_3_0;
 
   # Ruby aliases
@@ -5812,7 +5812,7 @@ let
   cgdb = callPackage ../development/tools/misc/cgdb { };
 
   chefdk = callPackage ../development/tools/chefdk {
-    ruby = ruby_2_0_0;
+    ruby = ruby_2_0;
   };
 
   matter-compiler = callPackage ../development/compilers/matter-compiler {};
@@ -6296,7 +6296,7 @@ let
   uncrustify = callPackage ../development/tools/misc/uncrustify { };
 
   vagrant = callPackage ../development/tools/vagrant {
-    ruby = ruby_2_2_2;
+    ruby = ruby_2_2;
   };
 
   gdb = callPackage ../development/tools/misc/gdb {
@@ -13035,7 +13035,7 @@ let
   smtube = qt5.callPackage ../applications/video/smtube {};
 
   sup = callPackage ../applications/networking/mailreaders/sup {
-    ruby = ruby_1_9_3.override { cursesSupport = true; };
+    ruby = ruby_1_9.override { cursesSupport = true; };
   };
 
   synapse = callPackage ../applications/misc/synapse {

From 4bc516aa540e85ff8e0fa2c88245e4c870b1faf3 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 4 Mar 2016 14:19:44 +0000
Subject: [PATCH 285/338] sonic-pi: 2.8.0 -> 2.9.0

Fixes compilation and path issues. The executable still segfaults after boot
though.
---
 pkgs/applications/audio/sonic-pi/default.nix  | 29 +++++++++------
 .../audio/sonic-pi/fixed-prefixes.patch       | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 3 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/applications/audio/sonic-pi/fixed-prefixes.patch

diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index ce5844ca7f1..3c7be51554d 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -11,25 +11,25 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.8.0";
+  version = "2.9.0";
   name = "sonic-pi-${version}";
 
   src = fetchFromGitHub {
     owner = "samaaron";
     repo = "sonic-pi";
     rev = "v${version}";
-    sha256 = "1yyavgazb6ar7xnmjx460s9p8nh70klaja2yb20nci15k8vngq9h";
+    sha256 = "19db5dxrf6h1v2w3frds5g90nb6izd9ppp7cs2xi6i0m67l6jrwb";
   };
 
   buildInputs = [
-    qscintilla
-    supercollider
-    ruby
-    qt48Full
-    cmake
-    pkgconfig
     bash
+    cmake
     makeWrapper
+    pkgconfig
+    qscintilla
+    qt48Full
+    ruby
+    supercollider
   ];
 
   meta = {
@@ -42,13 +42,22 @@ stdenv.mkDerivation rec {
 
   dontUseCmakeConfigure = true;
 
+  patches = [ ./fixed-prefixes.patch ];
+
+  preConfigure = ''
+    patchShebangs .
+    substituteInPlace app/gui/qt/mainwindow.cpp \
+      --subst-var-by ruby "${ruby}/bin/ruby" \
+      --subst-var out
+  '';
+
   buildPhase = ''
     pushd app/server/bin
-    ${ruby}/bin/ruby compile-extensions.rb
+      ./compile-extensions.rb
     popd
 
     pushd app/gui/qt
-    ${bash}/bin/bash rp-build-app
+      ./rp-build-app
     popd
   '';
 
diff --git a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch b/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch
new file mode 100644
index 00000000000..7b045a41cba
--- /dev/null
+++ b/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch
@@ -0,0 +1,36 @@
+diff --git a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp
+index 0af6cf7..97c17ad 100644
+--- a/app/gui/qt/mainwindow.cpp
++++ b/app/gui/qt/mainwindow.cpp
+@@ -677,28 +677,9 @@ void MainWindow::startServer(){
+ 
+     serverProcess = new QProcess();
+ 
+-    QString root = rootPath();
+-
+-  #if defined(Q_OS_WIN)
+-    QString prg_path = root + "/app/server/native/windows/ruby/bin/ruby.exe";
+-    QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
+-    sample_path = root + "/etc/samples";
+-  #elif defined(Q_OS_MAC)
+-    QString prg_path = root + "/server/native/osx/ruby/bin/ruby";
+-    QString prg_arg = root + "/server/bin/sonic-pi-server.rb";
+-    sample_path = root + "/etc/samples";
+-  #else
+-    //assuming Raspberry Pi
+-    QString prg_path = root + "/app/server/native/raspberry/ruby/bin/ruby";
+-    QFile file(prg_path);
+-    if(!file.exists()) {
+-      // use system ruby if bundled ruby doesn't exist
+-      prg_path = "/usr/bin/ruby";
+-    }
+-
+-    QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
+-    sample_path = root + "/etc/samples";
+-  #endif
++    QString prg_path = "@ruby@";
++    QString prg_arg = "@out@/app/server/bin/sonic-pi-server.rb";
++    sample_path = "@out@/etc/samples";
+ 
+     prg_path = QDir::toNativeSeparators(prg_path);
+     prg_arg = QDir::toNativeSeparators(prg_arg);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c971f3157b9..947ae780161 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13513,7 +13513,9 @@ let
 
   viber = callPackage ../applications/networking/instant-messengers/viber { };
 
-  sonic-pi = callPackage ../applications/audio/sonic-pi { };
+  sonic-pi = callPackage ../applications/audio/sonic-pi {
+    ruby = ruby_2_2;
+  };
 
   st = callPackage ../applications/misc/st {
     conf = config.st.conf or null;

From 5226ecf7676b7f04ee7da87aa7b3103a1530a18f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 4 Mar 2016 12:42:28 -0300
Subject: [PATCH 286/338] openbox-menu: 0.5.1 -> 0.8.0

---
 pkgs/applications/misc/openbox-menu/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix
index 6055997b28e..9e52c629a24 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, glib, gtk, menu-cache }:
 
 stdenv.mkDerivation rec {
-  name = "openbox-menu-0.5.1";
+  name = "openbox-menu-${version}";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${name}.tar.bz2";
-    sha256 = "11v3nlhqcnks5vms1a7rrvwvj8swc9axgjkp7z0r97lijsg6d3rj";
+    sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l";
   };
 
   buildInputs = [ pkgconfig glib gtk menu-cache ];
@@ -15,8 +16,13 @@ stdenv.mkDerivation rec {
   installPhase = "make install prefix=$out";
 
   meta = {
+    homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html";
     description = "Dynamic XDG menu generator for Openbox";
-    homepage = "http://mimasgpc.free.fr/openbox-menu.html";
+    longDescription = ''
+      Openbox-menu is a pipemenu for Openbox window manager. It provides a
+      dynamic menu listing installed applications. Most of the work is done by
+      the LXDE library menu-cache.
+    '';
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.romildo ];
     platforms   = stdenv.lib.platforms.unix;

From 7b9684a5b578b8e1c4c0a928f3536129f8d9f849 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Mar 2016 16:54:27 +0100
Subject: [PATCH 287/338] nginx, nginxUnstable: enable hardening. Flags as
 recommended by @arno01 (Andrey Arapov) in #7190

---
 pkgs/servers/http/nginx/default.nix  | 10 +++++++++-
 pkgs/servers/http/nginx/unstable.nix | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 6944a89477a..cc95c60c7c2 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
 , gd, geoip
 , modules ? []
+, hardening ? true
 }:
 
 with stdenv.lib;
@@ -53,7 +54,14 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
 
-  preConfigure = concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
+  preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
+    + optionalString hardening ''
+      configureFlagsArray=(
+        --with-cc-opt="-fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2"
+        --with-ld-opt="-pie -Wl,-z,relro,-z,now"
+      )
+    ''
+    ;
 
   meta = {
     description = "A reverse proxy and lightweight webserver";
diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index 5840dee0ba5..4ac1b0b268c 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -2,6 +2,7 @@
 , gd, geoip
 , withStream ? false
 , modules ? []
+, hardening ? true
 }:
 
 with stdenv.lib;
@@ -51,7 +52,14 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
 
-  preConfigure = concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
+  preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
+    + optionalString hardening ''
+      configureFlagsArray=(
+        --with-cc-opt="-fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2"
+        --with-ld-opt="-pie -Wl,-z,relro,-z,now"
+      )
+    ''
+    ;
 
   postInstall = ''
     mv $out/sbin $out/bin

From 708c6094c55e4e3cc186a42e04cb8dd1d6efecf8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Mar 2016 16:57:47 +0100
Subject: [PATCH 288/338] nginx, nginxUnstable: hardening: only use when the
 compiler is gcc

---
 pkgs/servers/http/nginx/default.nix  | 2 +-
 pkgs/servers/http/nginx/unstable.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index cc95c60c7c2..178c0fcbd9e 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
 
   preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
-    + optionalString hardening ''
+    + optionalString (hardening && (stdenv.cc.cc.isGNU or false)) ''
       configureFlagsArray=(
         --with-cc-opt="-fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2"
         --with-ld-opt="-pie -Wl,-z,relro,-z,now"
diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index 4ac1b0b268c..e85fb96d2ed 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
 
   preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
-    + optionalString hardening ''
+    + optionalString (hardening && (stdenv.cc.cc.isGNU or false)) ''
       configureFlagsArray=(
         --with-cc-opt="-fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2"
         --with-ld-opt="-pie -Wl,-z,relro,-z,now"

From ca6108a2a170779228061fad6ca05e09c769073e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 4 Mar 2016 13:31:31 -0600
Subject: [PATCH 289/338] wireshark: 2.0.0 -> 2.0.2 for: CVE-2016-2521
 CVE-2016-2522 CVE-2016-2523 CVE-2016-2524 CVE-2016-2525 CVE-2016-2526
 CVE-2016-2527 CVE-2016-2528 CVE-2016-2529 CVE-2016-2531 CVE-2016-2532

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

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 58be839d737..9f810e2c5c6 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -11,7 +11,7 @@ assert withQt -> !withGtk && qt4 != null;
 with stdenv.lib;
 
 let
-  version = "2.0.0";
+  version = "2.0.2";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 in
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
-    sha256 = "1pci4vj23wamycfj4lxxmpxps96yq6jfmqn7hdvisw4539v6q0lh";
+    sha256 = "1hdrnsllkfbvfwsvlqvvky0z91q63mbbnjcri56nb9c5403zn8g9";
   };
 
   buildInputs = [

From be63be9d042839f1c85de7d75ca957c9cff6be57 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 13 Dec 2015 18:20:12 +0100
Subject: [PATCH 290/338] haskell: add buildStackProject.

For building environments for Stack projects.
---
 pkgs/build-support/haskell/stack.nix | 40 ++++++++++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix  |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/build-support/haskell/stack.nix

diff --git a/pkgs/build-support/haskell/stack.nix b/pkgs/build-support/haskell/stack.nix
new file mode 100644
index 00000000000..80b70203955
--- /dev/null
+++ b/pkgs/build-support/haskell/stack.nix
@@ -0,0 +1,40 @@
+{ stdenv, ghc, pkgconfig, glibcLocales }:
+
+with stdenv.lib;
+
+{ buildInputs ? []
+, extraArgs ? []
+, LD_LIBRARY_PATH ? ""
+, ...
+}@args:
+
+stdenv.mkDerivation (args // {
+
+  buildInputs =
+    buildInputs ++
+    optional stdenv.isLinux glibcLocales ++
+    [ ghc pkgconfig ];
+  
+  STACK_IN_NIX_SHELL=1;
+  STACK_IN_NIX_EXTRA_ARGS =
+    concatMap (pkg: ["--extra-lib-dirs=${pkg}/lib"
+                     "--extra-include-dirs=${pkg}/include"]) buildInputs ++
+    extraArgs;
+
+  # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042.
+  LD_LIBRARY_PATH = "${makeLibraryPath buildInputs}:${LD_LIBRARY_PATH}";
+
+  preferLocalBuild = true;
+
+  configurePhase = args.configurePhase or "stack setup";
+
+  buildPhase = args.buildPhase or "stack build";
+
+  checkPhase = args.checkPhase or "stack test";
+
+  doCheck = args.doCheck or true;
+
+  installPhase = args.installPhase or ''
+    stack --local-bin-path=$out/bin build --copy-bins
+  '';
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 928541cd9df..9b7bdd01505 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -4,6 +4,8 @@ rec {
 
   lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
 
+  buildStackProject = callPackage ../build-support/haskell/stack.nix { };
+
   compiler = {
 
     ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };

From ff9cba94f68428ebe31a057892ae32de85d76bfb Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 17 Jan 2016 20:59:20 +0100
Subject: [PATCH 291/338] haskell: Rename file where buildStackProject is
 defined.

---
 .../haskell-modules/generic-stack-builder.nix}                  | 0
 pkgs/top-level/haskell-packages.nix                             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{build-support/haskell/stack.nix => development/haskell-modules/generic-stack-builder.nix} (100%)

diff --git a/pkgs/build-support/haskell/stack.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
similarity index 100%
rename from pkgs/build-support/haskell/stack.nix
rename to pkgs/development/haskell-modules/generic-stack-builder.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9b7bdd01505..540343aa02d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -4,7 +4,7 @@ rec {
 
   lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
 
-  buildStackProject = callPackage ../build-support/haskell/stack.nix { };
+  buildStackProject = callPackage ../development/haskell-modules/generic-stack-builder.nix { };
 
   compiler = {
 

From 01f384b8b44b869c41125297f04820d9665d356d Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 17 Jan 2016 21:09:16 +0100
Subject: [PATCH 292/338] haskell: Add documentation for
 haskell.buildStackProject to user guide.

This section documents introduces Stack's primitive Nix support as well.
---
 doc/haskell-users-guide.md | 73 ++++++++++++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 7 deletions(-)

diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md
index b9b2fe9e3bc..1fc80d5b690 100644
--- a/doc/haskell-users-guide.md
+++ b/doc/haskell-users-guide.md
@@ -117,9 +117,10 @@ Also, the attributes `haskell.compiler.ghcXYC` and
 
 ### How to install a compiler
 
-A simple development environment consists of a Haskell compiler and the tool
-`cabal-install`, and we saw in section [How to install Haskell packages] how
-you can install those programs into your user profile:
+A simple development environment consists of a Haskell compiler and one or both
+of the tools `cabal-install` and `stack`. We saw in section
+[How to install Haskell packages] how you can install those programs into your
+user profile:
 
     $ nix-env -f "<nixpkgs>" -iA haskellPackages.ghc haskellPackages.cabal-install
 
@@ -148,10 +149,16 @@ version; just enter the Nix shell environment with the command
 
     $ nix-shell -p haskell.compiler.ghc784
 
-to bring GHC 7.8.4 into `$PATH`. Re-running `cabal configure` switches your
-build to use that compiler instead. If you're working on a project that doesn't
-depend on any additional system libraries outside of GHC, then it's sufficient
-even to run the `cabal configure` command inside of the shell:
+to bring GHC 7.8.4 into `$PATH`. Alternatively, you can use Stack instead of
+`nix-shell` directly to select compiler versions and other build tools
+per-project. It uses `nix-shell` under the hood when Nix support is turned on.
+See [How to build a Haskell project using Stack].
+
+If you're using `cabal-install`, re-running `cabal configure` inside the spawned
+shell switches your build to use that compiler instead. If you're working on
+a project that doesn't depend on any additional system libraries outside of GHC,
+then it's even sufficient to just run the `cabal configure` command inside of
+the shell:
 
     $ nix-shell -p haskell.compiler.ghc784 --command "cabal configure"
 
@@ -320,6 +327,58 @@ security reasons, which might be quite an inconvenience. See [this
 page](http://kb.mozillazine.org/Links_to_local_pages_do_not_work) for
 workarounds.
 
+### How to build a Haskell project using Stack
+
+[Stack][http://haskellstack.org] is a popular build tool for Haskell projects.
+It has first-class support for Nix. Stack can optionally use Nix to
+automatically select the right version of GHC and other build tools to build,
+test and execute apps in an existing project downloaded from somewhere on the
+Internet. Pass the `--nix` flag to any `stack` command to do so, e.g.
+
+    $ git clone --recursive http://github.com/yesodweb/wai
+    $ cd wai
+    $ stack --nix build
+
+If you want `stack` to use Nix by default, you can add a `nix` section to the
+`stack.yaml` file, as explained in the [Stack documentation][stack-nix-doc]. For
+example:
+
+    nix:
+      enable: true
+      packages: [pkgconfig zeromq zlib]
+
+The example configuration snippet above tells Stack to create an ad hoc
+environment for `nix-shell` as in the below section, in which the `pkgconfig`,
+`zeromq` and `zlib` packages from Nixpkgs are available. All `stack` commands
+will implicitly be executed inside this ad hoc environment.
+
+Some projects have more sophisticated needs. For examples, some ad hoc
+environments might need to expose Nixpkgs packages compiled in a certain way, or
+with extra environment variables. In these cases, you'll need a `shell` field
+instead of `packages`:
+
+    nix:
+      enable: true
+      shell-file: shell.nix
+
+For more on how to write a `shell.nix` file see the below section. You'll need
+to express a derivation. Note that Nixpkgs ships with a convenience wrapper
+function around `mkDerivation` called `haskell.buildStackProject` to help you
+create this derivation in exactly the way Stack expects. All of the same inputs
+as `mkDerivation` can be provided. For example, to build a Stack project that
+including packages that link against a version of the R library compiled with
+special options turned on:
+
+    with (import <nixpkgs> { });
+
+    let R = pkgs.R.override { enableStrictBarrier = true; };
+    in
+	haskell.buildStackProject {
+      name = "HaskellR";
+	  buildInputs = [ R zeromq zlib ];
+    }
+
+[stack-nix-doc]: http://docs.haskellstack.org/en/stable/nix_integration.html
 
 ### How to create ad hoc environments for `nix-shell`
 

From 6f09628c321e19f999eb6f2f59fde829723a5c2d Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 17 Jan 2016 21:19:14 +0100
Subject: [PATCH 293/338] haskell: tell users to use Stack's nix support when
 missing system library.

---
 doc/haskell-users-guide.md | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md
index 1fc80d5b690..da923db602d 100644
--- a/doc/haskell-users-guide.md
+++ b/doc/haskell-users-guide.md
@@ -664,7 +664,7 @@ can configure the environment variables
 
 in their `~/.bashrc` file to avoid the compiler error.
 
-### Using Stack together with Nix
+### Builds using Stack complain about missing system libraries
 
     --  While building package zlib-0.5.4.2 using:
       runhaskell -package=Cabal-1.22.4.0 -clear-package-db [... lots of flags ...]
@@ -692,13 +692,16 @@ means specific to Stack: you'll have that problem with any other
 Haskell package that's built inside of nix-shell but run outside of that
 environment.
 
-I suppose we could try to remedy the issue by wrapping `stack` or
-`cabal` with a script that tries to find those kind of implicit search
-paths and makes them explicit on the "cabal configure" command line. I
-don't think anyone is working on that subject yet, though, because the
-problem doesn't seem so bad in practice.
+You can remedy this issue in several ways. The easiest is to add a `nix` section
+to the `stack.yaml` like the following:
 
-You can remedy that issue in several ways. First of all, run
+    nix:
+      enable: true
+	  packages: [ zlib ]
+
+Stack's Nix support knows to add `${zlib}/lib` and `${zlib}/include` as an
+`--extra-lib-dirs` and `extra-include-dirs`, respectively. Alternatively, you
+can achieve the same effect by hand. First of all, run
 
     $ nix-build --no-out-link "<nixpkgs>" -A zlib
     /nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8
@@ -722,7 +725,8 @@ to find out the store path of the system's zlib library. Now, you can
    Typically, you'll need --extra-include-dirs as well. It's possible
    to add those flag to the project's "stack.yaml" or your user's
    global "~/.stack/global/stack.yaml" file so that you don't have to
-   specify them manually every time.
+   specify them manually every time. But again, you're likely better off using
+   Stack's Nix support instead.
 
    The same thing applies to `cabal configure`, of course, if you're
    building with `cabal-install` instead of Stack.

From 7fedb7c9922ec3c715851c54f689c949fae14da9 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Fri, 4 Mar 2016 21:24:42 +0100
Subject: [PATCH 294/338] Move `buildStackProject` to `haskell.lib`.

---
 doc/haskell-users-guide.md               | 4 ++--
 pkgs/development/haskell-modules/lib.nix | 2 ++
 pkgs/top-level/haskell-packages.nix      | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md
index da923db602d..ce61295e567 100644
--- a/doc/haskell-users-guide.md
+++ b/doc/haskell-users-guide.md
@@ -363,7 +363,7 @@ instead of `packages`:
 
 For more on how to write a `shell.nix` file see the below section. You'll need
 to express a derivation. Note that Nixpkgs ships with a convenience wrapper
-function around `mkDerivation` called `haskell.buildStackProject` to help you
+function around `mkDerivation` called `haskell.lib.buildStackProject` to help you
 create this derivation in exactly the way Stack expects. All of the same inputs
 as `mkDerivation` can be provided. For example, to build a Stack project that
 including packages that link against a version of the R library compiled with
@@ -373,7 +373,7 @@ special options turned on:
 
     let R = pkgs.R.override { enableStrictBarrier = true; };
     in
-	haskell.buildStackProject {
+	haskell.lib.buildStackProject {
       name = "HaskellR";
 	  buildInputs = [ R zeromq zlib ];
     }
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index a3e1b56104d..51adb582e54 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -81,6 +81,8 @@ rec {
 
   buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror");
 
+  buildStackProject = callPackage ../development/haskell-modules/generic-stack-builder.nix { };
+
   triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
 
   #FIXME: throw this away sometime in the future. added 2015-08-18
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 540343aa02d..928541cd9df 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -4,8 +4,6 @@ rec {
 
   lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
 
-  buildStackProject = callPackage ../development/haskell-modules/generic-stack-builder.nix { };
-
   compiler = {
 
     ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };

From abea96a28db21efb324d4db720bae0180634acdb Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 4 Mar 2016 21:58:30 +0100
Subject: [PATCH 295/338] tasksh: init at 1.0.0

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

diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
new file mode 100644
index 00000000000..9283469fcc3
--- /dev/null
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, libuuid, gnutls }:
+
+stdenv.mkDerivation rec {
+  name = "tasksh-${version}";
+  version = "1.0.0";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = "http://taskwarrior.org/download/tasksh-latest.tar.gz";
+    sha256 = "0ll6pwhw4wsdffacsmpq46fqh084p9mdaa777giqbag3b8gwik4s";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "REPL for taskwarrior";
+    homepage = http://tasktools.org;
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthiasbeyer ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c116ef927d..f1d5afc0eb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13714,6 +13714,8 @@ let
 
   taskwarrior = callPackage ../applications/misc/taskwarrior { };
 
+  tasksh = callPackage ../applications/misc/tasksh { };
+
   taskserver = callPackage ../servers/misc/taskserver { };
 
   telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli/default.nix { };

From 0cf589e072e00e83c734a6af97ab0ecbf32fe78b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Mar 2016 22:09:36 +0100
Subject: [PATCH 296/338] python-packages.nix: fix Emacs syntax highlighting
 (cosmetic)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9f880b2b053..05e66106bd3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4705,7 +4705,7 @@ in modules // {
 
       mkdir -p $out/bin
       mkdir -p $out/lib/${python.libPrefix}/site-packages
-      cp -r server/* $out/lib/${python.libPrefix}/site-packages
+      cp -r "server/"* $out/lib/${python.libPrefix}/site-packages
       mv $out/lib/${python.libPrefix}/site-packages/deskcon-server $out/bin/deskcon-server
 
       wrapPythonProgramsIn $out/bin "$out $pythonPath"
@@ -5514,7 +5514,7 @@ in modules // {
 
     };
     postInstall=''
-    cp -R $out/gateone/* $out/lib/python2.7/site-packages/gateone
+    cp -R "$out/gateone/"* $out/lib/python2.7/site-packages/gateone
     '';
   };
 

From f103e0ac03851434ab21a42d0d025f80fcfbc847 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Mar 2016 22:11:25 +0100
Subject: [PATCH 297/338] Add LTS Haskell version 5.5.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 928541cd9df..1bf97876d88 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -359,7 +359,10 @@ rec {
     lts-5_4 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.4.nix { };
     };
-    lts-5 = packages.lts-5_4;
+    lts-5_5 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.5.nix { };
+    };
+    lts-5 = packages.lts-5_5;
 
     lts = packages.lts-5;
   };

From 86d0a9c420977edbf6b6b55c7d104f8669382afa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Mar 2016 22:17:53 +0100
Subject: [PATCH 298/338] haskell.lib: fix use of callPackage

---
 pkgs/development/haskell-modules/lib.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 51adb582e54..59020264b3c 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -81,7 +81,7 @@ rec {
 
   buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror");
 
-  buildStackProject = callPackage ../development/haskell-modules/generic-stack-builder.nix { };
+  buildStackProject = pkgs.callPackage ../development/haskell-modules/generic-stack-builder.nix { };
 
   triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
 

From 798a14d22cc3e3c9f83b2c05f417c2cdfc0f5a44 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Mar 2016 22:18:08 +0100
Subject: [PATCH 299/338] haskell-generic-stack-builder: strip trailing
 whitespace

---
 pkgs/development/haskell-modules/generic-stack-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 80b70203955..94999ed8c45 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (args // {
     buildInputs ++
     optional stdenv.isLinux glibcLocales ++
     [ ghc pkgconfig ];
-  
+
   STACK_IN_NIX_SHELL=1;
   STACK_IN_NIX_EXTRA_ARGS =
     concatMap (pkg: ["--extra-lib-dirs=${pkg}/lib"

From 5b83791207d1521dde3a6f7f4f70d730571668a4 Mon Sep 17 00:00:00 2001
From: Adam Boseley <adam.boseley@gmail.com>
Date: Thu, 5 Nov 2015 21:39:55 +1000
Subject: [PATCH 300/338] spice-vdagentd service : initial at 0.16.0

---
 lib/maintainers.nix                           |  1 +
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/misc/spice-vdagentd.nix  | 30 +++++++++++++++++++
 .../virtualization/spice-vdagent/default.nix  | 29 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 5 files changed, 63 insertions(+)
 create mode 100644 nixos/modules/services/misc/spice-vdagentd.nix
 create mode 100644 pkgs/applications/virtualization/spice-vdagent/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7362c6ab659..84e95a2409e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -10,6 +10,7 @@
   aaronschif = "Aaron Schif <aaronschif@gmail.com>";
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";
+  aboseley = "Adam Boseley <adam.boseley@gmail.com>";
   adev = "Adrien Devresse <adev@adev.name>";
   aespinosa = "Allan Espinosa <allan.espinosa@outlook.com>";
   aflatter = "Alexander Flatter <flatter@fastmail.fm>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5d487776be2..0105cc3cdf2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -240,6 +240,7 @@
   ./services/misc/ripple-data-api.nix
   ./services/misc/rogue.nix
   ./services/misc/siproxd.nix
+  ./services/misc/spice-vdagentd.nix
   ./services/misc/subsonic.nix
   ./services/misc/sundtek.nix
   ./services/misc/svnserve.nix
diff --git a/nixos/modules/services/misc/spice-vdagentd.nix b/nixos/modules/services/misc/spice-vdagentd.nix
new file mode 100644
index 00000000000..f8133394ffd
--- /dev/null
+++ b/nixos/modules/services/misc/spice-vdagentd.nix
@@ -0,0 +1,30 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+  cfg = config.services.spice-vdagentd;
+in
+{
+  options = {
+    services.spice-vdagentd = {
+      enable = mkEnableOption "Spice guest vdagent daemon";
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.spice-vdagent ];
+
+    systemd.services.spice-vdagentd = {
+      description = "spice-vdagent daemon";
+      wantedBy = [ "graphical.target" ];
+      preStart = ''
+        mkdir -p "/var/run/spice-vdagentd/"
+      '';
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "/bin/sh -c '${pkgs.spice-vdagent}/bin/spice-vdagentd'";
+      };
+    };
+  };
+}
diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix
new file mode 100644
index 00000000000..add5f96e7f5
--- /dev/null
+++ b/pkgs/applications/virtualization/spice-vdagent/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib,
+ libpciaccess, libxcb, libXrandr, libXinerama, libXfixes}:
+stdenv.mkDerivation rec {
+  name = "spice-vdagent-0.16.0";
+  src = fetchurl {
+    url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
+    sha256 = "0z8gwc5va2i64mjippavmxajdb9az83ffqyhlbynm6dxw131d5av";
+  };
+  postPatch = ''
+    substituteInPlace data/spice-vdagent.desktop --replace /usr $out
+  '';
+  buildInputs = [ pkgconfig alsaLib spice_protocol glib
+                  libpciaccess libxcb libXrandr libXinerama libXfixes ] ;
+  meta = {
+    description = "Enhanced SPICE integration for linux QEMU guest";
+    longDescription = ''
+       Spice agent for linux guests offering
+       * Client mouse mode
+       * Copy and paste
+       * Automatic adjustment of the X-session resolution
+         to the client resolution
+       * Multiple displays
+    '';
+    homepage = http://www.spice-space.org/home.html;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.aboseley ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c116ef927d..fe5ecdf3552 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13519,6 +13519,8 @@ let
 
   sound-juicer = callPackage ../applications/audio/sound-juicer { };
 
+  spice-vdagent = callPackage ../applications/virtualization/spice-vdagent { };
+
   spideroak = callPackage ../applications/networking/spideroak { };
 
   ssvnc = callPackage ../applications/networking/remote/ssvnc { };

From 288d01fe2ba697531f48859c593e1647a8b91e5f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Mar 2016 23:05:48 +0100
Subject: [PATCH 301/338] stellarium: update to 0.14.2

This patch also fixes https://github.com/NixOS/nixpkgs/issues/13582.
---
 .../science/astronomy/stellarium/default.nix        | 13 +++++++++----
 pkgs/top-level/all-packages.nix                     |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index e77e848bed2..7798b1bef6c 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,14 +1,19 @@
-{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt5Full, perl, libiconv }:
+{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
+, qtscript, qtserialport, qttools
+}:
 
 stdenv.mkDerivation rec {
-  name = "stellarium-0.13.3";
+  name = "stellarium-0.14.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "1ml6z2xda4vx61agdz54x8fw1b115gwc7rcy0zhz1jh6g5jvf0ij";
+    sha256 = "1xxil0rv61zc08znfv83cpsc47y1gjl2f3njhz0pn5zd8jpaa15a";
   };
 
-  buildInputs = [ cmake freetype libpng mesa gettext openssl perl libiconv qt5Full ];
+  buildInputs = [
+    cmake freetype libpng mesa gettext openssl perl libiconv qtscript
+    qtserialport qttools
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c116ef927d..b34fd62015d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15689,7 +15689,7 @@ let
 
   spyder = pythonPackages.spyder;
 
-  stellarium = callPackage ../applications/science/astronomy/stellarium { };
+  stellarium = qt5.callPackage ../applications/science/astronomy/stellarium { };
 
   tulip = callPackage ../applications/science/misc/tulip {
     cmake = cmake-2_8;

From 36fbab1374c27fbb0adfde3dfe06aa16a067e338 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Mon, 29 Feb 2016 18:03:47 +0000
Subject: [PATCH 302/338] prometheus: Bump to 0.17.0

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ddf18dd3b8f..1054296be16 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2871,51 +2871,48 @@ let
     };
   };
 
-  prometheus.prometheus = buildGoPackage rec {
-    name = "prometheus-${version}";
-    version = "0.15.1";
-    goPackagePath = "github.com/prometheus/prometheus";
-    rev = "64349aade284846cb194be184b1b180fca629a7c";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "prometheus";
-      repo = "prometheus";
-      sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2";
-    };
+  prometheus.prometheus = buildFromGitHub rec {
+    rev = "0.17.0";
+    owner = "prometheus";
+    repo = "prometheus";
+    sha256 = "176198krna2i37dfhwsqi7m36sqn175yiny6n52vj27mc9s8ggzx";
 
     buildInputs = [
-      consul
-      dns
-      fsnotify.v1
-      go-zookeeper
-      goleveldb
-      httprouter
-      logrus
-      net
-      prometheus.client_golang
-      prometheus.log
-      yaml-v2
+      # consul
+      # dns
+      # fsnotify.v1
+      # go-zookeeper
+      # goleveldb
+      # httprouter
+      # logrus
+      # net
+      # prometheus.client_golang
+      # prometheus.log
+      # yaml-v2
     ];
 
+    docheck = true;
+
+    preBuild = ''
+      export GO15VENDOREXPERIMENT=1
+    '';
+
+    buildFlagsArray = let t = "github.com/${owner}/${repo}/version"; in ''
+      -ldflags=
+         -X ${t}.Version=${rev}
+         -X ${t}.Revision=unknown
+         -X ${t}.Branch=unknown
+         -X ${t}.BuildUser=nix@nixpkgs
+         -X ${t}.BuildDate=unknown
+         -X ${t}.GoVersion=${stdenv.lib.getVersion go}
+    '';
+
     preInstall = ''
       mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
       cp -a $src/documentation/* $bin/share/doc/prometheus
       cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
     '';
 
-    # Metadata that gets embedded into the binary
-    buildFlagsArray = let t = "${goPackagePath}/version"; in
-    ''
-      -ldflags=
-          -X ${t}.Version=${version}
-          -X ${t}.Revision=${builtins.substring 0 6 rev}
-          -X ${t}.Branch=master
-          -X ${t}.BuildUser=nix@nixpkgs
-          -X ${t}.BuildDate=20150101-00:00:00
-          -X ${t}.GoVersion=${stdenv.lib.getVersion go}
-    '';
-
     meta = with stdenv.lib; {
       description = "Service monitoring system and time series database";
       homepage = http://prometheus.io;

From 9ccb248e49f5ed367a822b16e4febb71831e66e3 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Mon, 29 Feb 2016 18:04:07 +0000
Subject: [PATCH 303/338] prometheus-alertmanager: Bump to 0.1.0

---
 pkgs/top-level/go-packages.nix | 46 ++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 1054296be16..2ff00bd7249 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2651,33 +2651,35 @@ let
     propagatedBuildInputs = [ kr.text ];
   };
 
-  prometheus.alertmanager = buildGoPackage rec {
-    name = "prometheus-alertmanager-${rev}";
-    rev = "0.0.4";
-    goPackagePath = "github.com/prometheus/alertmanager";
-
-    src = fetchFromGitHub {
-      owner = "prometheus";
-      repo = "alertmanager";
-      inherit rev;
-      sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15";
-    };
+  prometheus.alertmanager = buildFromGitHub rec {
+    rev = "0.1.0";
+    owner = "prometheus";
+    repo = "alertmanager";
+    sha256 = "1ya465bns6cj2lqbipmfm13wz8kxii5h9mm7lc0ba1xv26xx5zs7";
 
     buildInputs = [
-      fsnotify.v0
-      httprouter
-      prometheus.client_golang
-      prometheus.log
-      pushover
+      # fsnotify.v0
+      # httprouter
+      # prometheus.client_golang
+      # prometheus.log
+      # pushover
     ];
 
-    buildFlagsArray = ''
+    # Tests exist, but seem to clash with the firewall.
+    doCheck = false;
+
+    preBuild = ''
+      export GO15VENDOREXPERIMENT=1
+    '';
+
+    buildFlagsArray = let t = "github.com/${owner}/${repo}/version"; in ''
       -ldflags=
-          -X main.buildVersion=${rev}
-          -X main.buildBranch=master
-          -X main.buildUser=nix@nixpkgs
-          -X main.buildDate=20150101-00:00:00
-          -X main.goVersion=${stdenv.lib.getVersion go}
+         -X ${t}.Version=${rev}
+         -X ${t}.Revision=unknown
+         -X ${t}.Branch=unknown
+         -X ${t}.BuildUser=nix@nixpkgs
+         -X ${t}.BuildDate=unknown
+         -X ${t}.GoVersion=${stdenv.lib.getVersion go}
     '';
 
     meta = with stdenv.lib; {

From c1fb5414219a03b0c89bd6f65320eedc4fc7ee90 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Mon, 29 Feb 2016 18:04:26 +0000
Subject: [PATCH 304/338] prometheus-node-exporter: Bump to 0.11.0

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 2ff00bd7249..3206fbba20e 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2821,10 +2821,10 @@ let
   };
 
   prometheus.node-exporter = buildFromGitHub {
-    rev = "0.10.0";
+    rev = "0.11.0";
     owner = "prometheus";
     repo = "node_exporter";
-    sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p";
+    sha256 = "149fs9yxnbiyd4ww7bxsv730mcskblpzb3cs4v12jnq2v84a4kk4";
 
     buildInputs = [
       go-runit
@@ -2835,6 +2835,8 @@ let
       protobuf
     ];
 
+    doCheck = true;
+
     meta = with stdenv.lib; {
       description = "Prometheus exporter for machine metrics";
       homepage = https://github.com/prometheus/node_exporter;

From 9c10e2933a0a859ae845689917913360221d5477 Mon Sep 17 00:00:00 2001
From: Patrick Callahan <pxcallahan@gmail.com>
Date: Fri, 4 Mar 2016 10:09:46 -0700
Subject: [PATCH 305/338] ds4drv: init at 0.5.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d9a42b25ce5..b20f96c63bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5053,6 +5053,27 @@ in modules // {
     };
   };
 
+
+  ds4drv = buildPythonPackage rec {
+    name = "ds4drv-${version}";
+    version = "0.5.0";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/ds4drv/${name}.tar.gz";
+      sha256 = "0dq2z1z09zxa6rn3v94vwqaaz29jwiydkss8hbjglixf20krmw3b";
+    };
+
+    propagatedBuildInputs = with self; [ evdev pyudev ];
+
+    buildInputs = [ pkgs.bluez ];
+
+    meta = {
+      description = "Userspace driver for the DualShock 4 controller";
+      homepage = "https://github.com/chrippa/ds4drv";
+      license = licenses.mit;
+    };
+
+  };
+
   dyn = buildPythonPackage rec {
     version = "1.5.0";
     name = "dyn-${version}";

From 8d5accb6915e6b2db459f26da451c89d2f5b5d99 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 5 Mar 2016 02:55:00 +0100
Subject: [PATCH 306/338] chromium/updater: Fix getting latest versions

Comparing the current version with the version in sources list and
accidentally swapping the version arguments isn't going to get very far
because every new version that will come up will then be treated as "we
already have that version".

So we're now using versionOlder and also a check whether the version is
the *same* as the one in sources.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/source/update.nix             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index 3c489b7523e..28ef03b2c77 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -181,7 +181,8 @@ in rec {
     isLatest = channel: version: let
       ourVersion = sources.${channel}.version or null;
     in if ourVersion == null then false
-       else lib.versionAtLeast version sources.${channel}.version;
+       else lib.versionOlder version sources.${channel}.version
+         || version == sources.${channel}.version;
 
     # We only support GNU/Linux right now.
     linuxChannels = let

From c3d82f0fbfae29e2cb3b2098a1fd7ac1f5605467 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 5 Mar 2016 03:10:53 +0100
Subject: [PATCH 307/338] chromium/updater: Fix eval error on stdenv.is32bit

There is no stdenv.is32bit, so let's just use !stdenv.is64bit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../applications/networking/browsers/chromium/source/update.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index 28ef03b2c77..d4dc3b59cbc 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -46,7 +46,7 @@ in rec {
     in if stdenv.is64bit && chanAttrs ? sha256bin64 then {
       urls = mkUrls "amd64";
       sha256 = chanAttrs.sha256bin64;
-    } else if stdenv.is32bit && chanAttrs ? sha256bin32 then {
+    } else if !stdenv.is64bit && chanAttrs ? sha256bin32 then {
       urls = mkUrls "i386";
       sha256 = chanAttrs.sha256bin32;
     } else throw "No Chrome plugins are available for your architecture.";

From 3b5ff2761c18976610a72c26f750c2ddd9fd918b Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Fri, 4 Mar 2016 21:54:24 -0500
Subject: [PATCH 308/338] as31: use yacc to generate parser.c file

The source includes a generated parser.c file which is out of date and
causes errors on x86_64 in certain cases. Delete this file so that make
will use yacc to generate a correct parser.c file.

Change taken from comments at https://aur.archlinux.org/packages/as31/.
---
 pkgs/development/compilers/as31/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix
index 24cba18254f..a7f37976ec4 100644
--- a/pkgs/development/compilers/as31/default.nix
+++ b/pkgs/development/compilers/as31/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, yacc }:
 
 let
 
@@ -11,10 +11,17 @@ in stdenv.mkDerivation {
     url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz";
     sha256 = "0mbk6z7z03xb0r0ccyzlgkjdjmdzknck4yxxmgr9k7v8f5c348fd";
   };
+
+  buildInputs = [ yacc ];
+
   preConfigure = ''
     chmod +x ./configure
   '';
 
+  postConfigure = ''
+    rm as31/parser.c
+  '';
+
   meta = with stdenv.lib; {
     homepage = "http://wiki.erazor-zone.de/wiki:projects:linux:as31";
     description = "An 8031/8051 assembler by Ken Stauffer and Theo Deraadt which produces a variety of object code output formats";

From 9e9a2f10966ab3889b523032ce83cf8c3b0698a8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 5 Mar 2016 09:15:46 +0300
Subject: [PATCH 309/338] unrar: 5.3.9 -> 5.3.11

Also build shared library.
---
 pkgs/tools/archivers/unrar/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 49638ced16a..cbfced7aa6b 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -1,18 +1,18 @@
 {stdenv, fetchurl}:
 
-let
-  version = "5.3.9";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "unrar-${version}";
+  version = "5.3.11";
 
   src = fetchurl {
     url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
-    sha256 = "0nsxwg1zp3s34wyjznwmy2cc5929yk7m5smq11cqdb6hmql3fngz";
+    sha256 = "0qw77gvr57azjbn76cjlm4sv1hf2hh90g7n7n33gfvlpnbs7mf3p";
   };
 
-  preBuild = ''
-    export buildFlags="CXX=$CXX"
+  buildPhase = ''
+    make unrar
+    make clean
+    make lib
   '';
 
   installPhase = ''
@@ -21,6 +21,9 @@ stdenv.mkDerivation {
     mkdir -p $out/share/doc/unrar
     cp acknow.txt license.txt \
         $out/share/doc/unrar
+
+    install -Dm755 libunrar.so $out/lib/libunrar.so
+    install -D dll.hpp $out/include/unrar/dll.hpp
   '';
 
   setupHook = ./setup-hook.sh;

From fdf22fb5bb9c55204bddad2ff51b3a9e478a6909 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 5 Mar 2016 11:26:33 +0100
Subject: [PATCH 310/338] exim: 4.86 -> 4.86.2

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

diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 6f2b65fd9b7..d8d1f0dc3a7 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -1,11 +1,11 @@
 { coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "exim-4.86";
+  name = "exim-4.86.2";
 
   src = fetchurl {
     url = "http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/${name}.tar.bz2";
-    sha256 = "0mn4bxih9slrmll5262ayhf41ji43pjf1rv0y6xpy6x55v7g5k7i";
+    sha256 = "1cvfcc1hi60lydv8h3a2rxlfc0v2nflwpvzjj7h7cdsqs2pxwmkp";
   };
 
   buildInputs = [ coreutils db openssl pcre perl pkgconfig ];

From 676019bd85ecc53a8ea614d329c0aa9a46f8e1bc Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 5 Mar 2016 12:34:26 +0200
Subject: [PATCH 311/338] utillinux: Restore utillinuxCurses alias

This got removed by eead3bc53655. Reintroduce the alias to avoid
breaking users' configurations.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 831390ad774..ad20707b09e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10950,6 +10950,7 @@ let
   usermount = callPackage ../os-specific/linux/usermount { };
 
   utillinux = callPackage ../os-specific/linux/util-linux { };
+  utillinuxCurses = utillinux;
 
   utillinuxMinimal = appendToName "minimal" (utillinux.override {
     ncurses = null;

From 390effeb6e88d80cac6b140e2ec885667908a071 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sun, 28 Feb 2016 10:51:16 +0100
Subject: [PATCH 312/338] orthorobot: init at unversioned

---
 pkgs/games/orthorobot/default.nix | 63 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/games/orthorobot/default.nix

diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix
new file mode 100644
index 00000000000..b1a39a609a1
--- /dev/null
+++ b/pkgs/games/orthorobot/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "orthorobot";
+  version = "1.0";
+
+  icon = fetchurl {
+    url = "http://stabyourself.net/images/screenshots/orthorobot-5.png";
+    sha256 = "13fa4divdqz4vpdij1lcs5kf6w2c4jm3cc9q6bz5h7lkng31jzi6";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "orthorobot";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "Robot game";
+    desktopName = "Orthorobot";
+    genericName = "orthorobot";
+    categories = "Game;";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://stabyourself.net/dl.php?file=${pname}/${pname}-source.zip";
+    sha256 = "023nc3zwjkbmy4c8w6mfg39mg69zpqqr2gzlmp4fpydrjas70kbl";
+  };
+
+  nativeBuildInputs = [ makeWrapper unzip ];
+  buildInputs = [ lua love ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  unpackPhase = ''
+    unzip -j $src
+  '';  
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/games/lovegames
+
+    cp -v ./*.love $out/share/games/lovegames/${pname}.love
+
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Recharge the robot";
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.linux;
+    license = licenses.free;
+    downloadPage = http://stabyourself.net/orthorobot/;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de648bc16f6..be1028b919e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14574,6 +14574,8 @@ let
 
   openxcom = callPackage ../games/openxcom { };
 
+  orthorobot = callPackage ../games/orthorobot { love = love_0_7; };
+
   performous = callPackage ../games/performous { };
 
   pingus = callPackage ../games/pingus {};

From b1096d08114c5539dbe98d2788bb1f0559401f5f Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Sun, 6 Mar 2016 00:03:26 +1100
Subject: [PATCH 313/338] elpa-packages 2016-03-06

---
 .../editors/emacs-modes/elpa-generated.nix    | 118 ++++++++++++------
 1 file changed, 79 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index fbb7955a1d6..f10b1fbe61f 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -132,6 +132,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    arbitools = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "arbitools";
+        version = "0.51";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/arbitools-0.51.el";
+          sha256 = "1pwps73s885i1777wlmqhkmfgj564bkb6rkpc964v0vcqia6fpag";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/arbitools.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "ascii-art-to-unicode";
@@ -322,10 +335,10 @@
     company-math = callPackage ({ company, elpaBuild, fetchurl, lib, math-symbol-lists }:
     elpaBuild {
         pname = "company-math";
-        version = "1.0.1";
+        version = "1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/company-math-1.0.1.el";
-          sha256 = "1lkj9cqhmdf3h5zvr94hszkz1251i2rq2mycnhscsnzrk5ll3gck";
+          url = "http://elpa.gnu.org/packages/company-math-1.1.tar";
+          sha256 = "10yi5jmv7njcaansgy2aw7wm1j3acch1j9x6lfg9mxk0j21zvgwp";
         };
         packageRequires = [ company math-symbol-lists ];
         meta = {
@@ -350,10 +363,10 @@
     context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, js2-mode, lib }:
     elpaBuild {
         pname = "context-coloring";
-        version = "7.2.0";
+        version = "7.2.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/context-coloring-7.2.0.el";
-          sha256 = "0l7mzmnhqh6sri1fhhv51khi0fnpfp51drzy725s6zfmpbrcn7vn";
+          url = "http://elpa.gnu.org/packages/context-coloring-7.2.1.el";
+          sha256 = "1lh2p3fsym73h0dcj1gqg1xsw3lcikmcskbx8y3j0ds30l4xs13d";
         };
         packageRequires = [ emacs js2-mode ];
         meta = {
@@ -628,12 +641,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    excorporate = callPackage ({ elpaBuild, emacs, fetchurl, fsm, lib, soap-client, url-http-ntlm }:
+    elpaBuild {
+        pname = "excorporate";
+        version = "0.7.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/excorporate-0.7.1.tar";
+          sha256 = "1flvhk39yymskzazpwh95j2nj8kg4b02hsg7b8msnqi3q5lpqs54";
+        };
+        packageRequires = [ emacs fsm soap-client url-http-ntlm ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/excorporate.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
         pname = "exwm";
-        version = "0.2";
+        version = "0.4";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/exwm-0.2.tar";
-          sha256 = "0z96zz6h5r880nbhclbxs2r0zfkg771lg0fjghigqxz8ai0hh1ll";
+          url = "http://elpa.gnu.org/packages/exwm-0.4.tar";
+          sha256 = "1qlplx88mk8c5sahlymxxh46bzf6bxnsqk92wliv5ji4ai5373fb";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -767,10 +794,10 @@
     hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "hydra";
-        version = "0.13.4";
+        version = "0.13.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/hydra-0.13.4.tar";
-          sha256 = "11msy6n075iv00c2r9f85bzx3srnj403rhlga1rgsl6vsryf21fj";
+          url = "http://elpa.gnu.org/packages/hydra-0.13.5.tar";
+          sha256 = "0vq1pjyq6ddbikbh0vzdigbs0zlldgwad0192s7v9npg8qlwi668";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -978,10 +1005,10 @@
       }) {};
     math-symbol-lists = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "math-symbol-lists";
-        version = "1.0";
+        version = "1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/math-symbol-lists-1.0.el";
-          sha256 = "1rry9x4pl7i0sij051i76zp1ypvnj1qbwm40a7bs462c74q4jlwn";
+          url = "http://elpa.gnu.org/packages/math-symbol-lists-1.1.tar";
+          sha256 = "06klvnqipz0n9slw72fxmhrydrw6bi9fs9vnn8hrja8gsqf8inlz";
         };
         packageRequires = [];
         meta = {
@@ -1005,10 +1032,10 @@
     metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "metar";
-        version = "0.1";
+        version = "0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/metar-0.1.el";
-          sha256 = "0s9zyzps022h5xax574bwsvsyp893x5w74kznnhfm63sxrifbi18";
+          url = "http://elpa.gnu.org/packages/metar-0.2.el";
+          sha256 = "0rfzq79llh6ixw02kjpn8s2shxrabvfvsq48pagwak1jl2s0askf";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1215,10 +1242,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20160215";
+        version = "20160229";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/org-20160215.tar";
-          sha256 = "0w2686rza4xdknq3sy87s04zvlmjxyr6wrj9y9ydcv8hbzws3bhd";
+          url = "http://elpa.gnu.org/packages/org-20160229.tar";
+          sha256 = "15zrkw33ma8q079sb518rmcj97n35rnjv16p6zfw52m9xfdwxgi9";
         };
         packageRequires = [];
         meta = {
@@ -1411,6 +1438,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    sed-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "sed-mode";
+        version = "1.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/sed-mode-1.0.el";
+          sha256 = "1zpdai5k9zhy5hw0a5zx7qv3rcf8cn29hncfjnhk9k6sjq0302lg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/sed-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "seq";
         version = "1.11";
@@ -1439,10 +1479,10 @@
       }) {};
     sisu-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "sisu-mode";
-        version = "3.0.3";
+        version = "7.1.8";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/sisu-mode-3.0.3.el";
-          sha256 = "0ay9hfix3x53f39my02071dzxrw69d4zx5zirxwmmmyxmkaays3r";
+          url = "http://elpa.gnu.org/packages/sisu-mode-7.1.8.el";
+          sha256 = "12zs6y4rzng1d7djl9wh3wc0f9fj0bqb7h754rvixvndlr5c10nj";
         };
         packageRequires = [];
         meta = {
@@ -1492,10 +1532,10 @@
       }) {};
     sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "sotlisp";
-        version = "1.4.1";
+        version = "1.5.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/sotlisp-1.4.1.el";
-          sha256 = "1v99pcj5lp1xxavghwv03apwpc589y7wb8vv6w3kai7483p13z5j";
+          url = "http://elpa.gnu.org/packages/sotlisp-1.5.1.el";
+          sha256 = "1dm2pl4i091gi5lljl68s6v3l3904jj38v56qjblm160wjiahgkm";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1518,10 +1558,10 @@
       }) {};
     stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "stream";
-        version = "2.1.0";
+        version = "2.2.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/stream-2.1.0.el";
-          sha256 = "05fihjd8gm5w4xbdcvah1g9srcgmk87ymk3i7wwa6961w5s01d5y";
+          url = "http://elpa.gnu.org/packages/stream-2.2.0.el";
+          sha256 = "0i6vwih61a0z0q05v9wyp9nj5h68snlb9n52nmrv1k0hhzsjmlrs";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1598,10 +1638,10 @@
     test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "test-simple";
-        version = "1.1";
+        version = "1.2.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/test-simple-1.1.el";
-          sha256 = "0s8r6kr0a6n1c20fraif2ngis436a7d3gsj351s6icx6bbcjdalw";
+          url = "http://elpa.gnu.org/packages/test-simple-1.2.0.el";
+          sha256 = "1j97qrwi3i2kihszsxf3y2cby2bzp8g0zf6jlpdix3dinav8xa3b";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1704,10 +1744,10 @@
     url-http-ntlm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, ntlm ? null }:
     elpaBuild {
         pname = "url-http-ntlm";
-        version = "2.0.1";
+        version = "2.0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/url-http-ntlm-2.0.1.tar";
-          sha256 = "0h6xsm1x7v69kb4shyvv1p4f6sxgcqs5ap6ylqydz10mbcx7aq0w";
+          url = "http://elpa.gnu.org/packages/url-http-ntlm-2.0.2.el";
+          sha256 = "0jci5cl31hw4dj0j9ljq0iplg530wnwbw7b63crrwn3mza5cb2wf";
         };
         packageRequires = [ cl-lib ntlm ];
         meta = {
@@ -1849,10 +1889,10 @@
     xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "xelb";
-        version = "0.5";
+        version = "0.6";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/xelb-0.5.tar";
-          sha256 = "1wypffg492r2a3h136c6mphsbgimxcipsarm971z56kpy3lwi4sb";
+          url = "http://elpa.gnu.org/packages/xelb-0.6.tar";
+          sha256 = "1m91af5srxq8zs9w4gb44kl4bgka8fq7k33h7f2yn213h23kvvvh";
         };
         packageRequires = [ cl-generic emacs ];
         meta = {

From 0865d19ccd6baa36b575ef3dc50b0bed76f6dca6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 5 Mar 2016 17:49:15 +0300
Subject: [PATCH 314/338] haskellPackages.Agda: use older unordered-containers
 to fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4fa6d2f78bb..01c0298b0f0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -927,4 +927,7 @@ self: super: {
 
   # https://github.com/mainland/language-c-quote/issues/57
   language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; };
+
+  # https://github.com/agda/agda/issues/1840
+  Agda = super.Agda.override { unordered-containers = self.unordered-containers_0_2_5_1; };
 }

From af35cd251386806ce5692003067787773f363e39 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sun, 28 Feb 2016 15:33:21 +0100
Subject: [PATCH 315/338] vapor: init at 0.2.3

---
 pkgs/games/vapor/default.nix    | 61 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/games/vapor/default.nix

diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix
new file mode 100644
index 00000000000..0209fd83b1c
--- /dev/null
+++ b/pkgs/games/vapor/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "vapor";
+  version = "0.2.3";
+  commitid = "dbf509f";
+
+  icon = fetchurl {
+    url = "http://vapor.love2d.org/sites/default/files/vapT240x90.png";
+    sha256 = "1xlra74lpm1y54z6zm6is0gldkswp3wdw09m6a306ch0xjf3f87f";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "Vapor";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "LÖVE Distribution Client"; 
+    desktopName = "Vapor";
+    genericName = "vapor";
+    categories = "Game;";
+  };
+
+in 
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url =
+    "https://github.com/josefnpat/${pname}/releases/download/${version}/${pname}_${commitid}.love";
+    sha256 = "0w2qkrrkzfy4h4jld18apypmbi8a8r89y2l11axlv808i2rg68fk";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ lua love ];
+
+  phases = "installPhase";
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share
+
+    cp -v $src $out/share/${pname}.love
+
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "LÖVE Distribution Client allowing access to many games";
+    platforms = platforms.linux;
+    license = licenses.zlib;
+    maintainers = with maintainers; [ leenaars ];
+    downloadPage = http://vapor.love2d.org/;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 414fd2ae30a..9c361257b00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14755,6 +14755,8 @@ let
 
   ut2004demo = callPackage ../games/ut2004demo { };
 
+  vapor = callPackage ../games/vapor { love = love_0_8; };
+
   vassal = callPackage ../games/vassal { };
 
   vdrift = callPackage ../games/vdrift { };

From 1ff8a6b6c44761c0c0a5b0ffb2f32ea6ba5cea20 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 1 Mar 2016 19:21:07 +0100
Subject: [PATCH 316/338] electrum: 2.5.4 -> 2.6.1

---
 pkgs/applications/misc/electrum/default.nix | 27 +++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 6025fce776c..c9b6de715d2 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,17 +1,34 @@
-{ stdenv, fetchurl, buildPythonApplication, pythonPackages, slowaes }:
+{ stdenv, fetchurl, pythonPackages }:
 
-buildPythonApplication rec {
+let
+  jsonrpclib = pythonPackages.buildPythonPackage rec {
+    version = "0.1.7";
+    name = "jsonrpclib-${version}";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jsonrpclib/${name}.tar.gz";
+      sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z";
+    };
+    propagatedBuildInputs = [ pythonPackages.cjson ];
+    meta = {
+      homepage = https://pypi.python.org/pypi/jsonrpclib;
+      license = stdenv.lib.licenses.asl20;
+    };
+  };
+in
+
+pythonPackages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "2.5.4";
+  version = "2.6.1";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "18saa2rg07vfp9scp3i8s0wi2pqw9s8l8b44gq43zzl41120zc60";
+    sha256 = "14q6y1hwzki56nfhd3nfbxid07d5fv0pgmklvcf7yxjmpdxrg0iq";
   };
 
   propagatedBuildInputs = with pythonPackages; [
     dns
     ecdsa
+    jsonrpclib
     pbkdf2
     protobuf
     pyasn1
@@ -47,7 +64,7 @@ buildPythonApplication rec {
       of the blockchain.
     '';
     homepage = https://electrum.org;
-    license = licenses.gpl3;
+    license = licenses.mit;
     maintainers = with maintainers; [ ehmry joachifm np ];
   };
 }

From 757a1f7fe9e99078c7e849c83e3f011519c2a49f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Mar 2016 18:33:53 +0100
Subject: [PATCH 317/338] cppcheck: 1.69 -> 1.72

Also add myself to the list of maintainers
---
 .../tools/analysis/cppcheck/default.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 53397786dc4..5955f34b58e 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45 }:
 
 let
-  name = "cppcheck";
-  version = "1.69";
+  pname = "cppcheck";
+  version = "1.72";
 in
-stdenv.mkDerivation {
-  name = "${name}-${version}";
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
-    sha256 = "0bjkqy4c6ph6nzparcnbxrdn52i3hiind4jc99v2kvsq281wimab";
+    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    sha256 = "085lm8v7biixy6rykq836gfy91jcccpz9qpk8i9x339dzy2b2q4l";
   };
 
   buildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];
@@ -22,15 +22,15 @@ stdenv.mkDerivation {
     cp cppcheck.1 $out/share/man/man1/cppcheck.1
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A static analysis tool for C/C++ code";
     longDescription = ''
       Check C/C++ code for memory leaks, mismatching
       allocation-deallocation, buffer overruns and more.
     '';
     homepage = http://cppcheck.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons joachifm ];
   };
 }

From 73878e1c101871cf6dc216e5557dfeccd5344aae Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sat, 5 Mar 2016 19:41:33 +0100
Subject: [PATCH 318/338] keyfuzz: init at 0.2.

---
 lib/maintainers.nix                         |  1 +
 pkgs/tools/inputmethods/keyfuzz/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/keyfuzz/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 84e95a2409e..0b5883f291e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -215,6 +215,7 @@
   maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
   mbakke = "Marius Bakke <ymse@tuta.io>";
   mbe = "Brandon Edens <brandonedens@gmail.com>";
+  mboes = "Mathieu Boespflug <mboes@tweag.net>";
   mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>";
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix
new file mode 100644
index 00000000000..f04afd639b7
--- /dev/null
+++ b/pkgs/tools/inputmethods/keyfuzz/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "keyfuzz-${version}";
+  version = "0.2";
+
+  meta = with stdenv.lib; {
+    description = "Manipulate the scancode/keycode translation tables of keyboard drivers.";
+    homepace    = http://0pointer.de/lennart/projects/keyfuzz/;
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ mboes ];
+  };
+
+  src = fetchurl {
+    url = "http://0pointer.de/lennart/projects/keyfuzz/keyfuzz-0.2.tar.gz";
+    sha256 = "0xv9ymivp8fnyc5xcyh1vamxnx90bzw66wlld813fvm6q2gsiknk";
+  };
+
+  configureFlags = "--without-initdir --disable-lynx";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7b173ca0fc..6afd46c6907 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2152,6 +2152,8 @@ let
 
   keychain = callPackage ../tools/misc/keychain { };
 
+  keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
+
   kibana = callPackage ../development/tools/misc/kibana { };
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };

From 75d7692ab3767c43a0fcd8a815ac88bfabf06832 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 2 Mar 2016 20:56:39 +0000
Subject: [PATCH 319/338] gitAndTools.darcsToGit: 0.2git -> 2015-06-04

Fixes error where ruby 2.0+ doesn't have iconv anymore.

    `require': cannot load such file -- iconv (LoadError)
---
 .../git-and-tools/darcs-to-git/default.nix                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
index 115424ac69c..1b2ad45b56a 100644
--- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "darcs-to-git-${version}";
-  version = "0.2git";
+  version = "2015-06-04";
 
   src = fetchgit {
     url = "git://github.com/purcell/darcs-to-git.git";
-    rev = "58a55936899c7e391df5ae1326c307fbd4617a25";
-    sha256 = "366aa691920991e21cfeebd4cbd53a6c42d80e2bc46ff398af482d1d15bac4c3";
+    rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b";
+    sha256 = "0ycp7pzv9g9pgj25asiby3p3m5vg5czqf4rpy2mavjqhiblxlcv5";
   };
 
   patchPhase = let

From 5b8361c1180b78a448079ee7a8179c5c7d38da3a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 5 Mar 2016 19:20:57 +0100
Subject: [PATCH 320/338] linux_3_10: 3.10.97 -> 3.10.99

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index cd7e6f1af74..d0c09d35cd0 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.97";
+  version = "3.10.99";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0z66nbnbhmzjjbvrd7sbg4351x92grk8xja58rxxbb28cj3sy9r9";
+    sha256 = "1hq90yn2ry36y317px7f0wy55j70ip3wlxa4qsdl9pzlndadcp24";
   };
 
   kernelPatches = args.kernelPatches;

From 354a1935d312fd8caf0531ee46b86147f1308083 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 5 Mar 2016 19:23:07 +0100
Subject: [PATCH 321/338] linux_3_12: 3.12.54 -> 3.12.55

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 636ff9e7d29..f146e5f2f13 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.54";
+  version = "3.12.55";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0a6wv72257nasc1qrw966ajd60z24cjpc83hnbblsjkfl0b3zrrn";
+    sha256 = "0xg52i6zsrkzv0i2kxrsx0179lkp9f2388r06rahx0anf4ars5p2";
   };
 
   kernelPatches = args.kernelPatches;

From af40e356fe41fdcb8463a42c595f1e95cfaa679c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 5 Mar 2016 19:24:05 +0100
Subject: [PATCH 322/338] linux_3_14: 3.14.61 -> 3.14.63

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 80cb4bf89dc..ae3ba775d41 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.61";
+  version = "3.14.63";
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "06lrz2z3lskajk87kq1qi8q6rbdczhsz6sbp5cba4i0nw7sg1nbg";
+    sha256 = "0q3qcgcaxjc298dgjpfn6g17lvki2p87f0zkaxs0h0g13jhykwbz";
   };
 
   kernelPatches = args.kernelPatches;

From 3b1f2e070b43e31fa0da2f043ad8cd2e4c31ccc7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 5 Mar 2016 19:24:30 +0100
Subject: [PATCH 323/338] linux_4_4: 4.4.3 -> 4.4.4

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 56f660a248a..6819dfedb13 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.3";
+  version = "4.4.4";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1pcichd5hp3hzb3hwh5737jwqmfv4ylhw04sbby3hzmxkfqrqdqb";
+    sha256 = "0b4190mwmxf329n16yl32my7dfi02pi7qf39a8v61sl9b2gxffad";
   };
 
   kernelPatches = args.kernelPatches;

From 54d342add8ab512c5650e1b2da25708622dd327d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 3 Mar 2016 22:38:53 +0100
Subject: [PATCH 324/338] nvidia_x11_legacy340: update 340.76 -> 340.94

Fixes #13658.
---
 .../linux/nvidia-x11/legacy340.nix            | 13 ++++-----
 .../nvidia-x11/nvidia-340.76-kernel-4.0.patch | 28 -------------------
 2 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
index bb974410e37..fa9d6442e42 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
 
 let
 
-  versionNumber = "340.76";
+  versionNumber = "340.96";
   /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them.
     Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs,
     will be included in 340.* legacy releases through the end of 2019.
@@ -25,18 +25,16 @@ stdenv.mkDerivation {
 
   builder = ./builder-legacy340.sh;
 
-  patches = [ ./nvidia-340.76-kernel-4.0.patch ];
-
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "1l1nn340hc8iwlzb16gcm2xvnvkw7rf84ll89bcax70094xxjacv";
+        url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
+        sha256 = "13j739gg1igll88xpfsx46m7pan4fwpzx5hqdskkdc0srmw2f3n4";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "016hnsgrcm4ly0mnkcd6c1qkciy3qmbwdwy4rlwq3m6dh4ixw7jc";
+        url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
+        sha256 = "1i0lri76ghhr4c6fdlv5gwzd99n70hv3kw21w51anb55msr9s3r8";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
@@ -62,5 +60,6 @@ stdenv.mkDerivation {
     license = licenses.unfreeRedistributable;
     platforms = platforms.linux;
     maintainers = [ maintainers.vcunat ];
+    priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
deleted file mode 100644
index 5fdc1fed727..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/kernel/nv-pat.c	2015-07-03 08:39:35.417031728 +0200
-+++ b/kernel/nv-pat.c	2015-07-03 08:42:15.631838988 +0200
-@@ -35,8 +35,13 @@
-     unsigned long cr0 = read_cr0();
-     write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
-     wbinvd();
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
-     *cr4 = read_cr4();
-     if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
-+#else
-+    *cr4 = __read_cr4();
-+    if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
-+#endif
-     __flush_tlb();
- }
-
-@@ -46,7 +51,11 @@
-     wbinvd();
-     __flush_tlb();
-     write_cr0((cr0 & 0x9fffffff));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
-     if (cr4 & 0x80) write_cr4(cr4);
-+#else
-+    if (cr4 & 0x80) __write_cr4(cr4);
-+#endif
- }
-
- static int nv_determine_pat_mode(void)

From 8b97ca270e84c38bb0fb1da829da318ed7dbda8a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 5 Mar 2016 03:04:30 +0100
Subject: [PATCH 325/338] chromium: Update all channels to latest versions

Overview of the updated versions:

stable: 48.0.2564.116 -> 49.0.2623.75
beta:   49.0.2623.63  -> 49.0.2623.75
dev:    50.0.2657.0   -> 50.0.2661.11

Stable and beta are now in par because of the release of a major stable
update.

The release addresses 26 security vulnerabilities, the following with an
assigned CVE:

 * CVE-2016-1630: Same-origin bypass in Blink. Credit to Mariusz
                  Mlynski.
 * CVE-2016-1631: Same-origin bypass in Pepper Plugin. Credit to Mariusz
                  Mlynski.
 * CVE-2016-1632: Bad cast in Extensions. Credit to anonymous.
 * CVE-2016-1633: Use-after-free in Blink. Credit to cloudfuzzer.
 * CVE-2016-1634: Use-after-free in Blink. Credit to cloudfuzzer.
 * CVE-2016-1635: Use-after-free in Blink. Credit to Rob Wu.
 * CVE-2016-1636: SRI Validation Bypass. Credit to Ryan Lester and
                  Bryant Zadegan.
 * CVE-2015-8126: Out-of-bounds access in libpng. Credit to
                  joerg.bornemann.
 * CVE-2016-1637: Information Leak in Skia. Credit to Keve Nagy.
 * CVE-2016-1638: WebAPI Bypass. Credit to Rob Wu.
 * CVE-2016-1639: Use-after-free in WebRTC. Credit to Khalil Zhani.
 * CVE-2016-1640: Origin confusion in Extensions UI. Credit to Luan
                  Herrera.
 * CVE-2016-1641: Use-after-free in Favicon. Credit to Atte Kettunen of
                  OUSPG.

The full announcement which also includes the link to the bug tracker
can be found here:

http://googlechromereleases.blogspot.de/2016/03/stable-channel-update.html

Also, the 32bit Chrome package needed for the Flash and Widevine plugins
doesn't exist anymore, because Google has dropped support for 32bit
distros, see here for the announcement:

https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/FoE6sL-p6oU

On our end, we need to fix the patch for the plugin paths to work for
the latest dev channel. The change is very minor, because the
nix_plugin_paths_46.patch only doesn't apply because of an iOS-related
ifdef.

Built and tested on my Hydra at:

https://headcounter.org/hydra/eval/311511

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #13665
---
 .../browsers/chromium/source/default.nix      | 11 ++-
 .../chromium/source/nix_plugin_paths_50.patch | 75 +++++++++++++++++++
 .../browsers/chromium/source/sources.nix      | 19 +++--
 3 files changed, 91 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_50.patch

diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index 4e568aed594..a566c4bb1c8 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -41,10 +41,13 @@ in stdenv.mkDerivation {
     done
   '';
 
-  patches =
-    singleton ./nix_plugin_paths_46.patch ++
-    singleton ./build_fixes_46.patch ++
-    singleton ./widevine.patch;
+  patches = [
+    ./build_fixes_46.patch
+    ./widevine.patch
+    (if versionOlder version "50.0.0.0"
+     then ./nix_plugin_paths_46.patch
+     else ./nix_plugin_paths_50.patch)
+  ];
 
   patchPhase = let
     diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}";
diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_50.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_50.patch
new file mode 100644
index 00000000000..062098a8522
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_50.patch
@@ -0,0 +1,75 @@
+diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
+index 74bf041..5f34198 100644
+--- a/chrome/common/chrome_paths.cc
++++ b/chrome/common/chrome_paths.cc
+@@ -66,21 +66,14 @@ static base::LazyInstance<base::FilePath>
+     g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
+ 
+ // Gets the path for internal plugins.
+-bool GetInternalPluginsDirectory(base::FilePath* result) {
+-#if defined(OS_MACOSX)
+-  // If called from Chrome, get internal plugins from a subdirectory of the
+-  // framework.
+-  if (base::mac::AmIBundled()) {
+-    *result = chrome::GetFrameworkBundlePath();
+-    DCHECK(!result->empty());
+-    *result = result->Append("Internet Plug-Ins");
+-    return true;
+-  }
+-  // In tests, just look in the module directory (below).
+-#endif
+-
+-  // The rest of the world expects plugins in the module directory.
+-  return PathService::Get(base::DIR_MODULE, result);
++bool GetInternalPluginsDirectory(base::FilePath* result,
++                                 const std::string& ident) {
++  std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
++  const char* value = getenv(full_env.c_str());
++  if (value == NULL)
++      return PathService::Get(base::DIR_MODULE, result);
++  else
++      *result = base::FilePath(value);
+ }
+ 
+ #if defined(OS_WIN)
+@@ -253,11 +246,11 @@ bool PathProvider(int key, base::FilePath* result) {
+       create_dir = true;
+       break;
+     case chrome::DIR_INTERNAL_PLUGINS:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "ALL"))
+         return false;
+       break;
+     case chrome::DIR_PEPPER_FLASH_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
+         return false;
+       cur = cur.Append(kPepperFlashBaseDirectory);
+       break;
+@@ -314,7 +307,7 @@ bool PathProvider(int key, base::FilePath* result) {
+     // We currently need a path here to look up whether the plugin is disabled
+     // and what its permissions are.
+     case chrome::FILE_NACL_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "NACL"))
+         return false;
+       cur = cur.Append(kInternalNaClPluginFileName);
+       break;
+@@ -349,7 +342,7 @@ bool PathProvider(int key, base::FilePath* result) {
+         cur = cur.DirName();
+       }
+ #else
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "PNACL"))
+         return false;
+ #endif
+       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
+@@ -366,7 +359,7 @@ bool PathProvider(int key, base::FilePath* result) {
+     // In the component case, this is the source adapter. Otherwise, it is the
+     // actual Pepper module that gets loaded.
+     case chrome::FILE_WIDEVINE_CDM_ADAPTER:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "WIDEVINE"))
+         return false;
+       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
+       break;
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index ffb9ff11068..ffec5c8b807 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,19 +1,18 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   beta = {
-    sha256 = "07i4vqswkijnl7wi6r1a0n1jq54ackm01yf8h3hwcik8q10i1aq5";
-    sha256bin64 = "16pwimg672qaqb89zdvsr8dr7bz50mz7zf6cl0cf45kz7sn8wwlh";
-    version = "49.0.2623.63";
+    sha256 = "1xc2npbc829nxria1j37kxyy95jkalkkphxgv24if0ibn62lrzd4";
+    sha256bin64 = "1arm15g3vmm3zlvcql3qylw1fhrn5ddzl2v8mkpb3a251m425dsi";
+    version = "49.0.2623.75";
   };
   dev = {
-    sha256 = "1xc66zsjd5snydf60di2k2vzwwcqs1p16yn4jbpj2khm9cmxmkmf";
-    sha256bin64 = "06v7r76pbc979f7ahmln0hmxzd8ipirh4128i0ygidj71xmg51mm";
-    version = "50.0.2657.0";
+    sha256 = "04j0nyz20gi7vf1javbw06wrqpkfw6vg024i3wkgx42hzd6hjgw4";
+    sha256bin64 = "12ff4q615rwakgpr9v84p55maasqb4vg61s89vgxrlsgqrmkahg4";
+    version = "50.0.2661.11";
   };
   stable = {
-    sha256 = "03sdm09cnwq8a056rfljql7mz0s17fngfnm5q3p5xwakr2sbj7ka";
-    sha256bin32 = "157m88nafb8svpkv11rzpcfvak6486wx43rmbssg52x2k0vas0bl";
-    sha256bin64 = "036pcma8qczja803h9r1nlm0ypm4zblmy6q7pkwlgmn3r4r3n7i0";
-    version = "48.0.2564.116";
+    sha256 = "1xc2npbc829nxria1j37kxyy95jkalkkphxgv24if0ibn62lrzd4";
+    sha256bin64 = "01qi5jmlmdpy6icc4y51bn5a063mxrnkncg3pbmbl4r02vqca5jh";
+    version = "49.0.2623.75";
   };
 }

From f3d6e9ec71e9cefda85407a85829fb0b85cd41c0 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Sun, 6 Mar 2016 00:13:40 +1100
Subject: [PATCH 326/338] exwm service: init

---
 .../services/x11/window-managers/default.nix  |  1 +
 .../services/x11/window-managers/exwm.nix     | 55 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 nixos/modules/services/x11/window-managers/exwm.nix

diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 37d3348b8a3..26dfbb1f4e1 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -13,6 +13,7 @@ in
     ./clfswm.nix
     ./compiz.nix
     ./dwm.nix
+    ./exwm.nix
     ./fluxbox.nix
     ./herbstluftwm.nix
     ./i3.nix
diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix
new file mode 100644
index 00000000000..dbbd8a125d6
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/exwm.nix
@@ -0,0 +1,55 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.exwm;
+  loadScript = pkgs.writeText "emacs-exwm-load" ''
+    (require 'exwm)
+    ${optionalString cfg.enableDefaultConfig ''
+      (require 'exwm-config)
+      (exwm-config-default)
+    ''}
+  '';
+  packages = epkgs: cfg.extraPackages epkgs ++ [ epkgs.exwm ];
+  exwm-emacs = pkgs.emacsWithPackages packages;
+in
+
+{
+  options = {
+    services.xserver.windowManager.exwm = {
+      enable = mkEnableOption "exwm";
+      enableDefaultConfig = mkOption {
+        default = true;
+        example = false;
+        type = lib.types.bool;
+        description = "Enable an uncustomised exwm configuration.";
+      };
+      extraPackages = mkOption {
+        default = self: [];
+        example = literalExample ''
+          epkgs: [
+            epkgs.emms
+            epkgs.magit
+            epkgs.proofgeneral
+          ]
+        '';
+        description = ''
+          Extra packages available to Emacs. The value must be a
+          function which receives the attrset defined in
+          <varname>emacsPackages</varname> as the sole argument.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
+      name = "exwm";
+      start = ''
+        ${exwm-emacs}/bin/emacs -l ${loadScript}
+      '';
+    };
+    environment.systemPackages = [ exwm-emacs ];
+  };
+}

From d3deb49b543770c37ff101f1121c66c7a3ab456f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 5 Mar 2016 22:11:27 +0000
Subject: [PATCH 327/338] atom: 1.5.3 -> 1.5.4

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index d7b91de80d8..8dc1e2d0c01 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "101fz4c5pj7yp7fg7kg7vcpqjzpwfrbxdyb6va5liip1llg1i2z3";
+    sha256 = "0jnszf1v7xqhm2sy5wzm3f8aw7j1dnapnbw4d46bvshv9hbbzrn8";
     name = "${name}.deb";
   };
 

From 872f5d049cebee0f4536ca18d90b77fd8e233fbf Mon Sep 17 00:00:00 2001
From: Jan Niklas Hasse <jhasse@bixense.com>
Date: Sat, 5 Mar 2016 23:23:19 +0100
Subject: [PATCH 328/338] Blacklist jhasse

---
 .mention-bot | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mention-bot b/.mention-bot
index 4c200e30279..40e57f99660 100644
--- a/.mention-bot
+++ b/.mention-bot
@@ -1,5 +1,6 @@
 {
   "userBlacklist": [
-    "civodul"
+    "civodul",
+    "jhasse"
   ]
 }

From 6af076730e54c86879bd099de16c194bdbae2b22 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 21 Feb 2016 20:13:44 +0100
Subject: [PATCH 329/338] Documentation: rewrite Python

- Rewrite current documentation
- Add introduction/tutorial
- Convert to markdown
---
 doc/default.nix                     |   6 +
 doc/languages-frameworks/python.md  | 668 ++++++++++++++++++++++++++++
 doc/languages-frameworks/python.xml | 447 -------------------
 3 files changed, 674 insertions(+), 447 deletions(-)
 create mode 100644 doc/languages-frameworks/python.md
 delete mode 100644 doc/languages-frameworks/python.xml

diff --git a/doc/default.nix b/doc/default.nix
index 196b9e44539..203555de131 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -45,6 +45,10 @@ stdenv.mkDerivation {
   + toDocbook {
       inputFile = ./introduction.md;
       outputFile = "introduction.xml";
+    }
+  + toDocbook {
+      inputFile = ./languages-frameworks/python.md;
+      outputFile = "./languages-frameworks/python.xml";
       useChapters = true;
     }
   + toDocbook {
@@ -61,6 +65,8 @@ stdenv.mkDerivation {
       outputFile = "languages-frameworks/r.xml";
     }
   + ''
+    cat -n languages-frameworks/python.xml
+
     echo ${nixpkgsVersion} > .version
 
     xmllint --noout --nonet --xinclude --noxincludenode \
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
new file mode 100644
index 00000000000..d05cabac3ff
--- /dev/null
+++ b/doc/languages-frameworks/python.md
@@ -0,0 +1,668 @@
+# Python
+
+## User Guide
+
+Several versions of Python are available on Nix as well as a high amount of
+packages. The default interpreter is CPython 2.7.
+
+### Using Python
+
+#### Installing Python and packages
+
+It is important to make a distinction between Python packages that are
+used as libraries, and applications that are written in Python.
+
+Applications on Nix are installed typically into your user
+profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the
+package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`.
+Dependencies such as libraries are automatically installed and should not be
+installed explicitly.
+
+The same goes for Python applications and libraries. Python applications can be
+installed in your profile, but Python libraries you would like to use to develop
+cannot. If you do install libraries in your profile, then you will end up with
+import errors.
+
+#### Python environments using `nix-shell`
+
+The recommended method for creating Python environments for development is with
+`nix-shell`. Executing
+
+```sh
+$ nix-shell -p python35Packages.numpy python35Packages.toolz
+```
+
+opens a Nix shell which has available the requested packages and dependencies.
+Now you can launch the Python interpreter (which is itself a dependency)
+
+```sh
+[nix-shell:~] python3
+```
+
+If the packages were not available yet in the Nix store, Nix would download or
+build them automatically. A convenient option with `nix-shell` is the `--run`
+option, with which you can execute a command in the `nix-shell`. Let's say we
+want the above environment and directly run the Python interpreter
+
+```sh
+$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3"
+```
+
+This way you can use the `--run` option also to directly run a script
+
+```sh
+$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py"
+```
+
+In fact, for this specific use case there is a more convenient method. You can
+add a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script
+specifying which dependencies Nix shell needs. With the following shebang, you
+can use `nix-shell myscript.py` and it will make available all dependencies and
+run the script in the `python3` shell.
+
+```py
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p python3Packages.numpy
+
+import numpy
+
+print(numpy.__version__)
+```
+
+Likely you do not want to type your dependencies each and every time. What you
+can do is write a simple Nix expression which sets up an environment for you,
+requiring you only to type `nix-shell`. Say we want to have Python 3.5, `numpy`
+and `toolz`, like before, in an environment. With a `shell.nix` file
+containing
+
+```nix
+with import <nixpkgs> {};
+
+(pkgs.python35.buildEnv.override  {
+  extraLibs = with pkgs.python35Packages; [ numpy toolz ];
+}).env
+```
+executing `nix-shell` gives you again a Nix shell from which you can run Python.
+
+What's happening here?
+
+1. We begin with importing the Nix Packages collections. `import <nixpkgs>` import the `<nixpkgs>` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. Therefore we can now use `pkgs`.
+2. Then we create a Python 3.5 environment with `pkgs.buildEnv`. Because we want to use it with a custom set of Python packages, we override it.
+3. The `extraLibs` argument of the original `buildEnv` function can be used to specify which packages should be included. We want `numpy` and `toolz`. Again, we use the `with` statement to bring a set of attributes into the local scope.
+4. And finally, for in interactive use we return the environment.
+
+### Developing with Python
+
+
+Now that you know how to get a working Python environment on Nix, it is time to go forward and start actually developing with Python.
+We will first have a look at how Python packages are packaged on Nix. Then, we will look how you can use development mode with your code.
+
+#### Python packaging on Nix
+
+On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix).
+Let's see how we would build the `toolz` package. According to [`python-packages.nix`](https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/top-level/python-packages.nix) `toolz` is build using
+
+```nix
+toolz = buildPythonPackage rec{
+  name = "toolz-${version}";
+  version = "0.7.4";
+
+  src = pkgs.fetchurl{
+    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
+  };
+
+  meta = {
+    homepage = "http://github.com/pytoolz/toolz/";
+    description = "List processing tools and functional utilities";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fridh ];
+  };
+};
+```
+
+What happens here? The function `buildPythonPackage` is called and as argument
+it accepts a set. In this case the set is a recursive set ([`rec`](http://nixos.org/nix/manual/#sec-constructs)).
+One of the arguments is the name of the package, which consists of a basename
+(generally following the name on PyPi) and a version. Another argument, `src`
+specifies the source, which in this case is fetched from an url. `fetchurl` not
+only downloads the target file, but also validates its hash. Furthermore, we
+specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap-meta).
+
+The output of the function is a derivation, which is an attribute with the name
+`toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions,
+so `python27Packages`, `python34Packages`, `python35Packages` and `pypyPackages`.
+
+The above example works when you're directly working on
+`pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though,
+you will want to test a Nix expression outside of the Nixpkgs tree. If you
+create a `shell.nix` file with the following contents
+
+```nix
+with import <nixpkgs> {};
+
+pkgs.python35Packages.buildPythonPackage rec {
+  name = "toolz-${version}";
+  version = "0.7.4";
+
+  src = pkgs.fetchurl{
+    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
+  };
+
+  meta = {
+    homepage = "http://github.com/pytoolz/toolz/";
+    description = "List processing tools and functional utilities";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fridh ];
+  };
+}
+```
+
+and then execute `nix-shell` will result in an environment in which you can use
+Python 3.5 and the `toolz` package. As you can see we had to explicitly mention
+for which Python version we want to build a package.
+
+The above example considered only a single package. Generally you will want to use multiple packages.
+If we create a `shell.nix` file with the following contents
+
+```nix
+with import <nixpkgs> {};
+
+( let
+    toolz = pkgs.python35Packages.buildPythonPackage rec {
+      name = "toolz-${version}";
+      version = "0.7.4";
+
+      src = pkgs.fetchurl{
+        url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+        sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
+      };
+
+      meta = {
+        homepage = "http://github.com/pytoolz/toolz/";
+        description = "List processing tools and functional utilities";
+        license = licenses.bsd3;
+        maintainers = with maintainers; [ fridh ];
+      };
+    };
+
+  in pkgs.python35.buildEnv.override rec {
+
+    extraLibs = [ pkgs.python35Packages.numpy toolz ];
+}
+).env
+```
+
+and again execute `nix-shell`, then we get a Python 3.5 environment with our
+locally defined package as well as `numpy` which is build according to the
+definition in Nixpkgs. What did we do here? Well, we took the Nix expression
+that we used earlier to build a Python environment, and said that we wanted to
+include our own version of `toolz`. To introduce our own package in the scope of
+`buildEnv.override` we used a
+[`let`](http://nixos.org/nix/manual/#sec-constructs) expression.
+
+### Handling dependencies
+
+Our example, `toolz`, doesn't have any dependencies on other Python
+packages or system libraries. According to the manual,  `buildPythonPackage`
+uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is
+exclusively a build-time dependency, then the dependency should be included as a
+`buildInput`, but if it is (also) a runtime dependency, then it should be added
+to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies.
+
+The following example shows which arguments are given to `buildPythonPackage` in
+order to build [`datashape`](https://github.com/blaze/datashape).
+
+```nix
+datashape = buildPythonPackage rec {
+  name = "datashape-${version}";
+  version = "0.4.7";
+
+  src = pkgs.fetchurl {
+    url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz";
+    sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278";
+  };
+
+  buildInputs = with self; [ pytest ];
+  propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
+
+  meta = {
+    homepage = https://github.com/ContinuumIO/datashape;
+    description = "A data description language";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ fridh ];
+  };
+};
+```
+
+We can see several runtime dependencies, `numpy`, `multipledispatch`, and
+`dateutil`. Furthermore, we have one `buildInput`, i.e. `pytest`. `pytest` is a
+test runner and is only used during the `checkPhase` and is therefore not added
+to `propagatedBuildInputs`.
+
+In the previous case we had only dependencies on other Python packages to consider.
+Occasionally you have also system libraries to consider. E.g., `lxml` provides
+Python bindings to `libxml2` and `libxslt`. These libraries are only required
+when building the bindings and are therefore added as `buildInputs`.
+
+```nix
+lxml = buildPythonPackage rec {
+  name = "lxml-3.4.4";
+
+  src = pkgs.fetchurl {
+    url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz";
+    sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk";
+  };
+
+  buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ];
+
+  meta = {
+    description = "Pythonic binding for the libxml2 and libxslt libraries";
+    homepage = http://lxml.de;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ sjourdois ];
+  };
+};
+```
+
+In this example `lxml` and Nix are able to work out exactly where the relevant
+files of the dependencies are. This is not always the case.
+
+The example below shows bindings to The Fastest Fourier Transform in the West, commonly known as
+FFTW. On Nix we have separate packages of FFTW for the different types of floats
+(`"single"`, `"double"`, `"long-double"`). The bindings need all three types,
+and therefore we add all three as `buildInputs`. The bindings don't expect to
+find each of them in a different folder, and therefore we have to set `LDFLAGS`
+and `CFLAGS`.
+
+```nix
+pyfftw = buildPythonPackage rec {
+  name = "pyfftw-${version}";
+  version = "0.9.2";
+
+  src = pkgs.fetchurl {
+    url = "https://pypi.python.org/packages/source/p/pyFFTW/pyFFTW-${version}.tar.gz";
+    sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074";
+  };
+
+  buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble];
+
+  propagatedBuildInputs = with self; [ numpy scipy ];
+
+  # Tests cannot import pyfftw. pyfftw works fine though.
+  doCheck = false;
+
+  LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib"
+  CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include"
+  '';
+
+  meta = {
+    description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
+    homepage = http://hgomersall.github.com/pyFFTW/;
+    license = with licenses; [ bsd2 bsd3 ];
+    maintainer = with maintainers; [ fridh ];
+  };
+};
+```
+Note also the line `doCheck = false;`, we explicitly disabled running the test-suite.
+
+
+#### Develop local package
+
+As a Python developer you're likely aware of [development mode](http://pythonhosted.org/setuptools/setuptools.html#development-mode) (`python setup.py develop`);
+instead of installing the package this command creates a special link to the project code.
+That way, you can run updated code without having to reinstall after each and every change you make.
+Development mode is also available on Nix as [explained](http://nixos.org/nixpkgs/manual/#ssec-python-development) in the Nixpkgs manual.
+Let's see how you can use it.
+
+In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using
+
+```nix
+src = ./path/to/source/tree;
+```
+
+If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src`
+is a local source, and if the local source has a `setup.py`, then development
+mode is activated.
+
+In the following example we create a simple environment that
+has a Python 3.5 version of our package in it, as well as its dependencies and
+other packages we like to have in the environment, all specified with `propagatedBuildInputs`.
+Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`.
+
+```nix
+with import <nixpkgs>;
+with pkgs.python35Packages;
+
+buildPythonPackage rec {
+  name = "mypackage";
+  src = ./path/to/package/source;
+  propagatedBuildInputs = [ pytest numpy pkgs.libsndfile ];
+};
+```
+
+It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode.
+
+
+### Organising your packages
+
+So far we discussed how you can use Python on Nix, and how you can develop with
+it. We've looked at how you write expressions to package Python packages, and we
+looked at how you can create environments in which specified packages are
+available.
+
+At some point you'll likely have multiple packages which you would
+like to be able to use in different projects. In order to minimise unnecessary
+duplication we now look at how you can maintain yourself a repository with your
+own packages. The important functions here are `import` and `callPackage`.
+
+### Including a derivation using `callPackage`
+
+Earlier we created a Python environment using `buildEnv`, and included the
+`toolz` package via a `let` expression.
+Let's split the package definition from the environment definition.
+
+We first create a function that builds `toolz` in `~/path/to/toolz/release.nix`
+
+```nix
+{ pkgs, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "toolz-${version}";
+  version = "0.7.4";
+
+  src = pkgs.fetchurl{
+    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
+  };
+
+  meta = {
+    homepage = "http://github.com/pytoolz/toolz/";
+    description = "List processing tools and functional utilities";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fridh ];
+  };
+};
+```
+
+It takes two arguments, `pkgs` and `buildPythonPackage`.
+We now call this function using `callPackage` in the definition of our environment
+
+```nix
+with import <nixpkgs> {};
+
+( let
+    toolz = pkgs.callPackage ~/path/to/toolz/release.nix { pkgs=pkgs; buildPythonPackage=pkgs.python35Packages.buildPythonPackage; };
+  in pkgs.python35.buildEnv.override rec {
+    extraLibs = [ pkgs.python35Packages.numpy  toolz ];
+}
+).env
+```
+
+Important to remember is that the Python version for which the package is made
+depends on the `python` derivation that is passed to `buildPythonPackage`. Nix
+tries to automatically pass arguments when possible, which is why generally you
+don't explicitly define which `python` derivation should be used. In the above
+example we use `buildPythonPackage` that is part of the set `python35Packages`,
+and in this case the `python35` interpreter is automatically used.
+
+
+
+## Reference
+
+### Interpreters
+
+Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available on
+Nix and are available as `python26`, `python27`, `python33`, `python34` and
+`python35`. The PyPy interpreter is also available as `pypy`. Currently, the
+aliases `python` and `python3` correspond to respectively `python27` and
+`python35`. The Nix expressions for the interpreters can be found in
+`pkgs/development/interpreters/python`.
+
+
+#### Missing modules standard library
+
+The interpreters `python26` and `python27` do not include modules that
+require external dependencies. This is done in order to reduce the closure size.
+The following modules need to be added as `buildInput` explicitly:
+
+* `python.modules.bsddb`
+* `python.modules.curses`
+* `python.modules.curses_panel`
+* `python.modules.crypt`
+* `python.modules.gdbm`
+* `python.modules.sqlite3`
+* `python.modules.tkinter`
+* `python.modules.readline`
+
+For convenience `python27Full` and `python26Full` are provided with all
+modules included.
+
+All packages depending on any Python interpreter get appended
+`out/{python.sitePackages}` to `$PYTHONPATH` if such directory
+exists.
+
+#### Attributes on interpreters packages
+
+Each interpreter has the following attributes:
+
+- `libPrefix`. Name of the folder in `${python}/lib/` for corresponding interpreter.
+- `interpreter`. Alias for `${python}/bin/${executable}`.
+- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation.
+- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`.
+- `executable`. Name of the interpreter executable, ie `python3.4`.
+
+### Building packages and applications
+
+Python packages (libraries) and applications that use `setuptools` or
+`distutils` are typically built with respectively the `buildPythonPackage` and
+`buildPythonApplication` functions.
+
+All Python packages reside in `pkgs/top-level/python-packages.nix` and all
+applications elsewhere. Some packages are also defined in
+`pkgs/development/python-modules`. It is important that these packages are
+called in `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee
+the right version of the package is built.
+
+Based on the packages defined in `pkgs/top-level/python-packages.nix` an
+attribute set is created for each available Python interpreter. The available
+sets are
+
+* `pkgs.python26Packages`
+* `pkgs.python27Packages`
+* `pkgs.python33Packages`
+* `pkgs.python34Packages`
+* `pkgs.python35Packages`
+* `pkgs.pypyPackages`
+
+and the aliases
+
+* `pkgs.pythonPackages` pointing to `pkgs.python27Packages`
+* `pkgs.python3Packages` pointing to `pkgs.python35Packages`
+
+#### `buildPythonPackage` function
+
+The `buildPythonPackage` function is implemented in
+`pkgs/development/python-modules/generic/default.nix`
+
+and can be used as:
+
+    twisted = buildPythonPackage {
+      name = "twisted-8.1.0";
+
+      src = pkgs.fetchurl {
+        url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
+        sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
+      };
+
+      propagatedBuildInputs = [ self.ZopeInterface ];
+
+      meta = {
+        homepage = http://twistedmatrix.com/;
+        description = "Twisted, an event-driven networking engine written in Python";
+        license = stdenv.lib.licenses.mit; };
+      };
+
+The `buildPythonPackage` mainly does four things:
+
+* In the `buildPhase`, it calls `${python.interpreter} setup.py bdist_wheel` to build a wheel binary zipfile.
+* In the `installPhase`, it installs the wheel file using `pip install *.whl`.
+* In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to wrap all programs in the `$out/bin/*` directory to include `$PYTHONPATH` and `$PATH` environment variables.
+* In the `installCheck` phase, `${python.interpreter} setup.py test` is ran.
+
+As in Perl, dependencies on other Python packages can be specified in the
+`buildInputs` and `propagatedBuildInputs` attributes.  If something is
+exclusively a build-time dependency, use `buildInputs`; if it’s (also) a runtime
+dependency, use `propagatedBuildInputs`.
+
+By default tests are run because `doCheck = true`. Test dependencies, like
+e.g. the test runner, should be added to `buildInputs`.
+
+By default `meta.platforms` is set to the same value
+as the interpreter unless overriden otherwise.
+
+##### `buildPythonPackage` parameters
+
+All parameters from `mkDerivation` function are still supported.
+
+* `namePrefix`: Prepended text to `${name}` parameter. Defaults to `"python3.3-"` for Python 3.3, etc. Set it to `""` if you're packaging an application or a command line tool.
+* `disabled`: If `true`, package is not build for particular python interpreter version. Grep around `pkgs/top-level/python-packages.nix` for examples.
+* `setupPyBuildFlags`: List of flags passed to `setup.py build_ext` command.
+* `pythonPath`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`).
+* `preShellHook`: Hook to execute commands before `shellHook`.
+* `postShellHook`: Hook to execute commands after `shellHook`.
+* `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
+* `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
+
+#### `buildPythonApplication` function
+
+The `buildPythonApplication` function is practically the same as `buildPythonPackage`.
+The difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter.
+Because with an application we're not interested in multiple version the prefix is dropped.
+
+#### python.buildEnv function
+
+Python environments can be created using the low-level `pkgs.buildEnv` function.
+This example shows how to create an environment that has the Pyramid Web Framework.
+Saving the following as `default.nix`
+
+    with import {};
+
+    python.buildEnv.override {
+      extraLibs = [ pkgs.pythonPackages.pyramid ];
+      ignoreCollisions = true;
+    }
+
+and running `nix-build` will create
+
+    /nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env
+
+with wrapped binaries in `bin/`.
+
+You can also use the `env` attribute to create local environments with needed
+packages installed. This is somewhat comparable to `virtualenv`. For example,
+running `nix-shell` with the following `shell.nix`
+
+    with import {};
+
+    (python3.buildEnv.override {
+      extraLibs = with python3Packages; [ numpy requests ];
+    }).env
+
+will drop you into a shell where Python will have the
+specified packages in its path.
+
+
+##### `python.buildEnv` arguments
+
+* `extraLibs`: List of packages installed inside the environment.
+* `postBuild`: Shell command executed after the build of environment.
+* `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`).
+
+### Development mode
+
+Development or editable mode is supported. To develop Python packages
+`buildPythonPackage` has additional logic inside `shellPhase` to run `pip
+install -e . --prefix $TMPDIR/`for the package.
+
+Warning: `shellPhase` is executed only if `setup.py` exists.
+
+Given a `default.nix`:
+
+    with import {};
+
+    buildPythonPackage { name = "myproject";
+
+    buildInputs = with pkgs.pythonPackages; [ pyramid ];
+
+    src = ./.; }
+
+Running `nix-shell` with no arguments should give you
+the environment in which the package would be build with
+`nix-build`.
+
+Shortcut to setup environments with C headers/libraries and python packages:
+
+    $ nix-shell -p pythonPackages.pyramid zlib libjpeg git
+
+Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked.
+
+### Tools
+
+Packages inside nixpkgs are written by hand. However many tools exist in
+community to help save time. No tool is preferred at the moment.
+
+- [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov
+- [pypi2nix](https://github.com/garbas/pypi2nix) by Rok Garbas
+- [pypi2nix](https://github.com/offlinehacker/pypi2nix) by Jaka Hudoklin
+
+## FAQ
+
+### How to solve circular dependencies?
+
+Consider the packages `A` and `B` that depend on each other. When packaging `B`,
+a solution is to override package `A` not to depend on `B` as an input. The same
+should also be done when packaging `A`.
+
+### `install_data` / `data_files` problems
+
+If you get the following error:
+
+    could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc':
+    Permission denied
+
+This is a [known bug](https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix) in setuptools.
+Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`.
+As workaround install it as an extra `preInstall` step:
+
+    ${python.interpreter} setup.py install_data --install-dir=$out --root=$out
+    sed -i '/ = data\_files/d' setup.py
+
+
+###  Rationale of non-existent global site-packages
+
+On most operating systems a global `site-packages` is maintained. This however
+becomes problematic if you want to run multiple Python versions or have multiple
+versions of certain libraries for your projects. Generally, you would solve such
+issues by creating virtual environments using `virtualenv`.
+
+On Nix each package has an isolated dependency tree which, in the case of
+Python, guarantees the right versions of the interpreter and libraries or
+packages are available. There is therefore no need to maintain a global `site-packages`.
+
+If you want to create a Python environment for development, then the recommended
+method is to use `nix-shell`, either with or without the `python.buildEnv`
+function.
+
+
+## Contributing
+
+### Contributing guidelines
+
+Following rules are desired to be respected:
+
+* Make sure package builds for all python interpreters. Use `disabled` argument to `buildPythonPackage` to set unsupported interpreters.
+* If tests need to be disabled for a package, make sure you leave a comment about reasoning.
+* Packages in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
+* Python libraries are supposed to be in `python-packages.nix` and packaged with `buildPythonPackage`. Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`.
diff --git a/doc/languages-frameworks/python.xml b/doc/languages-frameworks/python.xml
deleted file mode 100644
index 57aceeb4868..00000000000
--- a/doc/languages-frameworks/python.xml
+++ /dev/null
@@ -1,447 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="sec-python">
-
-<title>Python</title>
-
-<para>
-  Currently supported interpreters are <varname>python26</varname>, <varname>python27</varname>,
-  <varname>python33</varname>, <varname>python34</varname>, <varname>python35</varname>
-  and <varname>pypy</varname>.
-</para>
-
-<para>
-  <varname>python</varname> is an alias to <varname>python27</varname> and <varname>python3</varname> is an alias to <varname>python34</varname>.
-</para>
-
-<para>
-  <varname>python26</varname> and <varname>python27</varname> do not include modules that require
-  external dependencies (to reduce dependency bloat). Following modules need to be added as
-  <varname>buildInput</varname> explicitly:
-</para>
-
-<itemizedlist>
-  <listitem><para><varname>python.modules.bsddb</varname></para></listitem>
-  <listitem><para><varname>python.modules.curses</varname></para></listitem>
-  <listitem><para><varname>python.modules.curses_panel</varname></para></listitem>
-  <listitem><para><varname>python.modules.crypt</varname></para></listitem>
-  <listitem><para><varname>python.modules.gdbm</varname></para></listitem>
-  <listitem><para><varname>python.modules.sqlite3</varname></para></listitem>
-  <listitem><para><varname>python.modules.tkinter</varname></para></listitem>
-  <listitem><para><varname>python.modules.readline</varname></para></listitem>
-</itemizedlist>
-
-<para>For convenience <varname>python27Full</varname> and <varname>python26Full</varname>
-are provided with all modules included.</para>
-
-<para>
-  Python packages that
-  use <link xlink:href="http://pypi.python.org/pypi/setuptools/"><literal>setuptools</literal></link> or <literal>distutils</literal>,
-  can be built using the <varname>buildPythonPackage</varname> function as documented below.
-</para>
-
-<para>
- All packages depending on any Python interpreter get appended <varname>$out/${python.sitePackages}</varname>
- to <literal>$PYTHONPATH</literal> if such directory exists.
-</para>
-
-<variablelist>
-  <title>
-     Useful attributes on interpreters packages:
-  </title>
-
-  <varlistentry>
-    <term><varname>libPrefix</varname></term>
-    <listitem><para>
-        Name of the folder in <literal>${python}/lib/</literal> for corresponding interpreter.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>interpreter</varname></term>
-    <listitem><para>
-        Alias for <literal>${python}/bin/${executable}.</literal>
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>buildEnv</varname></term>
-    <listitem><para>
-        Function to build python interpreter environments with extra packages bundled together.
-        See <xref linkend="ssec-python-build-env" /> for usage and documentation.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>sitePackages</varname></term>
-    <listitem><para>
-      Alias for <literal>lib/${libPrefix}/site-packages</literal>.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>executable</varname></term>
-    <listitem><para>
-      Name of the interpreter executable, ie <literal>python3.4</literal>.
-    </para></listitem>
-  </varlistentry>
-
-</variablelist>
-<section xml:id="ssec-build-python-package"><title><varname>buildPythonPackage</varname> function</title>
-
-  <para>
-  The function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix">
-  <filename>pkgs/development/python-modules/generic/default.nix</filename></link>.
-  Example usage:
-
-<programlisting language="nix">
-twisted = buildPythonPackage {
-  name = "twisted-8.1.0";
-
-  src = pkgs.fetchurl {
-    url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
-    sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
-  };
-
-  propagatedBuildInputs = [ self.ZopeInterface ];
-
-  meta = {
-    homepage = http://twistedmatrix.com/;
-    description = "Twisted, an event-driven networking engine written in Python";
-    license = stdenv.lib.licenses.mit;
-  };
-};
-</programlisting>
-
-  Most of Python packages that use <varname>buildPythonPackage</varname> are defined
-  in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>
-  and generated for each python interpreter separately into attribute sets <varname>python26Packages</varname>,
-  <varname>python27Packages</varname>, <varname>python35Packages</varname>, <varname>python33Packages</varname>,
-  <varname>python34Packages</varname> and <varname>pypyPackages</varname>.
-  </para>
-
-  <para>
-    <function>buildPythonPackage</function> mainly does four things:
-
-    <orderedlist>
-      <listitem><para>
-        In the <varname>buildPhase</varname>, it calls
-        <literal>${python.interpreter} setup.py bdist_wheel</literal> to build a wheel binary zipfile.
-      </para></listitem>
-
-      <listitem><para>
-        In the <varname>installPhase</varname>, it installs the wheel file using
-        <literal>pip install *.whl</literal>.
-      </para></listitem>
-
-      <listitem><para>
-        In the <varname>postFixup</varname> phase, <literal>wrapPythonPrograms</literal>
-        bash function is called to wrap all programs in <filename>$out/bin/*</filename>
-        directory to include <literal>$PYTHONPATH</literal> and <literal>$PATH</literal>
-        environment variables.
-      </para></listitem>
-
-      <listitem><para>
-        In the <varname>installCheck</varname> phase, <literal>${python.interpreter} setup.py test</literal>
-        is ran.
-      </para></listitem>
-    </orderedlist>
-  </para>
-
-  <para>By default <varname>doCheck = true</varname> is set</para>
-
-  <para>
-    As in Perl, dependencies on other Python packages can be specified in the
-    <varname>buildInputs</varname> and
-    <varname>propagatedBuildInputs</varname> attributes.  If something is
-    exclusively a build-time dependency, use
-    <varname>buildInputs</varname>; if it’s (also) a runtime dependency,
-    use <varname>propagatedBuildInputs</varname>.
-  </para>
-
-  <para>
-    By default <varname>meta.platforms</varname> is set to the same value
-    as the interpreter unless overriden otherwise.
-  </para>
-
-  <variablelist>
-    <title>
-      <varname>buildPythonPackage</varname> parameters
-      (all parameters from <varname>mkDerivation</varname> function are still supported)
-    </title>
-
-    <varlistentry>
-      <term><varname>namePrefix</varname></term>
-      <listitem><para>
-        Prepended text to <varname>${name}</varname> parameter.
-        Defaults to <literal>"python3.3-"</literal> for Python 3.3, etc. Set it to
-        <literal>""</literal>
-        if you're packaging an application or a command line tool.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>disabled</varname></term>
-      <listitem><para>
-        If <varname>true</varname>, package is not build for
-        particular python interpreter version. Grep around
-        <filename>pkgs/top-level/python-packages.nix</filename>
-        for examples.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>setupPyBuildFlags</varname></term>
-      <listitem><para>
-        List of flags passed to <command>setup.py build_ext</command> command.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>pythonPath</varname></term>
-      <listitem><para>
-        List of packages to be added into <literal>$PYTHONPATH</literal>.
-        Packages in <varname>pythonPath</varname> are not propagated
-        (contrary to <varname>propagatedBuildInputs</varname>).
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>preShellHook</varname></term>
-      <listitem><para>
-        Hook to execute commands before <varname>shellHook</varname>.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>postShellHook</varname></term>
-      <listitem><para>
-        Hook to execute commands after <varname>shellHook</varname>.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>makeWrapperArgs</varname></term>
-      <listitem><para>
-        A list of strings. Arguments to be passed to
-        <varname>makeWrapper</varname>, which wraps generated binaries. By
-        default, the arguments to <varname>makeWrapper</varname> set
-        <varname>PATH</varname> and <varname>PYTHONPATH</varname> environment
-        variables before calling the binary. Additional arguments here can
-        allow a developer to set environment variables which will be
-        available when the binary is run. For example,
-        <varname>makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]</varname>.
-      </para></listitem>
-    </varlistentry>
-
-  </variablelist>
-
-</section>
-
-<section xml:id="ssec-python-build-env"><title><function>python.buildEnv</function> function</title>
-  <para>
-    Create Python environments using low-level <function>pkgs.buildEnv</function> function. Example <filename>default.nix</filename>:
-
-<programlisting language="nix">
-<![CDATA[with import <nixpkgs> {};
-
-python.buildEnv.override {
-  extraLibs = [ pkgs.pythonPackages.pyramid ];
-  ignoreCollisions = true;
-}]]>
-</programlisting>
-
-    Running <command>nix-build</command> will create
-    <filename>/nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env</filename>
-    with wrapped binaries in <filename>bin/</filename>.
-  </para>
-
-  <para>
-  You can also use <varname>env</varname> attribute to create local
-  environments with needed packages installed (somewhat comparable to
-  <literal>virtualenv</literal>). For example, with the following
-  <filename>shell.nix</filename>:
-
-<programlisting language="nix">
-<![CDATA[with import <nixpkgs> {};
-
-(python3.buildEnv.override {
-  extraLibs = with python3Packages;
-    [ numpy
-      requests
-    ];
-}).env]]>
-</programlisting>
-
-  Running <command>nix-shell</command> will drop you into a shell where
-  <command>python</command> will have specified packages in its path.
-  </para>
-
-  <variablelist>
-    <title>
-      <function>python.buildEnv</function> arguments
-    </title>
-
-    <varlistentry>
-      <term><varname>extraLibs</varname></term>
-      <listitem><para>
-        List of packages installed inside the environment.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>postBuild</varname></term>
-      <listitem><para>
-        Shell command executed after the build of environment.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>ignoreCollisions</varname></term>
-      <listitem><para>
-         Ignore file collisions inside the environment (default is <varname>false</varname>).
-      </para></listitem>
-    </varlistentry>
-  </variablelist>
-</section>
-
-<section xml:id="ssec-python-tools"><title>Tools</title>
-
-<para>Packages inside nixpkgs are written by hand. However many tools
-exist in community to help save time. No tool is preferred at the moment.
-</para>
-
-<itemizedlist>
-
-  <listitem><para>
-    <link xlink:href="https://github.com/proger/python2nix">python2nix</link>
-    by Vladimir Kirillov
-  </para></listitem>
-
-  <listitem><para>
-    <link xlink:href="https://github.com/garbas/pypi2nix">pypi2nix</link>
-    by Rok Garbas
-  </para></listitem>
-
-  <listitem><para>
-    <link xlink:href="https://github.com/offlinehacker/pypi2nix">pypi2nix</link>
-    by Jaka Hudoklin
-  </para></listitem>
-
-</itemizedlist>
-
-</section>
-
-<section xml:id="ssec-python-development"><title>Development</title>
-
-  <para>
-    To develop Python packages <function>buildPythonPackage</function> has
-    additional logic inside <varname>shellPhase</varname> to run
-    <command>pip install -e . --prefix $TMPDIR/</command> for the package.
-  </para>
-
-  <warning><para><varname>shellPhase</varname> is executed only if <filename>setup.py</filename>
-  exists.</para></warning>
-
-  <para>
-    Given a <filename>default.nix</filename>:
-
-<programlisting language="nix">
-<![CDATA[with import <nixpkgs> {};
-
-buildPythonPackage {
-  name = "myproject";
-
-  buildInputs = with pkgs.pythonPackages; [ pyramid ];
-
-  src = ./.;
-}]]>
-</programlisting>
-
-    Running <command>nix-shell</command> with no arguments should give you
-    the environment in which the package would be build with
-    <command>nix-build</command>.
-  </para>
-
-  <para>
-    Shortcut to setup environments with C headers/libraries and python packages:
-
-    <programlisting language="bash">$ nix-shell -p pythonPackages.pyramid zlib libjpeg git</programlisting>
-  </para>
-
-  <note><para>
-    There is a boolean value <varname>lib.inNixShell</varname> set to
-    <varname>true</varname> if nix-shell is invoked.
-  </para></note>
-
-</section>
-
-<section xml:id="ssec-python-faq"><title>FAQ</title>
-
-<variablelist>
-
-  <varlistentry>
-    <term>How to solve circular dependencies?</term>
-    <listitem><para>
-      If you have packages <varname>A</varname> and <varname>B</varname> that
-      depend on each other, when packaging <varname>B</varname> override package
-      <varname>A</varname> not to depend on <varname>B</varname> as input
-      (and also the other way around).
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>install_data / data_files</varname> problems resulting into <literal>error: could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc': Permission denied</literal></term>
-    <listitem><para>
-      <link xlink:href="https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix">
-      Known bug in setuptools <varname>install_data</varname> does not respect --prefix</link>. Example of
-      such package using the feature is <filename>pkgs/tools/X11/xpra/default.nix</filename>. As workaround
-      install it as an extra <varname>preInstall</varname> step:
-
-      <programlisting>${python.interpreter} setup.py install_data --install-dir=$out --root=$out
-sed -i '/ = data_files/d' setup.py</programlisting>
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Rationale of non-existent global site-packages</term>
-    <listitem><para>
-      There is no need to have global site-packages in Nix. Each package has isolated
-      dependency tree and installing any python package will only populate <varname>$PATH</varname>
-      inside user environment. See <xref linkend="ssec-python-build-env" /> to create self-contained
-      interpreter with a set of packages.
-    </para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-</section>
-
-
-<section xml:id="ssec-python-contrib"><title>Contributing guidelines</title>
-<para>
-  Following rules are desired to be respected:
-</para>
-
-<itemizedlist>
-
-  <listitem><para>
-    Make sure package builds for all python interpreters. Use <varname>disabled</varname> argument to
-    <function>buildPythonPackage</function> to set unsupported interpreters.
-  </para></listitem>
-
-  <listitem><para>
-    If tests need to be disabled for a package, make sure you leave a comment about reasoning.
-  </para></listitem>
-
-  <listitem><para>
-    Packages in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>
-    are sorted quasi-alphabetically to avoid merge conflicts.
-  </para></listitem>
-
-</itemizedlist>
-
-</section>
-
-</section>
-

From 9310bd15de5eed356f36bf3c5dcab0a2d5957a37 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <freddyrietdijk@fridh.nl>
Date: Sat, 5 Mar 2016 18:01:23 -0500
Subject: [PATCH 330/338] Revert "Documentation: rewrite Python docs"

---
 doc/default.nix                     |   6 -
 doc/languages-frameworks/python.md  | 668 ----------------------------
 doc/languages-frameworks/python.xml | 447 +++++++++++++++++++
 3 files changed, 447 insertions(+), 674 deletions(-)
 delete mode 100644 doc/languages-frameworks/python.md
 create mode 100644 doc/languages-frameworks/python.xml

diff --git a/doc/default.nix b/doc/default.nix
index 203555de131..196b9e44539 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -45,10 +45,6 @@ stdenv.mkDerivation {
   + toDocbook {
       inputFile = ./introduction.md;
       outputFile = "introduction.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/python.md;
-      outputFile = "./languages-frameworks/python.xml";
       useChapters = true;
     }
   + toDocbook {
@@ -65,8 +61,6 @@ stdenv.mkDerivation {
       outputFile = "languages-frameworks/r.xml";
     }
   + ''
-    cat -n languages-frameworks/python.xml
-
     echo ${nixpkgsVersion} > .version
 
     xmllint --noout --nonet --xinclude --noxincludenode \
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
deleted file mode 100644
index d05cabac3ff..00000000000
--- a/doc/languages-frameworks/python.md
+++ /dev/null
@@ -1,668 +0,0 @@
-# Python
-
-## User Guide
-
-Several versions of Python are available on Nix as well as a high amount of
-packages. The default interpreter is CPython 2.7.
-
-### Using Python
-
-#### Installing Python and packages
-
-It is important to make a distinction between Python packages that are
-used as libraries, and applications that are written in Python.
-
-Applications on Nix are installed typically into your user
-profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the
-package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`.
-Dependencies such as libraries are automatically installed and should not be
-installed explicitly.
-
-The same goes for Python applications and libraries. Python applications can be
-installed in your profile, but Python libraries you would like to use to develop
-cannot. If you do install libraries in your profile, then you will end up with
-import errors.
-
-#### Python environments using `nix-shell`
-
-The recommended method for creating Python environments for development is with
-`nix-shell`. Executing
-
-```sh
-$ nix-shell -p python35Packages.numpy python35Packages.toolz
-```
-
-opens a Nix shell which has available the requested packages and dependencies.
-Now you can launch the Python interpreter (which is itself a dependency)
-
-```sh
-[nix-shell:~] python3
-```
-
-If the packages were not available yet in the Nix store, Nix would download or
-build them automatically. A convenient option with `nix-shell` is the `--run`
-option, with which you can execute a command in the `nix-shell`. Let's say we
-want the above environment and directly run the Python interpreter
-
-```sh
-$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3"
-```
-
-This way you can use the `--run` option also to directly run a script
-
-```sh
-$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py"
-```
-
-In fact, for this specific use case there is a more convenient method. You can
-add a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script
-specifying which dependencies Nix shell needs. With the following shebang, you
-can use `nix-shell myscript.py` and it will make available all dependencies and
-run the script in the `python3` shell.
-
-```py
-#! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p python3Packages.numpy
-
-import numpy
-
-print(numpy.__version__)
-```
-
-Likely you do not want to type your dependencies each and every time. What you
-can do is write a simple Nix expression which sets up an environment for you,
-requiring you only to type `nix-shell`. Say we want to have Python 3.5, `numpy`
-and `toolz`, like before, in an environment. With a `shell.nix` file
-containing
-
-```nix
-with import <nixpkgs> {};
-
-(pkgs.python35.buildEnv.override  {
-  extraLibs = with pkgs.python35Packages; [ numpy toolz ];
-}).env
-```
-executing `nix-shell` gives you again a Nix shell from which you can run Python.
-
-What's happening here?
-
-1. We begin with importing the Nix Packages collections. `import <nixpkgs>` import the `<nixpkgs>` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. Therefore we can now use `pkgs`.
-2. Then we create a Python 3.5 environment with `pkgs.buildEnv`. Because we want to use it with a custom set of Python packages, we override it.
-3. The `extraLibs` argument of the original `buildEnv` function can be used to specify which packages should be included. We want `numpy` and `toolz`. Again, we use the `with` statement to bring a set of attributes into the local scope.
-4. And finally, for in interactive use we return the environment.
-
-### Developing with Python
-
-
-Now that you know how to get a working Python environment on Nix, it is time to go forward and start actually developing with Python.
-We will first have a look at how Python packages are packaged on Nix. Then, we will look how you can use development mode with your code.
-
-#### Python packaging on Nix
-
-On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix).
-Let's see how we would build the `toolz` package. According to [`python-packages.nix`](https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/top-level/python-packages.nix) `toolz` is build using
-
-```nix
-toolz = buildPythonPackage rec{
-  name = "toolz-${version}";
-  version = "0.7.4";
-
-  src = pkgs.fetchurl{
-    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
-    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
-  };
-
-  meta = {
-    homepage = "http://github.com/pytoolz/toolz/";
-    description = "List processing tools and functional utilities";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fridh ];
-  };
-};
-```
-
-What happens here? The function `buildPythonPackage` is called and as argument
-it accepts a set. In this case the set is a recursive set ([`rec`](http://nixos.org/nix/manual/#sec-constructs)).
-One of the arguments is the name of the package, which consists of a basename
-(generally following the name on PyPi) and a version. Another argument, `src`
-specifies the source, which in this case is fetched from an url. `fetchurl` not
-only downloads the target file, but also validates its hash. Furthermore, we
-specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap-meta).
-
-The output of the function is a derivation, which is an attribute with the name
-`toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions,
-so `python27Packages`, `python34Packages`, `python35Packages` and `pypyPackages`.
-
-The above example works when you're directly working on
-`pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though,
-you will want to test a Nix expression outside of the Nixpkgs tree. If you
-create a `shell.nix` file with the following contents
-
-```nix
-with import <nixpkgs> {};
-
-pkgs.python35Packages.buildPythonPackage rec {
-  name = "toolz-${version}";
-  version = "0.7.4";
-
-  src = pkgs.fetchurl{
-    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
-    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
-  };
-
-  meta = {
-    homepage = "http://github.com/pytoolz/toolz/";
-    description = "List processing tools and functional utilities";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fridh ];
-  };
-}
-```
-
-and then execute `nix-shell` will result in an environment in which you can use
-Python 3.5 and the `toolz` package. As you can see we had to explicitly mention
-for which Python version we want to build a package.
-
-The above example considered only a single package. Generally you will want to use multiple packages.
-If we create a `shell.nix` file with the following contents
-
-```nix
-with import <nixpkgs> {};
-
-( let
-    toolz = pkgs.python35Packages.buildPythonPackage rec {
-      name = "toolz-${version}";
-      version = "0.7.4";
-
-      src = pkgs.fetchurl{
-        url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
-        sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
-      };
-
-      meta = {
-        homepage = "http://github.com/pytoolz/toolz/";
-        description = "List processing tools and functional utilities";
-        license = licenses.bsd3;
-        maintainers = with maintainers; [ fridh ];
-      };
-    };
-
-  in pkgs.python35.buildEnv.override rec {
-
-    extraLibs = [ pkgs.python35Packages.numpy toolz ];
-}
-).env
-```
-
-and again execute `nix-shell`, then we get a Python 3.5 environment with our
-locally defined package as well as `numpy` which is build according to the
-definition in Nixpkgs. What did we do here? Well, we took the Nix expression
-that we used earlier to build a Python environment, and said that we wanted to
-include our own version of `toolz`. To introduce our own package in the scope of
-`buildEnv.override` we used a
-[`let`](http://nixos.org/nix/manual/#sec-constructs) expression.
-
-### Handling dependencies
-
-Our example, `toolz`, doesn't have any dependencies on other Python
-packages or system libraries. According to the manual,  `buildPythonPackage`
-uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is
-exclusively a build-time dependency, then the dependency should be included as a
-`buildInput`, but if it is (also) a runtime dependency, then it should be added
-to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies.
-
-The following example shows which arguments are given to `buildPythonPackage` in
-order to build [`datashape`](https://github.com/blaze/datashape).
-
-```nix
-datashape = buildPythonPackage rec {
-  name = "datashape-${version}";
-  version = "0.4.7";
-
-  src = pkgs.fetchurl {
-    url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz";
-    sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278";
-  };
-
-  buildInputs = with self; [ pytest ];
-  propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
-
-  meta = {
-    homepage = https://github.com/ContinuumIO/datashape;
-    description = "A data description language";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ fridh ];
-  };
-};
-```
-
-We can see several runtime dependencies, `numpy`, `multipledispatch`, and
-`dateutil`. Furthermore, we have one `buildInput`, i.e. `pytest`. `pytest` is a
-test runner and is only used during the `checkPhase` and is therefore not added
-to `propagatedBuildInputs`.
-
-In the previous case we had only dependencies on other Python packages to consider.
-Occasionally you have also system libraries to consider. E.g., `lxml` provides
-Python bindings to `libxml2` and `libxslt`. These libraries are only required
-when building the bindings and are therefore added as `buildInputs`.
-
-```nix
-lxml = buildPythonPackage rec {
-  name = "lxml-3.4.4";
-
-  src = pkgs.fetchurl {
-    url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz";
-    sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk";
-  };
-
-  buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ];
-
-  meta = {
-    description = "Pythonic binding for the libxml2 and libxslt libraries";
-    homepage = http://lxml.de;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sjourdois ];
-  };
-};
-```
-
-In this example `lxml` and Nix are able to work out exactly where the relevant
-files of the dependencies are. This is not always the case.
-
-The example below shows bindings to The Fastest Fourier Transform in the West, commonly known as
-FFTW. On Nix we have separate packages of FFTW for the different types of floats
-(`"single"`, `"double"`, `"long-double"`). The bindings need all three types,
-and therefore we add all three as `buildInputs`. The bindings don't expect to
-find each of them in a different folder, and therefore we have to set `LDFLAGS`
-and `CFLAGS`.
-
-```nix
-pyfftw = buildPythonPackage rec {
-  name = "pyfftw-${version}";
-  version = "0.9.2";
-
-  src = pkgs.fetchurl {
-    url = "https://pypi.python.org/packages/source/p/pyFFTW/pyFFTW-${version}.tar.gz";
-    sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074";
-  };
-
-  buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble];
-
-  propagatedBuildInputs = with self; [ numpy scipy ];
-
-  # Tests cannot import pyfftw. pyfftw works fine though.
-  doCheck = false;
-
-  LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib"
-  CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include"
-  '';
-
-  meta = {
-    description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
-    homepage = http://hgomersall.github.com/pyFFTW/;
-    license = with licenses; [ bsd2 bsd3 ];
-    maintainer = with maintainers; [ fridh ];
-  };
-};
-```
-Note also the line `doCheck = false;`, we explicitly disabled running the test-suite.
-
-
-#### Develop local package
-
-As a Python developer you're likely aware of [development mode](http://pythonhosted.org/setuptools/setuptools.html#development-mode) (`python setup.py develop`);
-instead of installing the package this command creates a special link to the project code.
-That way, you can run updated code without having to reinstall after each and every change you make.
-Development mode is also available on Nix as [explained](http://nixos.org/nixpkgs/manual/#ssec-python-development) in the Nixpkgs manual.
-Let's see how you can use it.
-
-In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using
-
-```nix
-src = ./path/to/source/tree;
-```
-
-If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src`
-is a local source, and if the local source has a `setup.py`, then development
-mode is activated.
-
-In the following example we create a simple environment that
-has a Python 3.5 version of our package in it, as well as its dependencies and
-other packages we like to have in the environment, all specified with `propagatedBuildInputs`.
-Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`.
-
-```nix
-with import <nixpkgs>;
-with pkgs.python35Packages;
-
-buildPythonPackage rec {
-  name = "mypackage";
-  src = ./path/to/package/source;
-  propagatedBuildInputs = [ pytest numpy pkgs.libsndfile ];
-};
-```
-
-It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode.
-
-
-### Organising your packages
-
-So far we discussed how you can use Python on Nix, and how you can develop with
-it. We've looked at how you write expressions to package Python packages, and we
-looked at how you can create environments in which specified packages are
-available.
-
-At some point you'll likely have multiple packages which you would
-like to be able to use in different projects. In order to minimise unnecessary
-duplication we now look at how you can maintain yourself a repository with your
-own packages. The important functions here are `import` and `callPackage`.
-
-### Including a derivation using `callPackage`
-
-Earlier we created a Python environment using `buildEnv`, and included the
-`toolz` package via a `let` expression.
-Let's split the package definition from the environment definition.
-
-We first create a function that builds `toolz` in `~/path/to/toolz/release.nix`
-
-```nix
-{ pkgs, buildPythonPackage }:
-
-buildPythonPackage rec {
-  name = "toolz-${version}";
-  version = "0.7.4";
-
-  src = pkgs.fetchurl{
-    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
-    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
-  };
-
-  meta = {
-    homepage = "http://github.com/pytoolz/toolz/";
-    description = "List processing tools and functional utilities";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fridh ];
-  };
-};
-```
-
-It takes two arguments, `pkgs` and `buildPythonPackage`.
-We now call this function using `callPackage` in the definition of our environment
-
-```nix
-with import <nixpkgs> {};
-
-( let
-    toolz = pkgs.callPackage ~/path/to/toolz/release.nix { pkgs=pkgs; buildPythonPackage=pkgs.python35Packages.buildPythonPackage; };
-  in pkgs.python35.buildEnv.override rec {
-    extraLibs = [ pkgs.python35Packages.numpy  toolz ];
-}
-).env
-```
-
-Important to remember is that the Python version for which the package is made
-depends on the `python` derivation that is passed to `buildPythonPackage`. Nix
-tries to automatically pass arguments when possible, which is why generally you
-don't explicitly define which `python` derivation should be used. In the above
-example we use `buildPythonPackage` that is part of the set `python35Packages`,
-and in this case the `python35` interpreter is automatically used.
-
-
-
-## Reference
-
-### Interpreters
-
-Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available on
-Nix and are available as `python26`, `python27`, `python33`, `python34` and
-`python35`. The PyPy interpreter is also available as `pypy`. Currently, the
-aliases `python` and `python3` correspond to respectively `python27` and
-`python35`. The Nix expressions for the interpreters can be found in
-`pkgs/development/interpreters/python`.
-
-
-#### Missing modules standard library
-
-The interpreters `python26` and `python27` do not include modules that
-require external dependencies. This is done in order to reduce the closure size.
-The following modules need to be added as `buildInput` explicitly:
-
-* `python.modules.bsddb`
-* `python.modules.curses`
-* `python.modules.curses_panel`
-* `python.modules.crypt`
-* `python.modules.gdbm`
-* `python.modules.sqlite3`
-* `python.modules.tkinter`
-* `python.modules.readline`
-
-For convenience `python27Full` and `python26Full` are provided with all
-modules included.
-
-All packages depending on any Python interpreter get appended
-`out/{python.sitePackages}` to `$PYTHONPATH` if such directory
-exists.
-
-#### Attributes on interpreters packages
-
-Each interpreter has the following attributes:
-
-- `libPrefix`. Name of the folder in `${python}/lib/` for corresponding interpreter.
-- `interpreter`. Alias for `${python}/bin/${executable}`.
-- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation.
-- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`.
-- `executable`. Name of the interpreter executable, ie `python3.4`.
-
-### Building packages and applications
-
-Python packages (libraries) and applications that use `setuptools` or
-`distutils` are typically built with respectively the `buildPythonPackage` and
-`buildPythonApplication` functions.
-
-All Python packages reside in `pkgs/top-level/python-packages.nix` and all
-applications elsewhere. Some packages are also defined in
-`pkgs/development/python-modules`. It is important that these packages are
-called in `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee
-the right version of the package is built.
-
-Based on the packages defined in `pkgs/top-level/python-packages.nix` an
-attribute set is created for each available Python interpreter. The available
-sets are
-
-* `pkgs.python26Packages`
-* `pkgs.python27Packages`
-* `pkgs.python33Packages`
-* `pkgs.python34Packages`
-* `pkgs.python35Packages`
-* `pkgs.pypyPackages`
-
-and the aliases
-
-* `pkgs.pythonPackages` pointing to `pkgs.python27Packages`
-* `pkgs.python3Packages` pointing to `pkgs.python35Packages`
-
-#### `buildPythonPackage` function
-
-The `buildPythonPackage` function is implemented in
-`pkgs/development/python-modules/generic/default.nix`
-
-and can be used as:
-
-    twisted = buildPythonPackage {
-      name = "twisted-8.1.0";
-
-      src = pkgs.fetchurl {
-        url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
-        sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
-      };
-
-      propagatedBuildInputs = [ self.ZopeInterface ];
-
-      meta = {
-        homepage = http://twistedmatrix.com/;
-        description = "Twisted, an event-driven networking engine written in Python";
-        license = stdenv.lib.licenses.mit; };
-      };
-
-The `buildPythonPackage` mainly does four things:
-
-* In the `buildPhase`, it calls `${python.interpreter} setup.py bdist_wheel` to build a wheel binary zipfile.
-* In the `installPhase`, it installs the wheel file using `pip install *.whl`.
-* In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to wrap all programs in the `$out/bin/*` directory to include `$PYTHONPATH` and `$PATH` environment variables.
-* In the `installCheck` phase, `${python.interpreter} setup.py test` is ran.
-
-As in Perl, dependencies on other Python packages can be specified in the
-`buildInputs` and `propagatedBuildInputs` attributes.  If something is
-exclusively a build-time dependency, use `buildInputs`; if it’s (also) a runtime
-dependency, use `propagatedBuildInputs`.
-
-By default tests are run because `doCheck = true`. Test dependencies, like
-e.g. the test runner, should be added to `buildInputs`.
-
-By default `meta.platforms` is set to the same value
-as the interpreter unless overriden otherwise.
-
-##### `buildPythonPackage` parameters
-
-All parameters from `mkDerivation` function are still supported.
-
-* `namePrefix`: Prepended text to `${name}` parameter. Defaults to `"python3.3-"` for Python 3.3, etc. Set it to `""` if you're packaging an application or a command line tool.
-* `disabled`: If `true`, package is not build for particular python interpreter version. Grep around `pkgs/top-level/python-packages.nix` for examples.
-* `setupPyBuildFlags`: List of flags passed to `setup.py build_ext` command.
-* `pythonPath`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`).
-* `preShellHook`: Hook to execute commands before `shellHook`.
-* `postShellHook`: Hook to execute commands after `shellHook`.
-* `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
-* `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
-
-#### `buildPythonApplication` function
-
-The `buildPythonApplication` function is practically the same as `buildPythonPackage`.
-The difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter.
-Because with an application we're not interested in multiple version the prefix is dropped.
-
-#### python.buildEnv function
-
-Python environments can be created using the low-level `pkgs.buildEnv` function.
-This example shows how to create an environment that has the Pyramid Web Framework.
-Saving the following as `default.nix`
-
-    with import {};
-
-    python.buildEnv.override {
-      extraLibs = [ pkgs.pythonPackages.pyramid ];
-      ignoreCollisions = true;
-    }
-
-and running `nix-build` will create
-
-    /nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env
-
-with wrapped binaries in `bin/`.
-
-You can also use the `env` attribute to create local environments with needed
-packages installed. This is somewhat comparable to `virtualenv`. For example,
-running `nix-shell` with the following `shell.nix`
-
-    with import {};
-
-    (python3.buildEnv.override {
-      extraLibs = with python3Packages; [ numpy requests ];
-    }).env
-
-will drop you into a shell where Python will have the
-specified packages in its path.
-
-
-##### `python.buildEnv` arguments
-
-* `extraLibs`: List of packages installed inside the environment.
-* `postBuild`: Shell command executed after the build of environment.
-* `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`).
-
-### Development mode
-
-Development or editable mode is supported. To develop Python packages
-`buildPythonPackage` has additional logic inside `shellPhase` to run `pip
-install -e . --prefix $TMPDIR/`for the package.
-
-Warning: `shellPhase` is executed only if `setup.py` exists.
-
-Given a `default.nix`:
-
-    with import {};
-
-    buildPythonPackage { name = "myproject";
-
-    buildInputs = with pkgs.pythonPackages; [ pyramid ];
-
-    src = ./.; }
-
-Running `nix-shell` with no arguments should give you
-the environment in which the package would be build with
-`nix-build`.
-
-Shortcut to setup environments with C headers/libraries and python packages:
-
-    $ nix-shell -p pythonPackages.pyramid zlib libjpeg git
-
-Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked.
-
-### Tools
-
-Packages inside nixpkgs are written by hand. However many tools exist in
-community to help save time. No tool is preferred at the moment.
-
-- [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov
-- [pypi2nix](https://github.com/garbas/pypi2nix) by Rok Garbas
-- [pypi2nix](https://github.com/offlinehacker/pypi2nix) by Jaka Hudoklin
-
-## FAQ
-
-### How to solve circular dependencies?
-
-Consider the packages `A` and `B` that depend on each other. When packaging `B`,
-a solution is to override package `A` not to depend on `B` as an input. The same
-should also be done when packaging `A`.
-
-### `install_data` / `data_files` problems
-
-If you get the following error:
-
-    could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc':
-    Permission denied
-
-This is a [known bug](https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix) in setuptools.
-Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`.
-As workaround install it as an extra `preInstall` step:
-
-    ${python.interpreter} setup.py install_data --install-dir=$out --root=$out
-    sed -i '/ = data\_files/d' setup.py
-
-
-###  Rationale of non-existent global site-packages
-
-On most operating systems a global `site-packages` is maintained. This however
-becomes problematic if you want to run multiple Python versions or have multiple
-versions of certain libraries for your projects. Generally, you would solve such
-issues by creating virtual environments using `virtualenv`.
-
-On Nix each package has an isolated dependency tree which, in the case of
-Python, guarantees the right versions of the interpreter and libraries or
-packages are available. There is therefore no need to maintain a global `site-packages`.
-
-If you want to create a Python environment for development, then the recommended
-method is to use `nix-shell`, either with or without the `python.buildEnv`
-function.
-
-
-## Contributing
-
-### Contributing guidelines
-
-Following rules are desired to be respected:
-
-* Make sure package builds for all python interpreters. Use `disabled` argument to `buildPythonPackage` to set unsupported interpreters.
-* If tests need to be disabled for a package, make sure you leave a comment about reasoning.
-* Packages in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
-* Python libraries are supposed to be in `python-packages.nix` and packaged with `buildPythonPackage`. Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`.
diff --git a/doc/languages-frameworks/python.xml b/doc/languages-frameworks/python.xml
new file mode 100644
index 00000000000..57aceeb4868
--- /dev/null
+++ b/doc/languages-frameworks/python.xml
@@ -0,0 +1,447 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="sec-python">
+
+<title>Python</title>
+
+<para>
+  Currently supported interpreters are <varname>python26</varname>, <varname>python27</varname>,
+  <varname>python33</varname>, <varname>python34</varname>, <varname>python35</varname>
+  and <varname>pypy</varname>.
+</para>
+
+<para>
+  <varname>python</varname> is an alias to <varname>python27</varname> and <varname>python3</varname> is an alias to <varname>python34</varname>.
+</para>
+
+<para>
+  <varname>python26</varname> and <varname>python27</varname> do not include modules that require
+  external dependencies (to reduce dependency bloat). Following modules need to be added as
+  <varname>buildInput</varname> explicitly:
+</para>
+
+<itemizedlist>
+  <listitem><para><varname>python.modules.bsddb</varname></para></listitem>
+  <listitem><para><varname>python.modules.curses</varname></para></listitem>
+  <listitem><para><varname>python.modules.curses_panel</varname></para></listitem>
+  <listitem><para><varname>python.modules.crypt</varname></para></listitem>
+  <listitem><para><varname>python.modules.gdbm</varname></para></listitem>
+  <listitem><para><varname>python.modules.sqlite3</varname></para></listitem>
+  <listitem><para><varname>python.modules.tkinter</varname></para></listitem>
+  <listitem><para><varname>python.modules.readline</varname></para></listitem>
+</itemizedlist>
+
+<para>For convenience <varname>python27Full</varname> and <varname>python26Full</varname>
+are provided with all modules included.</para>
+
+<para>
+  Python packages that
+  use <link xlink:href="http://pypi.python.org/pypi/setuptools/"><literal>setuptools</literal></link> or <literal>distutils</literal>,
+  can be built using the <varname>buildPythonPackage</varname> function as documented below.
+</para>
+
+<para>
+ All packages depending on any Python interpreter get appended <varname>$out/${python.sitePackages}</varname>
+ to <literal>$PYTHONPATH</literal> if such directory exists.
+</para>
+
+<variablelist>
+  <title>
+     Useful attributes on interpreters packages:
+  </title>
+
+  <varlistentry>
+    <term><varname>libPrefix</varname></term>
+    <listitem><para>
+        Name of the folder in <literal>${python}/lib/</literal> for corresponding interpreter.
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>interpreter</varname></term>
+    <listitem><para>
+        Alias for <literal>${python}/bin/${executable}.</literal>
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>buildEnv</varname></term>
+    <listitem><para>
+        Function to build python interpreter environments with extra packages bundled together.
+        See <xref linkend="ssec-python-build-env" /> for usage and documentation.
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>sitePackages</varname></term>
+    <listitem><para>
+      Alias for <literal>lib/${libPrefix}/site-packages</literal>.
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>executable</varname></term>
+    <listitem><para>
+      Name of the interpreter executable, ie <literal>python3.4</literal>.
+    </para></listitem>
+  </varlistentry>
+
+</variablelist>
+<section xml:id="ssec-build-python-package"><title><varname>buildPythonPackage</varname> function</title>
+
+  <para>
+  The function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix">
+  <filename>pkgs/development/python-modules/generic/default.nix</filename></link>.
+  Example usage:
+
+<programlisting language="nix">
+twisted = buildPythonPackage {
+  name = "twisted-8.1.0";
+
+  src = pkgs.fetchurl {
+    url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
+    sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
+  };
+
+  propagatedBuildInputs = [ self.ZopeInterface ];
+
+  meta = {
+    homepage = http://twistedmatrix.com/;
+    description = "Twisted, an event-driven networking engine written in Python";
+    license = stdenv.lib.licenses.mit;
+  };
+};
+</programlisting>
+
+  Most of Python packages that use <varname>buildPythonPackage</varname> are defined
+  in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>
+  and generated for each python interpreter separately into attribute sets <varname>python26Packages</varname>,
+  <varname>python27Packages</varname>, <varname>python35Packages</varname>, <varname>python33Packages</varname>,
+  <varname>python34Packages</varname> and <varname>pypyPackages</varname>.
+  </para>
+
+  <para>
+    <function>buildPythonPackage</function> mainly does four things:
+
+    <orderedlist>
+      <listitem><para>
+        In the <varname>buildPhase</varname>, it calls
+        <literal>${python.interpreter} setup.py bdist_wheel</literal> to build a wheel binary zipfile.
+      </para></listitem>
+
+      <listitem><para>
+        In the <varname>installPhase</varname>, it installs the wheel file using
+        <literal>pip install *.whl</literal>.
+      </para></listitem>
+
+      <listitem><para>
+        In the <varname>postFixup</varname> phase, <literal>wrapPythonPrograms</literal>
+        bash function is called to wrap all programs in <filename>$out/bin/*</filename>
+        directory to include <literal>$PYTHONPATH</literal> and <literal>$PATH</literal>
+        environment variables.
+      </para></listitem>
+
+      <listitem><para>
+        In the <varname>installCheck</varname> phase, <literal>${python.interpreter} setup.py test</literal>
+        is ran.
+      </para></listitem>
+    </orderedlist>
+  </para>
+
+  <para>By default <varname>doCheck = true</varname> is set</para>
+
+  <para>
+    As in Perl, dependencies on other Python packages can be specified in the
+    <varname>buildInputs</varname> and
+    <varname>propagatedBuildInputs</varname> attributes.  If something is
+    exclusively a build-time dependency, use
+    <varname>buildInputs</varname>; if it’s (also) a runtime dependency,
+    use <varname>propagatedBuildInputs</varname>.
+  </para>
+
+  <para>
+    By default <varname>meta.platforms</varname> is set to the same value
+    as the interpreter unless overriden otherwise.
+  </para>
+
+  <variablelist>
+    <title>
+      <varname>buildPythonPackage</varname> parameters
+      (all parameters from <varname>mkDerivation</varname> function are still supported)
+    </title>
+
+    <varlistentry>
+      <term><varname>namePrefix</varname></term>
+      <listitem><para>
+        Prepended text to <varname>${name}</varname> parameter.
+        Defaults to <literal>"python3.3-"</literal> for Python 3.3, etc. Set it to
+        <literal>""</literal>
+        if you're packaging an application or a command line tool.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>disabled</varname></term>
+      <listitem><para>
+        If <varname>true</varname>, package is not build for
+        particular python interpreter version. Grep around
+        <filename>pkgs/top-level/python-packages.nix</filename>
+        for examples.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>setupPyBuildFlags</varname></term>
+      <listitem><para>
+        List of flags passed to <command>setup.py build_ext</command> command.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>pythonPath</varname></term>
+      <listitem><para>
+        List of packages to be added into <literal>$PYTHONPATH</literal>.
+        Packages in <varname>pythonPath</varname> are not propagated
+        (contrary to <varname>propagatedBuildInputs</varname>).
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>preShellHook</varname></term>
+      <listitem><para>
+        Hook to execute commands before <varname>shellHook</varname>.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>postShellHook</varname></term>
+      <listitem><para>
+        Hook to execute commands after <varname>shellHook</varname>.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>makeWrapperArgs</varname></term>
+      <listitem><para>
+        A list of strings. Arguments to be passed to
+        <varname>makeWrapper</varname>, which wraps generated binaries. By
+        default, the arguments to <varname>makeWrapper</varname> set
+        <varname>PATH</varname> and <varname>PYTHONPATH</varname> environment
+        variables before calling the binary. Additional arguments here can
+        allow a developer to set environment variables which will be
+        available when the binary is run. For example,
+        <varname>makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]</varname>.
+      </para></listitem>
+    </varlistentry>
+
+  </variablelist>
+
+</section>
+
+<section xml:id="ssec-python-build-env"><title><function>python.buildEnv</function> function</title>
+  <para>
+    Create Python environments using low-level <function>pkgs.buildEnv</function> function. Example <filename>default.nix</filename>:
+
+<programlisting language="nix">
+<![CDATA[with import <nixpkgs> {};
+
+python.buildEnv.override {
+  extraLibs = [ pkgs.pythonPackages.pyramid ];
+  ignoreCollisions = true;
+}]]>
+</programlisting>
+
+    Running <command>nix-build</command> will create
+    <filename>/nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env</filename>
+    with wrapped binaries in <filename>bin/</filename>.
+  </para>
+
+  <para>
+  You can also use <varname>env</varname> attribute to create local
+  environments with needed packages installed (somewhat comparable to
+  <literal>virtualenv</literal>). For example, with the following
+  <filename>shell.nix</filename>:
+
+<programlisting language="nix">
+<![CDATA[with import <nixpkgs> {};
+
+(python3.buildEnv.override {
+  extraLibs = with python3Packages;
+    [ numpy
+      requests
+    ];
+}).env]]>
+</programlisting>
+
+  Running <command>nix-shell</command> will drop you into a shell where
+  <command>python</command> will have specified packages in its path.
+  </para>
+
+  <variablelist>
+    <title>
+      <function>python.buildEnv</function> arguments
+    </title>
+
+    <varlistentry>
+      <term><varname>extraLibs</varname></term>
+      <listitem><para>
+        List of packages installed inside the environment.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>postBuild</varname></term>
+      <listitem><para>
+        Shell command executed after the build of environment.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>ignoreCollisions</varname></term>
+      <listitem><para>
+         Ignore file collisions inside the environment (default is <varname>false</varname>).
+      </para></listitem>
+    </varlistentry>
+  </variablelist>
+</section>
+
+<section xml:id="ssec-python-tools"><title>Tools</title>
+
+<para>Packages inside nixpkgs are written by hand. However many tools
+exist in community to help save time. No tool is preferred at the moment.
+</para>
+
+<itemizedlist>
+
+  <listitem><para>
+    <link xlink:href="https://github.com/proger/python2nix">python2nix</link>
+    by Vladimir Kirillov
+  </para></listitem>
+
+  <listitem><para>
+    <link xlink:href="https://github.com/garbas/pypi2nix">pypi2nix</link>
+    by Rok Garbas
+  </para></listitem>
+
+  <listitem><para>
+    <link xlink:href="https://github.com/offlinehacker/pypi2nix">pypi2nix</link>
+    by Jaka Hudoklin
+  </para></listitem>
+
+</itemizedlist>
+
+</section>
+
+<section xml:id="ssec-python-development"><title>Development</title>
+
+  <para>
+    To develop Python packages <function>buildPythonPackage</function> has
+    additional logic inside <varname>shellPhase</varname> to run
+    <command>pip install -e . --prefix $TMPDIR/</command> for the package.
+  </para>
+
+  <warning><para><varname>shellPhase</varname> is executed only if <filename>setup.py</filename>
+  exists.</para></warning>
+
+  <para>
+    Given a <filename>default.nix</filename>:
+
+<programlisting language="nix">
+<![CDATA[with import <nixpkgs> {};
+
+buildPythonPackage {
+  name = "myproject";
+
+  buildInputs = with pkgs.pythonPackages; [ pyramid ];
+
+  src = ./.;
+}]]>
+</programlisting>
+
+    Running <command>nix-shell</command> with no arguments should give you
+    the environment in which the package would be build with
+    <command>nix-build</command>.
+  </para>
+
+  <para>
+    Shortcut to setup environments with C headers/libraries and python packages:
+
+    <programlisting language="bash">$ nix-shell -p pythonPackages.pyramid zlib libjpeg git</programlisting>
+  </para>
+
+  <note><para>
+    There is a boolean value <varname>lib.inNixShell</varname> set to
+    <varname>true</varname> if nix-shell is invoked.
+  </para></note>
+
+</section>
+
+<section xml:id="ssec-python-faq"><title>FAQ</title>
+
+<variablelist>
+
+  <varlistentry>
+    <term>How to solve circular dependencies?</term>
+    <listitem><para>
+      If you have packages <varname>A</varname> and <varname>B</varname> that
+      depend on each other, when packaging <varname>B</varname> override package
+      <varname>A</varname> not to depend on <varname>B</varname> as input
+      (and also the other way around).
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>install_data / data_files</varname> problems resulting into <literal>error: could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc': Permission denied</literal></term>
+    <listitem><para>
+      <link xlink:href="https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix">
+      Known bug in setuptools <varname>install_data</varname> does not respect --prefix</link>. Example of
+      such package using the feature is <filename>pkgs/tools/X11/xpra/default.nix</filename>. As workaround
+      install it as an extra <varname>preInstall</varname> step:
+
+      <programlisting>${python.interpreter} setup.py install_data --install-dir=$out --root=$out
+sed -i '/ = data_files/d' setup.py</programlisting>
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>Rationale of non-existent global site-packages</term>
+    <listitem><para>
+      There is no need to have global site-packages in Nix. Each package has isolated
+      dependency tree and installing any python package will only populate <varname>$PATH</varname>
+      inside user environment. See <xref linkend="ssec-python-build-env" /> to create self-contained
+      interpreter with a set of packages.
+    </para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+</section>
+
+
+<section xml:id="ssec-python-contrib"><title>Contributing guidelines</title>
+<para>
+  Following rules are desired to be respected:
+</para>
+
+<itemizedlist>
+
+  <listitem><para>
+    Make sure package builds for all python interpreters. Use <varname>disabled</varname> argument to
+    <function>buildPythonPackage</function> to set unsupported interpreters.
+  </para></listitem>
+
+  <listitem><para>
+    If tests need to be disabled for a package, make sure you leave a comment about reasoning.
+  </para></listitem>
+
+  <listitem><para>
+    Packages in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>
+    are sorted quasi-alphabetically to avoid merge conflicts.
+  </para></listitem>
+
+</itemizedlist>
+
+</section>
+
+</section>
+

From a90196d4cda5fac99bf60c5a254e5bc02b58e71e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 6 Mar 2016 00:56:53 +0100
Subject: [PATCH 331/338] nvidia_x11_legacy304: fix evaluation

nvidia-340.76-kernel-4.0.patch was removed from nvidia_x11_legacy340
54d342add8ab512c5650e1b2da25708622dd327d but is still needed for 304.

I think. CC @vcunat.
---
 .../nvidia-x11/nvidia-340.76-kernel-4.0.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
new file mode 100644
index 00000000000..5fdc1fed727
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
@@ -0,0 +1,28 @@
+--- a/kernel/nv-pat.c	2015-07-03 08:39:35.417031728 +0200
++++ b/kernel/nv-pat.c	2015-07-03 08:42:15.631838988 +0200
+@@ -35,8 +35,13 @@
+     unsigned long cr0 = read_cr0();
+     write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
+     wbinvd();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
+     *cr4 = read_cr4();
+     if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
++#else
++    *cr4 = __read_cr4();
++    if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
++#endif
+     __flush_tlb();
+ }
+
+@@ -46,7 +51,11 @@
+     wbinvd();
+     __flush_tlb();
+     write_cr0((cr0 & 0x9fffffff));
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
+     if (cr4 & 0x80) write_cr4(cr4);
++#else
++    if (cr4 & 0x80) __write_cr4(cr4);
++#endif
+ }
+
+ static int nv_determine_pat_mode(void)

From 225edbd9b599d0634fc7e68a7a84739d6e1ef185 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 2 Mar 2016 06:39:02 +0100
Subject: [PATCH 332/338] ms-sys: 2.5.2 -> 2.5.3

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

diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix
index c0b1de6c1e8..4d6a317276a 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/pkgs/tools/misc/ms-sys/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ms-sys-${version}";
-  version = "2.5.2";
+  version = "2.5.3";
  
   src = fetchurl {
     url = "mirror://sourceforge/ms-sys/${name}.tar.gz";
-    sha256 = "0c7ld5pglcacnrvy2gzzg1ny1jyknlj9iz1mvadq3hn8ai1d83px";
+    sha256 = "0mijf82cbji4laip6hiy3l5ka5mzq5sivjvyv7wxnc2fd3v7hgp0";
   };
 
   buildInputs = [ gettext ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    description = "A program for writing Microsoft compatible boot records";
+    description = "A program for writing Microsoft-compatible boot records";
     homepage = http://ms-sys.sourceforge.net/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ nckx ];

From d5eb96938ad20254d91134fb0c40a28cee01969a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 5 Mar 2016 23:19:40 +0100
Subject: [PATCH 333/338] sane-backends-git -> 2016-03-05

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

diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index 0e4d7ae1b83..84e1f783e2a 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2016-02-25";
+  version = "2016-03-05";
   src = fetchgit {
-    sha256 = "842b1186d38de14221be514a58f77c23d9f83979ea45f846440cf9cbb1f26c1f";
-    rev = "c5117ed0f1b522eab10fd2248f140b2acad2a708";
+    sha256 = "dc84530d5e0233427acfd132aa08a4cf9973c936ff72a66ee08ecf836200d367";
+    rev = "23eb95582da718791103b83ea002e947caa0f5fc";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From 7951dd531eb29794d4258507dc2a50c579a003d4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 5 Mar 2016 23:43:28 +0100
Subject: [PATCH 334/338] mcelog: 132 -> 133

Bugfix: no longer hangs on unknown errors in non-daemon mode.
---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 9b347a8da54..a30558092c3 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "132";
+  version = "133";
 
   src = fetchFromGitHub {
-    sha256 = "0qr0rdkva8a8wzsdmk0dm9zhpdnwp1lmla324xnayf0afyym3zj8";
+    sha256 = "1qj9jz67bd834sgqcxhyhn9fzxg8y9vfw7gmza5ikmjm6yi6mmfr";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From b61e7c2610384eb905712d0e7398cbc5d1d92b49 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 5 Mar 2016 23:51:24 +0100
Subject: [PATCH 335/338] libpsl: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index d1da2bbf3aa..231216cbc69 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -11,14 +11,14 @@ let
     owner = "publicsuffix";
   };
 
-  libVersion = "0.12.0";
+  libVersion = "0.13.0";
 
 in stdenv.mkDerivation rec {
   name = "libpsl-${version}";
   version = "${libVersion}-list-${listVersion}";
 
   src = fetchFromGitHub {
-    sha256 = "13w3lc752az2swymg408f3w2lbqs0f2h5ri6d5jw1vv9z0ij9xlw";
+    sha256 = "12inl984r2qks51wyrzgll83y7k79q2lbhyc545dpk19qnfvp7gz";
     rev = "libpsl-${libVersion}";
     repo = "libpsl";
     owner = "rockdaboot";

From b747253700d40c0a3abcb595bdcbf102709cc4f0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 6 Mar 2016 00:00:31 +0100
Subject: [PATCH 336/338] borgbackup: 0.30.0 -> 1.0.0

Major upgrade, be sure to read the release notes:
https://github.com/borgbackup/borg/blob/1.0.0/docs/changes.rst
---
 pkgs/tools/backup/borg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 208c3d4b1aa..b46ea186dee 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,12 +2,12 @@
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "0.30.0";
+  version = "1.0.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/b/borgbackup/borgbackup-${version}.tar.gz";
-    sha256 = "0n78c982kdfqbyi9jawcvzgdik4l36c2s7rpzkfr1ka6506k2rx4";
+    sha256 = "0wa6cvqs3rni5nwrgagigchcly8a53rxk56z0zn8iaii2cqrw2sh";
   };
 
   nativeBuildInputs = with python3Packages; [

From 0bf8a1a86df67649893726d50761567121330006 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 6 Mar 2016 05:06:24 +0300
Subject: [PATCH 337/338] crawl: cleanup

---
 pkgs/games/crawl/default.nix    | 4 +---
 pkgs/top-level/all-packages.nix | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index e6a1eb2c1a6..0b9287faf37 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses
 , dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype
-, tileMode ? true
+, tileMode ? false
 }:
 
 let version = "0.17.1";
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
   preBuild = ''
     cd crawl-ref/source
     echo "${version}" > util/release_ver
-    # Related to issue #1963
-    sed -i 's/-fuse-ld=gold//g' Makefile
     for i in util/*; do
       patchShebangs $i
     done
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a370802389a..c540ff849c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14449,12 +14449,12 @@ let
   crafty = callPackage ../games/crafty { };
   craftyFull = appendToName "full" (crafty.override { fullVariant = true; });
 
-  crawlTiles = callPackage ../games/crawl { };
-
-  crawl = callPackage ../games/crawl {
-    tileMode = false;
+  crawlTiles = crawl.override {
+    tileMode = true;
   };
 
+  crawl = callPackage ../games/crawl { };
+
   crrcsim = callPackage ../games/crrcsim {};
 
   cuyo = callPackage ../games/cuyo { };

From 54c7ef17a913fde534a22edbe5557aa24d1f4847 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 6 Mar 2016 09:39:22 +0100
Subject: [PATCH 338/338] eclipse-plugin-checkstyle: 6.14.0 -> 6.16.0

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 50975d061eb..3bde9b1434c 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -171,12 +171,12 @@ rec {
 
   checkstyle = buildEclipseUpdateSite rec {
     name = "checkstyle-${version}";
-    version = "6.14.0.201601142217";
+    version = "6.16.0.201603042325";
 
     src = fetchzip {
       stripRoot = false;
-      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.14.0/net.sf.eclipsecs-updatesite_${version}-bin.zip";
-      sha256 = "0ysxir1fv0mb9xnidc9hv6llnk48lkav0sryjbx7pw7vy1f8nd4c";
+      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.16.0/net.sf.eclipsecs-updatesite_${version}.zip";
+      sha256 = "0bm1linyw82bryblyabcx89zqw1ingh8mx62bwp3qj05yc9ksnly";
     };
 
     meta = with stdenv.lib; {